notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

refactor: use isRemote instead of reloadWhenClicked

Browse source 
Why are my variable naming abilities be so awful?
This commit is contained in:
LucasGGamerM 2023-06-10 10:44:56 -03:00
parent fb78ac1243
commit 33d725acb4
7 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
View file

@ -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());

2
mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
View file

@ -67,7 +67,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
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();

1
mastodon/src/main/java/org/joinmastodon/android/model/Account.java
View file

@ -136,7 +136,6 @@ public class Account extends BaseModel implements Searchable{
public Instant muteExpiresAt;
public List<Role> roles;
public boolean reloadWhenClicked;
public @Nullable String fqn; // akkoma has this, mastodon't

1
mastodon/src/main/java/org/joinmastodon/android/model/Status.java
View file

@ -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

10
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
View file

@ -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<StatusPrivacy> 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 -> {

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

@ -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));

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
View file

@ -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(),