work around crash theme switch

LucasGGamerM#280
FineFindus · Jan 13, 2023 · 58fd0c4 · 58fd0c4
1 parent 2b30ffd
commit 58fd0c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -5,6 +5,7 @@
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -257,9 +258,15 @@ public boolean onBackPressed(){
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-		getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
-		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+		try {
+			getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
+			getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+			getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+			getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+		} catch (IllegalStateException ex) {
+			// java.lang.IllegalStateException: Fragment HomeTabFragment{3447cad} is not currently in the FragmentManager
+			// no idea how to fix this :/
+			Log.e(HomeFragment.class.getSimpleName(), ex.getMessage());
+		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -400,6 +400,7 @@ private void restartActivityToApplyNewTheme(){
 			lp.windowAnimations=R.style.window_fade_out;
 			MastodonApp.context.getSystemService(WindowManager.class).addView(themeTransitionWindowView, lp);
 		}
+		needAppRestart = true; // avoid issues with corrupted, not correctly inset HomeTabFragment
 		getActivity().recreate();
 	}