rename vars, compare content status id for reply

sk22 · Oct 15, 2023 · 30a4d0e · 30a4d0e
1 parent 9a985aa
commit 30a4d0e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -209,20 +209,20 @@ private int removeStatusDisplayItems(Status status, int index, int ancestorFirst
 	}
 
 	protected void removeStatus(Status status){
-		Status contentStatus=status.getContentStatus();
-		String id=contentStatus.id;
-		iterateRemoveStatus(data, id);
-		iterateRemoveStatus(preloadedData, id);
+		Status removeStatus=status.getContentStatus();
+		String removeId=removeStatus.id;
+		iterateRemoveStatus(data, removeId);
+		iterateRemoveStatus(preloadedData, removeId);
 		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
 		int offset=0;
 		for(int i=0;i<displayItems.size();i++){
-			StatusDisplayItem item = displayItems.get(i);
-			if(id.equals(item.contentStatusID)){
-				offset+=removeStatusDisplayItems(contentStatus, i, ancestorFirstIndex, ancestorLastIndex, offset);
+			StatusDisplayItem item=displayItems.get(i);
+			if(Objects.equals(item.contentStatusID, removeId)){
+				offset+=removeStatusDisplayItems(removeStatus, i, ancestorFirstIndex, ancestorLastIndex, offset);
 				ancestorFirstIndex=ancestorLastIndex=-1;
 				continue;
 			}
-			if(item.parentID.equals(status.inReplyToId)){
+			if(Objects.equals(item.contentStatusID, removeStatus.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}