diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index 8710c2308..30e38ebe2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -470,7 +470,7 @@ public abstract class BaseStatusListFragment exten int firstOptionIndex=-1, footerIndex=-1; int i=0; for(StatusDisplayItem item:displayItems){ - if(item.contentStatusID.equals(statusForContent.id)){ + if(item.getContentID().equals(statusForContent.id)){ if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){ firstOptionIndex=i; }else if(item instanceof PollFooterStatusDisplayItem){ @@ -485,7 +485,7 @@ public abstract class BaseStatusListFragment exten List pollItems=displayItems.subList(firstOptionIndex, footerIndex+1); int prevSize=pollItems.size(); pollItems.clear(); - StatusDisplayItem.buildPollItems(parentID, statusForContent.id, this, poll, pollItems); + StatusDisplayItem.buildPollItems(parentID, this, poll, pollItems); if(prevSize!=pollItems.size()){ adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize); adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size()); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java index 193ddc020..0a723a322 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java @@ -145,7 +145,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{ } String sep = getString(R.string.sk_separator); items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null, s)); - items.add(1, new DummyStatusDisplayItem(s.id, s.getContentStatus().id, this)); + items.add(1, new DummyStatusDisplayItem(s.id, this)); } return items; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java index 570e5821a..507822f7a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -30,7 +30,6 @@ import org.parceler.Parcels; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -144,12 +143,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment } } - protected Status getContentStatusByID(String id){ + public Status getContentStatusByID(String id){ Status s=getStatusByID(id); return s==null ? null : s.getContentStatus(); } - protected Status getStatusByID(String id){ + public Status getStatusByID(String id){ for(Status s:data){ if(s.id.equals(id)){ return s; @@ -179,54 +178,51 @@ public abstract class StatusListFragment extends BaseStatusListFragment private void iterateRemoveStatus(List l, String id){ Iterator it=l.iterator(); while(it.hasNext()){ - if(Objects.equals(it.next().getContentStatus().id, id)){ + if(it.next().getContentStatus().id.equals(id)){ it.remove(); } } } - private int removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex, int indexOffset){ + private void removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex){ // 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); // update ancestor to have no descendant anymore - if(item.contentStatusID.equals(status.inReplyToId)) item.hasDescendantNeighbor=false; + if(item.getContentID().equals(status.inReplyToId)) item.hasDescendantNeighbor=false; } - adapter.notifyItemRangeChanged(ancestorFirstIndex-indexOffset, ancestorLastIndex-ancestorFirstIndex+1); + adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex-ancestorFirstIndex+1); } - if(index==-1) return 0; + if(index==-1) return; int lastIndex; for(lastIndex=index;lastIndex parentFragment) { - super(parentID, contentStatusID, parentFragment); + public DummyStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment) { + super(parentID, parentFragment); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java index eefdf16be..d874df595 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java @@ -65,7 +65,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem { private static final float ALPHA_DISABLED=0.55f; public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID, boolean hideEmpty, boolean forAnnouncement) { - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.status=status; this.hideEmpty=hideEmpty; this.forAnnouncement=forAnnouncement; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java index 21fbc1d30..5a2c6810a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java @@ -42,7 +42,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{ private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT); public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Status status){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.status=status; this.accountID=accountID; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java index a89d67553..716c05108 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java @@ -15,8 +15,8 @@ import org.joinmastodon.android.ui.utils.UiUtils; public class FileStatusDisplayItem extends StatusDisplayItem{ private final Attachment attachment; - public FileStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment parentFragment, Attachment attachment) { - super(parentID, contentStatusID, parentFragment); + public FileStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Attachment attachment) { + super(parentID, parentFragment); this.attachment=attachment; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java index 8af7bb11d..bf0cce7a4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java @@ -43,7 +43,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ public boolean hideCounts; public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.status=status; this.accountID=accountID; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java index a7ec31708..ee4764a92 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java @@ -21,7 +21,7 @@ public class GapStatusDisplayItem extends StatusDisplayItem{ private final Status status; public GapStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){ - super(parentID, null, parentFragment); + super(parentID, parentFragment); this.status=status; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java index 4e9bd8218..8d066d04d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java @@ -14,7 +14,7 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{ public final Hashtag tag; public HashtagStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Hashtag tag){ - super(parentID, null, parentFragment); + super(parentID, parentFragment); this.tag=tag; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index 352f4bc47..cfdfd5904 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -86,7 +86,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ private Consumer consumeReadAnnouncement; public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, CharSequence extraText, Notification notification, ScheduledStatus scheduledStatus){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); AccountSession session = AccountSessionManager.get(accountID); user=scheduledStatus != null ? session.self : user; this.user=user; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java index 425bcf0ec..59b08451a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java @@ -28,7 +28,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{ private final UrlImageLoaderRequest imgRequest; public LinkCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.status=status; if(status.card.image!=null) imgRequest=new UrlImageLoaderRequest(status.card.image, 1000, 1000); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java index 421d15dc1..385978be7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java @@ -57,7 +57,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{ public String sensitiveTitle; public MediaGridStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, PhotoLayoutHelper.TiledLayoutResult tiledLayout, List attachments, Status status){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.tiledLayout=tiledLayout; this.viewPool=parentFragment.getAttachmentViewsPool(); this.attachments=attachments; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java index 3e2dc7ac7..b16c12ebe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java @@ -49,7 +49,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{ private final CharSequence timestamp; public NotificationHeaderStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Notification notification, String accountID){ - super(parentID, notification.status!=null ? notification.status.getContentStatus().id : null, parentFragment); + super(parentID, parentFragment); this.notification=notification; this.accountID=accountID; this.timestamp=notification.createdAt==null ? null : UiUtils.formatRelativeTimestamp(context, notification.createdAt); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java index a9da9d51a..2ec373335 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java @@ -15,8 +15,8 @@ import org.joinmastodon.android.ui.utils.UiUtils; public class PollFooterStatusDisplayItem extends StatusDisplayItem{ public final Poll poll; - public PollFooterStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment parentFragment, Poll poll){ - super(parentID, contentStatusID, parentFragment); + public PollFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Poll poll){ + super(parentID, parentFragment); this.poll=poll; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java index 2c315c6d1..a1eae6f99 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java @@ -31,8 +31,8 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{ private final int optionIndex; public final Poll poll; - public PollOptionStatusDisplayItem(String parentID, String contentStatusID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){ - super(parentID, contentStatusID, parentFragment); + public PollOptionStatusDisplayItem(String parentID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){ + super(parentID, parentFragment); this.optionIndex=optionIndex; option=poll.options.get(optionIndex); this.poll=poll; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java index b165655b0..78d18ebcf 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java @@ -50,7 +50,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{ } public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText, Status status) { - super(parentID, status.getContentStatus().id, parentFragment); + super(parentID, parentFragment); SpannableStringBuilder ssb=new SpannableStringBuilder(text); if(AccountSessionManager.get(parentFragment.getAccountID()).getLocalPreferences().customEmojiInNames) HtmlParser.parseCustomEmoji(ssb, emojis); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SectionHeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SectionHeaderStatusDisplayItem.java index b7cb8afb5..cde1a6b09 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SectionHeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SectionHeaderStatusDisplayItem.java @@ -14,7 +14,7 @@ public class SectionHeaderStatusDisplayItem extends StatusDisplayItem{ public final Runnable onButtonClick; public SectionHeaderStatusDisplayItem(BaseStatusListFragment parentFragment, String title, String buttonText, Runnable onButtonClick){ - super("", null, parentFragment); + super("", parentFragment); this.title=title; this.buttonText=buttonText; this.onButtonClick=onButtonClick; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SpoilerStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SpoilerStatusDisplayItem.java index cdf127f17..722bd5c49 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SpoilerStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SpoilerStatusDisplayItem.java @@ -32,7 +32,7 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{ private final int attachmentCount; public SpoilerStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String title, Status statusForContent, Type type){ - super(parentID, statusForContent.id, parentFragment); + super(parentID, parentFragment); this.status=statusForContent; this.type=type; this.attachmentCount=statusForContent.mediaAttachments.size(); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 1dd88a8df..62bc674e3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -13,6 +13,8 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; + import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; import org.joinmastodon.android.api.session.AccountLocalPreferences; @@ -22,6 +24,7 @@ import org.joinmastodon.android.fragments.HashtagTimelineFragment; import org.joinmastodon.android.fragments.HomeTabFragment; import org.joinmastodon.android.fragments.ListTimelineFragment; import org.joinmastodon.android.fragments.ProfileFragment; +import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.fragments.ThreadFragment; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Attachment; @@ -53,7 +56,7 @@ import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.views.UsableRecyclerView; public abstract class StatusDisplayItem{ - public final String parentID, contentStatusID; + public final String parentID; public final BaseStatusListFragment parentFragment; public boolean inset; public int index; @@ -83,12 +86,21 @@ public abstract class StatusDisplayItem{ this.isDirectDescendant = isDirectDescendant; } - public StatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment parentFragment){ + public StatusDisplayItem(String parentID, BaseStatusListFragment parentFragment){ this.parentID=parentID; - this.contentStatusID=contentStatusID; this.parentFragment=parentFragment; } + @NonNull + public String getContentID(){ + if(parentFragment instanceof StatusListFragment slf){ + Status s=slf.getContentStatusByID(parentID); + return s!=null ? s.id : parentID; + }else{ + return parentID; + } + } + public abstract Type getType(); public int getImageCount(){ @@ -246,7 +258,7 @@ public abstract class StatusDisplayItem{ }else if(!hasSpoiler && header!=null){ header.needBottomPadding=true; }else if(hasSpoiler){ - contentItems.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment)); + contentItems.add(new DummyStatusDisplayItem(parentID, fragment)); } List imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList()); @@ -270,11 +282,11 @@ public abstract class StatusDisplayItem{ contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att)); } if(att.type==Attachment.Type.UNKNOWN){ - contentItems.add(new FileStatusDisplayItem(parentID, statusForContent.id, fragment, att)); + contentItems.add(new FileStatusDisplayItem(parentID, fragment, att)); } } if(statusForContent.poll!=null){ - buildPollItems(parentID, statusForContent.id, fragment, statusForContent.poll, contentItems); + buildPollItems(parentID, fragment, statusForContent.poll, contentItems); } if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){ contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent)); @@ -301,7 +313,7 @@ public abstract class StatusDisplayItem{ boolean inset=(flags & FLAG_INSET)!=0; // add inset dummy so last content item doesn't clip out of inset bounds if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){ - items.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment)); + items.add(new DummyStatusDisplayItem(parentID, fragment)); // in case we ever need the dummy to display a margin for the media grid again: // (i forgot why we apparently don't need this anymore) // !contentItems.isEmpty() && contentItems @@ -322,13 +334,13 @@ public abstract class StatusDisplayItem{ new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter))); } - public static void buildPollItems(String parentID, String contentStatusID, BaseStatusListFragment fragment, Poll poll, List items){ + public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List items){ int i=0; for(Poll.Option opt:poll.options){ - items.add(new PollOptionStatusDisplayItem(parentID, contentStatusID, poll, i, fragment)); + items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment)); i++; } - items.add(new PollFooterStatusDisplayItem(parentID, contentStatusID, fragment, poll)); + items.add(new PollFooterStatusDisplayItem(parentID, fragment, poll)); } public enum Type{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java index 0921c0545..122b20fdd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java @@ -42,7 +42,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ public final Status status; public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.text=text; this.status=status; this.disableTranslate=disableTranslate; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java index ed3c7331f..5f0867d02 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java @@ -19,7 +19,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{ public LegacyFilter applyingFilter; public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, List filteredItems, LegacyFilter applyingFilter){ - super(parentID, status.id, parentFragment); + super(parentID, parentFragment); this.status=status; this.filteredItems = filteredItems; this.applyingFilter = applyingFilter;