From e52fc67f83e69e1357a31d5a86a58d3d936374a1 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sat, 16 May 2020 13:55:06 +0300 Subject: [PATCH] move reacting to profile changes after the check for theme change this is because a changed theme will recreate the activity, so there is no need to do any work that will be done upon the re-creation --- .../ktnx/mobileledger/ui/activity/MainActivity.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index dace5c41..bedd3b3e 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -410,8 +410,6 @@ public class MainActivity extends ProfileThemedActivity { */ private void onProfileChanged(MobileLedgerProfile profile) { boolean haveProfile = profile != null; - findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); if (haveProfile) setTitle(profile.getName()); @@ -420,20 +418,23 @@ public class MainActivity extends ProfileThemedActivity { this.profile = profile; - mProfileListAdapter.notifyDataSetChanged(); - int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; if (newProfileTheme != Colors.profileThemeId) { debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, newProfileTheme)); - MainActivity.this.profileThemeChanged(); Colors.profileThemeId = newProfileTheme; + profileThemeChanged(); // profileThemeChanged would restart the activity, so no need to reload the // data sets below return; } + findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); + findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + + mProfileListAdapter.notifyDataSetChanged(); + drawer.closeDrawers(); Data.transactions.clear(); -- 2.39.2