Merge branch 'master' into donations

# Conflicts: # mastodon/build.gradle
2024-07-01 00:57:35 +03:00
parent 027b873f13 f9fd62db09
commit 188da6dbf7
13 changed files with 369 additions and 300 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -399,7 +399,7 @@ public class AccountSessionManager{
 		}
 		if(!loadedInstances){
 			loadedInstances=true;
-			maybeUpdateCustomEmojis(domains);
+			MastodonAPIController.runInBackground(()->maybeUpdateCustomEmojis(domains));
 		}
 	}