Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't remove gap when removing status 

re: sk22#898
This commit is contained in:
sk 2023-10-26 18:32:46 +02:00
parent c8f633ae3b
commit e8c9253a76
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
View File

@ -273,6 +273,7 @@ public class CacheController{
public void deleteStatus(String id){ public void deleteStatus(String id){
runOnDbThread((db)->{ runOnDbThread((db)->{
// TODO: set previous status's hasGapAfter flag if the deleted status hasGapAfter
db.delete("home_timeline", "`id`=?", new String[]{id}); db.delete("home_timeline", "`id`=?", new String[]{id});
}); });
} }

3
mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
View File

@ -25,6 +25,7 @@ import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.StatusDisplayItem; import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
import org.parceler.Parcels; import org.parceler.Parcels;
@ -216,7 +217,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
StatusDisplayItem item=displayItems.get(i); StatusDisplayItem item=displayItems.get(i);
// we found a status that the to-be-removed status replies to! // we found a status that the to-be-removed status replies to!
// storing indices to maybe update its display items // storing indices to maybe update its display items
if(item.parentID.equals(status.inReplyToId)){ if(item.parentID.equals(status.inReplyToId) && !(item instanceof GapStatusDisplayItem)){
if(ancestorFirstIndex==-1) ancestorFirstIndex=i; if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
ancestorLastIndex=i; ancestorLastIndex=i;
} }