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

Revert some changes specifically for Iceshrimp.NET

Browse Source
This commit is contained in:
Jacocococo
2024-08-21 22:15:55 +02:00
parent c834199ee4
commit 407844378f
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java
View File

@@ -64,7 +64,7 @@ public class StatusInteractionController{
result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1)); result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
cb.accept(result); cb.accept(result);
if(updateCounters) E.post(new StatusCountersUpdatedEvent(result)); if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
if(instance.isIceshrimp()) E.post(new EmojiReactionsUpdatedEvent(status.id, result.reactions, false, null)); if(instance.isIceshrimpJs()) E.post(new EmojiReactionsUpdatedEvent(status.id, result.reactions, false, null));
} }
@Override @Override
@@ -74,7 +74,7 @@ public class StatusInteractionController{
status.favourited=!favorited; status.favourited=!favorited;
cb.accept(status); cb.accept(status);
if(updateCounters) E.post(new StatusCountersUpdatedEvent(status)); if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
if(instance.isIceshrimp()) E.post(new EmojiReactionsUpdatedEvent(status.id, status.reactions, false, null)); if(instance.isIceshrimpJs()) E.post(new EmojiReactionsUpdatedEvent(status.id, status.reactions, false, null));
} }
}) })
.exec(accountID); .exec(accountID);
@@ -86,7 +86,7 @@ public class StatusInteractionController{
return; return;
String defaultReactionEmojiRaw=instance.configuration.reactions.defaultReaction; String defaultReactionEmojiRaw=instance.configuration.reactions.defaultReaction;
if(!instance.isIceshrimp() || defaultReactionEmojiRaw==null) if(!instance.isIceshrimpJs() || defaultReactionEmojiRaw==null)
return; return;
boolean reactionIsCustom=defaultReactionEmojiRaw.startsWith(":"); boolean reactionIsCustom=defaultReactionEmojiRaw.startsWith(":");

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@@ -830,7 +830,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
publishButton=wrap.findViewById(R.id.publish_btn); publishButton=wrap.findViewById(R.id.publish_btn);
languageButton=wrap.findViewById(R.id.language_btn); languageButton=wrap.findViewById(R.id.language_btn);
if(instance.isIceshrimp()) if(instance.isIceshrimpJs())
languageButton.setVisibility(View.GONE); languageButton.setVisibility(View.GONE);
else { else {
languageButton.setOnClickListener(v->showLanguageAlert()); languageButton.setOnClickListener(v->showLanguageAlert());

4
mastodon/src/main/java/org/joinmastodon/android/fragments/HasAccountID.java
View File

@@ -26,6 +26,10 @@ public interface HasAccountID {
return getInstance().map(Instance::isIceshrimp).orElse(false); return getInstance().map(Instance::isIceshrimp).orElse(false);
} }
default boolean isInstanceIceshrimpJs() {
return getInstance().map(Instance::isIceshrimpJs).orElse(false);
}
default Optional<Instance> getInstance() { default Optional<Instance> getInstance() {
return getSession().getInstance(); return getSession().getInstance();
} }

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -1020,7 +1020,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
else hidePrivateNote(); else hidePrivateNote();
invalidateOptionsMenu(); invalidateOptionsMenu();
actionButton.setVisibility(View.VISIBLE); actionButton.setVisibility(View.VISIBLE);
notifyButton.setVisibility(relationship.following && !isInstanceIceshrimp() ? View.VISIBLE : View.GONE); notifyButton.setVisibility(relationship.following && !isInstanceIceshrimpJs() ? View.VISIBLE : View.GONE);
UiUtils.setRelationshipToActionButtonM3(relationship, actionButton); UiUtils.setRelationshipToActionButtonM3(relationship, actionButton);
actionProgress.setIndeterminateTintList(actionButton.getTextColors()); actionProgress.setIndeterminateTintList(actionButton.getTextColors());
notifyProgress.setIndeterminateTintList(notifyButton.getTextColors()); notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());

2
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
View File

@@ -61,7 +61,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, i->toggleCheckableItem(showRepliesItem)) showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, i->toggleCheckableItem(showRepliesItem))
)); ));
if(!isInstanceIceshrimp()) items.add( if(!isInstanceIceshrimpJs()) items.add(
0, 0,
languageItem=new ListItem<>(getString(R.string.default_post_language), postLanguage!=null ? postLanguage.getDisplayName(getContext()) : null, R.drawable.ic_fluent_local_language_24_regular, this::onDefaultLanguageClick) languageItem=new ListItem<>(getString(R.string.default_post_language), postLanguage!=null ? postLanguage.getDisplayName(getContext()) : null, R.drawable.ic_fluent_local_language_24_regular, this::onDefaultLanguageClick)
); );

4
mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
View File

@@ -156,6 +156,10 @@ public class Instance extends BaseModel{
return version.contains("compatible; Iceshrimp"); return version.contains("compatible; Iceshrimp");
} }
public boolean isIceshrimpJs() {
return version.contains("compatible; Iceshrimp "); // Iceshrimp.NET will not have a space immediately after
}
public boolean hasFeature(Feature feature) { public boolean hasFeature(Feature feature) {
Optional<List<String>> pleromaFeatures = Optional.ofNullable(pleroma) Optional<List<String>> pleromaFeatures = Optional.ofNullable(pleroma)
.map(p -> p.metadata) .map(p -> p.metadata)

6
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java
View File

@@ -295,7 +295,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
finalExisting.add(me); finalExisting.add(me);
adapter.notifyItemChanged(item.status.reactions.indexOf(finalExisting)); adapter.notifyItemChanged(item.status.reactions.indexOf(finalExisting));
} }
if(instance.isIceshrimp() && status!=null){ if(instance.isIceshrimpJs() && status!=null){
item.parentFragment.onFavoriteChanged(status, getItemID()); item.parentFragment.onFavoriteChanged(status, getItemID());
E.post(new StatusCountersUpdatedEvent(status)); E.post(new StatusCountersUpdatedEvent(status));
} }
@@ -510,7 +510,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
btn.setCompoundDrawablesRelative(item.first.placeholder, null, null, null); btn.setCompoundDrawablesRelative(item.first.placeholder, null, null, null);
} }
btn.setSelected(reaction.me); btn.setSelected(reaction.me);
if(parent.parentFragment.isInstanceIceshrimp() && reaction.name.contains("@")){ if(parent.parentFragment.isInstanceIceshrimpJs() && reaction.name.contains("@")){
btn.setEnabled(false); btn.setEnabled(false);
btn.setClickable(false); btn.setClickable(false);
btn.setLongClickable(true); btn.setLongClickable(true);
@@ -552,7 +552,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
if(instance.configuration!=null && instance.configuration.reactions!=null && instance.configuration.reactions.maxReactions!=0){ if(instance.configuration!=null && instance.configuration.reactions!=null && instance.configuration.reactions.maxReactions!=0){
adapter.parentHolder.updateMeReactionCount(deleting); adapter.parentHolder.updateMeReactionCount(deleting);
} }
if(instance.isIceshrimp() && status!=null){ if(instance.isIceshrimpJs() && status!=null){
parent.parentFragment.onFavoriteChanged(status, adapter.parentHolder.getItemID()); parent.parentFragment.onFavoriteChanged(status, adapter.parentHolder.getItemID());
E.post(new StatusCountersUpdatedEvent(status)); E.post(new StatusCountersUpdatedEvent(status));
} }