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

getInstance returns optional

Browse Source
This commit is contained in:
sk
2023-05-30 18:57:17 +02:00
parent 8df589c103
commit 0985a4c968
9 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,13 +259,14 @@ 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().isPleroma();
return session.getInstance().map(Instance::isPleroma).orElse(false);
}
@Override
public boolean wantsDefault(AccountSession session) {
Instance instance = session.getInstance();
return instance.isPleroma() && instance.pleroma.metadata.features.contains("bubble_timeline");
return session.getInstance()
.map(i -> i.isPleroma() && i.pleroma.metadata.features.contains("bubble_timeline"))
.orElse(false);
}
};