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

Fix crashes on Calckey and GoToSocial (#515)

Browse Source 
* Fix crashes on calckey and gts

* Use url if previewUrl is null
This commit is contained in:
Jacoco
2023-05-14 23:26:03 +02:00
committed by GitHub
parent 961c69b525
commit a9ab9cb249
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
View File

@@ -154,8 +154,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){ if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){
E.post(new AllNotificationsSeenEvent()); E.post(new AllNotificationsSeenEvent());
new SaveMarkers(null, result.items.get(0).id).exec(accountID); new SaveMarkers(null, result.items.get(0).id).exec(accountID);
AccountSessionManager.getInstance().getAccount(accountID).markers if (AccountSessionManager.getInstance().getAccount(accountID).markers != null)
.notifications.lastReadId = result.items.get(0).id; AccountSessionManager.getInstance().getAccount(accountID).markers
.notifications.lastReadId = result.items.get(0).id;
AccountSessionManager.getInstance().writeAccountsFile(); AccountSessionManager.getInstance().writeAccountsFile();
} }
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
View File

@@ -55,7 +55,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
for(Attachment att:attachments){ for(Attachment att:attachments){
requests.add(new UrlImageLoaderRequest(switch(att.type){ requests.add(new UrlImageLoaderRequest(switch(att.type){
case IMAGE -> att.url; case IMAGE -> att.url;
case VIDEO, GIFV -> att.previewUrl; case VIDEO, GIFV -> att.previewUrl != null ? att.previewUrl : att.url;
default -> throw new IllegalStateException("Unexpected value: "+att.type); default -> throw new IllegalStateException("Unexpected value: "+att.type);
}, 1000, 1000)); }, 1000, 1000));
} }

2
mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java
View File

@@ -85,7 +85,7 @@ public class MastodonLanguage {
private final MastodonLanguage fallbackLanguage; private final MastodonLanguage fallbackLanguage;
public LanguageResolver(Instance instanceInfo) { public LanguageResolver(Instance instanceInfo) {
String fallbackLanguageTag = !instanceInfo.languages.isEmpty() ? instanceInfo.languages.get(0) : ENGLISH.languageTag; String fallbackLanguageTag = (instanceInfo.languages != null && !instanceInfo.languages.isEmpty()) ? instanceInfo.languages.get(0) : ENGLISH.languageTag;
fallbackLanguage = allLanguages.stream() fallbackLanguage = allLanguages.stream()
.filter(l->l.languageTag.equalsIgnoreCase(fallbackLanguageTag)).findAny() .filter(l->l.languageTag.equalsIgnoreCase(fallbackLanguageTag)).findAny()
.orElse(ENGLISH); .orElse(ENGLISH);