Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase robustness of instance data loading

This commit is contained in:
Grishka 2024-11-16 15:04:46 +03:00
parent 357041b995
commit a217167667
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
View File

@ -395,8 +395,14 @@ public class AccountSessionManager{
case 2 -> InstanceV2.class; case 2 -> InstanceV2.class;
default -> throw new IllegalStateException("Unexpected value: "+version); default -> throw new IllegalStateException("Unexpected value: "+version);
}); });
instances.put(domain, instance);
StringBuilder emojiSB=new StringBuilder(); StringBuilder emojiSB=new StringBuilder();
emojiSB.append(values.getAsString("emojis")); String emojiPart=values.getAsString("emojis");
if(emojiPart==null){
// not putting anything into instancesLastUpdated to force a reload
continue;
}
emojiSB.append(emojiPart);
//get emoji in chunks of 1MB if it didn't fit in the first query //get emoji in chunks of 1MB if it didn't fit in the first query
int emojiStringLength=values.getAsInteger("emoji_length"); int emojiStringLength=values.getAsInteger("emoji_length");
if(emojiStringLength>maxEmojiLength){ if(emojiStringLength>maxEmojiLength){
@ -409,13 +415,12 @@ public class AccountSessionManager{
} }
} }
List<Emoji> emojis=MastodonAPIController.gson.fromJson(emojiSB.toString(), new TypeToken<List<Emoji>>(){}.getType()); List<Emoji> emojis=MastodonAPIController.gson.fromJson(emojiSB.toString(), new TypeToken<List<Emoji>>(){}.getType());
instances.put(domain, instance);
customEmojis.put(domain, groupCustomEmojis(emojis)); customEmojis.put(domain, groupCustomEmojis(emojis));
instancesLastUpdated.put(domain, values.getAsLong("last_updated")); instancesLastUpdated.put(domain, values.getAsLong("last_updated"));
} }
}catch(Exception ex){ }catch(Exception ex){
Log.d(TAG, "readInstanceInfo failed", ex); Log.d(TAG, "readInstanceInfo failed", ex);
return; // instancesLastUpdated will not contain that domain, so instance data will be forced to be reloaded
} }
} }
if(!loadedInstances){ if(!loadedInstances){