From 1e729d97a02ba7710dd48865cb130dc8cabb658a Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sat, 29 Jun 2024 09:11:03 +0300
Subject: [PATCH] Crash fixes

---
 .../java/org/joinmastodon/android/GlobalUserPreferences.java    | 2 +-
 .../joinmastodon/android/api/session/AccountSessionManager.java | 2 +-
 .../org/joinmastodon/android/fragments/ComposeFragment.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 7be513f9..7f204b6e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -10,7 +10,7 @@ public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
 	public static boolean altTextReminders, confirmUnfollow, confirmBoost, confirmDeletePost;
-	public static ThemePreference theme;
+	public static ThemePreference theme=ThemePreference.AUTO;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
index bdcd58c5..b108baa7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -94,7 +94,7 @@ public class AccountSessionManager{
 			Log.e(TAG, "Error loading accounts", x);
 		}
 		lastActiveAccountID=prefs.getString("lastActiveAccount", null);
-		MastodonAPIController.runInBackground(()->readInstanceInfo(domains));
+		readInstanceInfo(domains);
 		maybeUpdateShortcuts();
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index b05ecc09..8a12b5f1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -544,7 +544,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements ComposeE
 				ignoreSelectionChanges=true;
 				mainEditText.setSelection(mainEditText.length());
 				ignoreSelectionChanges=false;
-				mediaViewController.onViewCreated(savedInstanceState);;
+				mediaViewController.onViewCreated(savedInstanceState);
 			}else{
 				String prefilledText=getArguments().getString("prefilledText");
 				if(!TextUtils.isEmpty(prefilledText)){