From 189fd5aefbddb023a1e692ca1bb282ed2c69f7bb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 17 May 2019 16:44:37 +0200
Subject: [PATCH] Remove model observer on destroy

---
 .../eu/faircode/email/ViewModelMessages.java  | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 6f536b9fbd..182dbb7f67 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -60,17 +60,15 @@ public class ViewModelMessages extends ViewModel {
             String query, boolean server) {
 
         Args args = new Args(context, account, folder, thread, id, query, server);
-        Log.i("Get model " + viewType + " " + args);
+        Log.i("Get model=" + viewType + " " + args);
         dump();
 
         Model model = models.get(viewType);
         if (model == null || !model.args.equals(args)) {
-            Log.i("Creating model");
+            Log.i("Creating model=" + viewType + " replace=" + (model != null));
 
-            if (model != null) {
+            if (model != null)
                 model.clear();
-                model.list.removeObservers(owner);
-            }
 
             DB db = DB.getInstance(context);
 
@@ -149,27 +147,6 @@ public class ViewModelMessages extends ViewModel {
             model = new Model(args, builder.build(), boundary);
             models.put(viewType, model);
 
-            owner.getLifecycle().addObserver(new LifecycleObserver() {
-                @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-                public void onDestroyed() {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean cache = prefs.getBoolean("cache_lists", true);
-
-                    int free_mb = Helper.getFreeMemMb();
-                    boolean lowmem = (free_mb < LOW_MEM_MB);
-
-                    Log.i("Destroy model " + viewType +
-                            " cache=" + cache + " lowmem=" + lowmem + " free=" + free_mb + " MB");
-
-                    if (viewType == AdapterMessage.ViewType.THREAD || !cache || lowmem) {
-                        Log.i("Remove model " + viewType);
-                        remove(viewType);
-                    }
-
-                    dump();
-                }
-            });
-
             if (viewType != AdapterMessage.ViewType.THREAD)
                 // Keep list up-to-date for previous/next navigation
                 model.list.observeForever(new Observer<PagedList<TupleMessageEx>>() {
@@ -179,6 +156,33 @@ public class ViewModelMessages extends ViewModel {
                 });
         }
 
+        owner.getLifecycle().addObserver(new LifecycleObserver() {
+            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            public void onDestroyed() {
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean cache = prefs.getBoolean("cache_lists", true);
+
+                int free_mb = Helper.getFreeMemMb();
+                boolean lowmem = (free_mb < LOW_MEM_MB);
+
+                Log.i("Destroy model=" + viewType +
+                        " cache=" + cache + " lowmem=" + lowmem + " free=" + free_mb + " MB");
+
+                Model model = models.get(viewType);
+                if (model != null) {
+                    Log.i("Remove observer model=" + viewType);
+                    model.list.removeObservers(owner);
+                }
+
+                if (viewType == AdapterMessage.ViewType.THREAD || !cache || lowmem) {
+                    Log.i("Remove model=" + viewType);
+                    remove(viewType);
+                }
+
+                dump();
+            }
+        });
+
         if (viewType == AdapterMessage.ViewType.UNIFIED) {
             remove(AdapterMessage.ViewType.FOLDER);
             remove(AdapterMessage.ViewType.SEARCH);