events for boosts, adapt removeStatus method

mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java

@@ -7,7 +7,10 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
@@ -82,7 +85,11 @@ public class StatusInteractionController{
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount + (reblogged ? 1 : -1));
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters){
+							E.post(new StatusCountersUpdatedEvent(result));
+							if(reblogged) E.post(new StatusCreatedEvent(reblog, accountID));
+							else E.post(new ReblogDeletedEvent(status.id, accountID));
+						}
 					}
 
 					@Override

mastodon/src/main/java/org/joinmastodon/android/events/ReblogDeletedEvent.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+public class ReblogDeletedEvent{
+	public final String statusID;
+	public final String accountID;
+
+	public ReblogDeletedEvent(String statusID, String accountID){
+		this.statusID=statusID;
+		this.accountID=accountID;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -13,6 +13,7 @@ import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
@@ -184,13 +185,14 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
-	private void removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex){
+	private void removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex, boolean deleteContent){
 		// did we find an ancestor that is also the status' neighbor?
 		if(ancestorFirstIndex>=0 && ancestorLastIndex==index-1){
 			for(int i=ancestorFirstIndex; i<=ancestorLastIndex; i++){
 				StatusDisplayItem item=displayItems.get(i);
+				String id=deleteContent ? item.getContentID() : item.parentID;
 				// update ancestor to have no descendant anymore
-				if(item.getContentID().equals(status.inReplyToId)) item.hasDescendantNeighbor=false;
+				if(id.equals(status.inReplyToId)) item.hasDescendantNeighbor=false;
 			}
 			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex-ancestorFirstIndex+1);
 		}
@@ -198,31 +200,32 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		if(index==-1) return;
 		int lastIndex;
 		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).getContentID().equals(status.id))
+			StatusDisplayItem item=displayItems.get(lastIndex);
-				break;
+			String id=deleteContent ? item.getContentID() : item.parentID;
+			if(!id.equals(status.id)) break;
 		}
 		displayItems.subList(index, lastIndex).clear();
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
 	protected void removeStatus(Status status){
-		Status removeStatus=status.getContentStatus();
+		boolean deleteContent=status==status.getContentStatus();
-		String removeId=removeStatus.id;
 		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
 		for(int i=0;i<displayItems.size();i++){
 			StatusDisplayItem item=displayItems.get(i);
-			if(item.getContentID().equals(removeId)){
+			String id=deleteContent ? item.getContentID() : item.parentID;
-				removeStatusDisplayItems(removeStatus, i, ancestorFirstIndex, ancestorLastIndex);
+			if(id.equals(status.id)){
+				removeStatusDisplayItems(status, i, ancestorFirstIndex, ancestorLastIndex, deleteContent);
 				ancestorFirstIndex=ancestorLastIndex=-1;
 				continue;
 			}
-			if(item.getContentID().equals(removeStatus.inReplyToId)){
+			if(id.equals(status.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}
 		}
-		iterateRemoveStatus(data, removeId);
+		iterateRemoveStatus(data, status.id);
-		iterateRemoveStatus(preloadedData, removeId);
+		iterateRemoveStatus(preloadedData, status.id);
 	}
 
 	@Override
@@ -291,6 +294,18 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			removeStatus(status);
 		}
 
+		@Subscribe
+		public void onReblogDeleted(ReblogDeletedEvent ev){
+			if(!ev.accountID.equals(accountID))
+				return;
+			for(Status item : data){
+				if(item.getContentStatus().id.equals(ev.statusID) && item.reblog!=null){
+					removeStatus(item);
+					break;
+				}
+			}
+		}
+
 		@Subscribe
 		public void onStatusCreated(StatusCreatedEvent ev){
 			if(!ev.accountID.equals(accountID))

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -242,7 +242,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					if (item.scheduledStatus != null) {
 						UiUtils.confirmDeleteScheduledPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.scheduledStatus, ()->{});
 					} else {
-						UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+						UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{}, false);
 					}
 				}else if(id==R.id.pin || id==R.id.unpin) {
 					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -626,10 +626,6 @@ public class UiUtils {
 				.show();
 	}
 
-	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback) {
-		confirmDeletePost(activity, accountID, status, resultCallback, false);
-	}
-
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft) {
 		Status s=status.getContentStatus();
 		showConfirmationAlert(activity,