From e986072d46501e706526f435fb1f0b292179ab3c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 11 Jan 2022 22:42:30 +0100
Subject: [PATCH] Show last selected folder

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java |  5 +++--
 .../main/java/eu/faircode/email/FragmentFolders.java   | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 3c6cdfa076..94402a42ec 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -231,8 +231,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             view.setAlpha(folder.hide || disabled ? Helper.LOW_LIGHT : 1.0f);
 
             if (listener == null && selectedModel != null)
-                view.setBackgroundColor(selectedModel.isSelected(folder.id)
-                        ? colorSeparator : Color.TRANSPARENT);
+                itemView.setBackgroundColor(
+                        selectedModel.isSelected(folder.id)
+                                ? colorSeparator : Color.TRANSPARENT);
 
             if (textSize != 0)
                 tvName.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index cb9751b83b..074d68e6a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -146,6 +146,13 @@ public class FragmentFolders extends FragmentBase {
         show_hidden = false; // prefs.getBoolean("hidden_folders", false);
         show_flagged = prefs.getBoolean("flagged_folders", false);
 
+        if (BuildConfig.DEBUG) {
+            ViewModelSelected selectedModel =
+                    new ViewModelProvider(getActivity()).get(ViewModelSelected.class);
+            if (savedInstanceState == null)
+                selectedModel.select(null);
+        }
+
         setTitle(R.string.page_folders);
     }
 
@@ -409,9 +416,6 @@ public class FragmentFolders extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        if (BuildConfig.DEBUG)
-            new ViewModelProvider(getActivity()).get(ViewModelSelected.class);
-
         if (savedInstanceState != null)
             searching = savedInstanceState.getString("fair:searching");
         adapter.search(searching);