From 1c794eb9a03c3c3c29860eb974d0f7970b6002c9 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Thu, 24 Sep 2020 19:07:11 +0300
Subject: [PATCH] fix setup of theme when the last profile was removed

the old preference was still available and caused usage of the theme
of the last profile instead of the default
---
 .../mobileledger/ui/activity/MainActivity.java  | 17 +----------------
 1 file changed, 1 insertion(+), 16 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 dc4645bc..c66f43c4 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
@@ -18,7 +18,6 @@
 package net.ktnx.mobileledger.ui.activity;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
@@ -80,7 +79,6 @@ public class MainActivity extends ProfileThemedActivity {
     public static final String STATE_CURRENT_PAGE = "current_page";
     public static final String BUNDLE_SAVED_STATE = "bundle_savedState";
     public static final String STATE_ACC_FILTER = "account_filter";
-    private static final String PREF_THEME_ID = "themeId";
     DrawerLayout drawer;
     private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
     private View bTransactionListCancelDownload;
@@ -132,13 +130,9 @@ public class MainActivity extends ProfileThemedActivity {
     }
     @Override
     protected void setupProfileColors() {
-        SharedPreferences prefs = getPreferences(MODE_PRIVATE);
-        int profileColor = prefs.getInt(PREF_THEME_ID, -2);
-        if (profileColor == -2)
-            profileColor = Data.retrieveCurrentThemeIdFromDb();
+        final int profileColor = Data.retrieveCurrentThemeIdFromDb();
         Colors.setupTheme(this, profileColor);
         Colors.profileThemeId = profileColor;
-        storeThemeIdInPrefs(profileColor);
     }
     @Override
     protected void onResume() {
@@ -464,8 +458,6 @@ public class MainActivity extends ProfileThemedActivity {
         updateLastUpdateTextFromDB();
     }
     private void profileThemeChanged() {
-        storeThemeIdInPrefs(profile.getThemeHue());
-
         // un-hook all observed LiveData
         Data.removeProfileObservers(this);
         Data.profiles.removeObservers(this);
@@ -475,13 +467,6 @@ public class MainActivity extends ProfileThemedActivity {
 
         recreate();
     }
-    private void storeThemeIdInPrefs(int themeId) {
-        // store the new theme id in the preferences
-        SharedPreferences prefs = getPreferences(MODE_PRIVATE);
-        SharedPreferences.Editor e = prefs.edit();
-        e.putInt(PREF_THEME_ID, themeId);
-        e.apply();
-    }
     public void startEditProfileActivity(MobileLedgerProfile profile) {
         Intent intent = new Intent(this, ProfileDetailActivity.class);
         Bundle args = new Bundle();
-- 
2.39.5