From a554059ccec88489efd05743a33a07c9e346625c Mon Sep 17 00:00:00 2001 From: Jacocococo Date: Sat, 14 Sep 2024 21:21:41 +0200 Subject: [PATCH] Change isAkkoma to be based on version code Iceshrimp.NET now also implements some APIs using the pleroma field, so only checking for that would create false positives for Iceshrimp.NET --- .../main/java/org/joinmastodon/android/model/Instance.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java index fc76f5aee..c3d017913 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java @@ -146,8 +146,12 @@ public class Instance extends BaseModel{ return ci; } + // This method has almost exclusively been used to improve support for + // Akkoma with no regard for Pleroma, hence its name. However, it is + // more likely than not that most uses should also apply to Pleroma, + // so checking for that too probably causes more good than harm. public boolean isAkkoma() { - return pleroma != null; + return version.contains("compatible; Akkoma") || version.contains("compatible; Pleroma"); } public boolean isPixelfed() {