From 54200991cbfca06a9bb76bb50c5adcd5212e87e0 Mon Sep 17 00:00:00 2001 From: sk Date: Fri, 13 Jan 2023 18:18:39 +0100 Subject: [PATCH] Revert "work around crash theme switch" This reverts commit 58fd0c444f30aa5352486b97cab34b2aca6ce8ab. --- .../android/fragments/HomeFragment.java | 15 ++++----------- .../android/fragments/SettingsFragment.java | 1 - 2 files changed, 4 insertions(+), 12 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 index c4bd2b03a..32c42463d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -5,7 +5,6 @@ import android.app.NotificationManager; 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; @@ -258,15 +257,9 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene public void onSaveInstanceState(Bundle outState){ super.onSaveInstanceState(outState); outState.putInt("selectedTab", currentTab); - 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()); - } + getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment); + getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment); + getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment); + getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index f98e0d534..4de83ccea 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -400,7 +400,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ 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(); }