diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java index 002ed9619..864bdf9b9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java @@ -58,7 +58,7 @@ public class CustomLocalTimelineFragment extends StatusListFragment implements P result.stream().forEach(status -> { status.account.acct += "@"+domain; status.mentions.forEach(mention -> mention.id = null); - status.reloadWhenClicked = true; + status.isRemote = true; }); onDataLoaded(result, !result.isEmpty()); 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 c3ca162df..a42094caa 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -67,7 +67,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment Status status=getContentStatusByID(id); if(status==null) return; - if(status.reloadWhenClicked){ + if(status.isRemote){ UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> { status1.filterRevealed = true; Bundle args=new Bundle(); diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Account.java b/mastodon/src/main/java/org/joinmastodon/android/model/Account.java index c11c87507..15b4ff514 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Account.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Account.java @@ -136,7 +136,6 @@ public class Account extends BaseModel implements Searchable{ public Instant muteExpiresAt; public List roles; - public boolean reloadWhenClicked; public @Nullable String fqn; // akkoma has this, mastodon't diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java index 55953e052..d44a05507 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java @@ -84,7 +84,6 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{ public transient boolean hasGapAfter; public transient TranslatedStatus translation; public transient boolean translationShown; - public boolean reloadWhenClicked; private transient String strippedText; @Override 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 a88493c7a..bf08ad654 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 @@ -199,7 +199,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ } private void onReplyClick(View v){ - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(v.getContext(), item.status, item.accountID, null, status -> { @@ -240,7 +240,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ onBoostLongClick(v); return; } - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(v.getContext(), item.status, item.accountID, null, status -> { @@ -269,7 +269,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ Consumer doReblog = (visibility) -> { v.startAnimation(opacityOut); - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(v.getContext(), item.status, item.accountID, null, status -> { @@ -357,7 +357,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ } private void onFavoriteClick(View v){ - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(v.getContext(), item.status, item.accountID, null, status -> { @@ -402,7 +402,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ } private void onBookmarkClick(View v){ - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(v.getContext(), item.status, item.accountID, null, status -> { 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 b8776a65d..78295c5a8 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 @@ -450,7 +450,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ return; } Bundle args=new Bundle(); - if(item.status != null && item.status.reloadWhenClicked){ + if(item.status != null && item.status.isRemote){ UiUtils.lookupAccount(v.getContext(), item.status.account, item.accountID, null, account -> { args.putString("account", item.accountID); args.putParcelable("profileAccount", Parcels.wrap(account)); 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 1291832b6..26a11c86a 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 @@ -207,7 +207,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ translateButton.setClickable(false); translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start(); - if(item.status.reloadWhenClicked){ + if(item.status.isRemote){ UiUtils.lookupStatus(item.parentFragment.getContext(), item.status, item.parentFragment.getAccountID(),