Fixed bug that updating wrong post when PostFragment receives PostUpdateEventToPostList.

2 files changed, 14 insertions, 12 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
index 8ffbfe3a..cade1c5a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.paging.PagedList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.RecyclerView;
@@ -437,16 +438,19 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
 
     @Subscribe
     public void onPostUpdateEvent(PostUpdateEventToPostList event) {
-        Post post = mAdapter.getCurrentList().get(event.positionInList);
-        if(post != null) {
-            post.setTitle(event.post.getTitle());
-            post.setVoteType(event.post.getVoteType());
-            post.setScore(event.post.getScore());
-            post.setNSFW(event.post.isNSFW());
-            post.setSpoiler(event.post.isSpoiler());
-            post.setFlair(event.post.getFlair());
-            post.setSaved(event.post.isSaved());
-            mAdapter.notifyItemChanged(event.positionInList);
+        PagedList<Post> posts = mAdapter.getCurrentList();
+        if (posts != null && event.positionInList >= 0 && event.positionInList < posts.size()) {
+            Post post = posts.get(event.positionInList);
+            if (post != null && post.getFullName().equals(event.post.getFullName())) {
+                post.setTitle(event.post.getTitle());
+                post.setVoteType(event.post.getVoteType());
+                post.setScore(event.post.getScore());
+                post.setNSFW(event.post.isNSFW());
+                post.setSpoiler(event.post.isSpoiler());
+                post.setFlair(event.post.getFlair());
+                post.setSaved(event.post.isSaved());
+                mAdapter.notifyItemChanged(event.positionInList);
+            }
         }
     }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
index 08cad105..9659d620 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
@@ -6,7 +6,6 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -300,7 +299,6 @@ public class ViewPostDetailActivity extends AppCompatActivity implements FlairBo
             mPost = getIntent().getParcelableExtra(EXTRA_POST_DATA);
         }
 
-        Log.i("asdfasdfadfadf", "" + mPost.isSaved());
         if(mPost == null) {
             fetchPostAndCommentsById(getIntent().getStringExtra(EXTRA_POST_ID));
         } else {