From a46640f43d7ebafb3a800f9fadc0cce7e0a8d820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Mon, 1 Apr 2019 21:47:41 +0200
Subject: [PATCH] Fix recreate when setting view mode

---
 .../java/com/beemdevelopment/aegis/ui/MainActivity.java  | 9 +++------
 .../beemdevelopment/aegis/ui/PreferencesFragment.java    | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 3c5b864c..491a55d7 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -83,6 +83,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _entryListView.setShowAccountName(getPreferences().isAccountNameVisible());
         _entryListView.setTapToReveal(getPreferences().isTapToRevealEnabled());
         _entryListView.setTapToRevealTime(getPreferences().getTapToRevealTime());
+        _entryListView.setViewMode(ViewMode.fromInteger(getPreferences().getCurrentViewMode()));
 
         // set up the floating action button
         _fabMenu = findViewById(R.id.fab);
@@ -169,22 +170,18 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     }
 
     private void onPreferencesResult(int resultCode, Intent data) {
-        ViewMode viewMode = ViewMode.fromInteger(getPreferences().getCurrentViewMode());
-        _entryListView.setViewMode(viewMode);
-
         // refresh the entire entry list if needed
         if (data.getBooleanExtra("needsRecreate", false)) {
-
-            _entryListView.clearEntries();
-            _entryListView.addEntries(_db.getEntries());
             recreate();
         } else if (data.getBooleanExtra("needsRefresh", false)) {
             boolean showAccountName = getPreferences().isAccountNameVisible();
             boolean tapToReveal = getPreferences().isTapToRevealEnabled();
             int tapToRevealTime = getPreferences().getTapToRevealTime();
+            int viewMode = getPreferences().getCurrentViewMode();
             _entryListView.setShowAccountName(showAccountName);
             _entryListView.setTapToReveal(tapToReveal);
             _entryListView.setTapToRevealTime(tapToRevealTime);
+
             _entryListView.refresh(true);
 
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
index 2e7dab6a..41a403ee 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
@@ -148,8 +148,8 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
 
                             dialog.dismiss();
 
+                            viewModePreference.setSummary("Selected: " + ViewMode.getViewModeName(i));
                             _result.putExtra("needsRecreate", true);
-                            getActivity().recreate();
                         })
                         .setPositiveButton(android.R.string.ok, null)
                         .create());