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

use isInstanceAkkoma()

Browse Source
This commit is contained in:
sk
2023-06-01 19:22:01 +02:00
parent 0702703d78
commit f241092277
10 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ public class Instance extends BaseModel{
return ci;
}
public boolean isPleroma() {
public boolean isAkkoma() {
return pleroma != null;
}

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

@@ -259,13 +259,13 @@ public class TimelineDefinition {
public boolean isCompatible(AccountSession session) {
// still enabling the bubble timeline for all pleroma/akkoma instances since i know of
// at least one instance that supports it, but doesn't list "bubble_timeline"
return session.getInstance().map(Instance::isPleroma).orElse(false);
return session.getInstance().map(Instance::isAkkoma).orElse(false);
}
@Override
public boolean wantsDefault(AccountSession session) {
return session.getInstance()
.map(i -> i.isPleroma() && i.pleroma.metadata.features.contains("bubble_timeline"))
.map(i -> i.isAkkoma() && i.pleroma.metadata.features.contains("bubble_timeline"))
.orElse(false);
}
};