From 2e78c7fad5db4b6b5943b04f77455564f470af00 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 4 Nov 2018 10:26:55 +0000
Subject: [PATCH] Prevent crash

---
 .../email/BoundaryCallbackMessages.java       | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 7d95548db8..1b39807eda 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -60,6 +60,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         @Override
                         public void run() {
                             model.clear();
+                            model = null;
                         }
                     });
             }
@@ -83,36 +84,37 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     }
 
     private void load() {
-        executor.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    searching = true;
-                    handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            intf.onLoading();
-                        }
-                    });
-                    model.load();
-                } catch (final Throwable ex) {
-                    Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
-                    handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            intf.onError(model.getContext(), ex);
-                        }
-                    });
-                } finally {
-                    searching = false;
-                    handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            intf.onLoaded();
-                        }
-                    });
+        if (model != null)
+            executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        searching = true;
+                        handler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                intf.onLoading();
+                            }
+                        });
+                        model.load();
+                    } catch (final Throwable ex) {
+                        Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
+                        handler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                intf.onError(model.getContext(), ex);
+                            }
+                        });
+                    } finally {
+                        searching = false;
+                        handler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                intf.onLoaded();
+                            }
+                        });
+                    }
                 }
-            }
-        });
+            });
     }
 }
\ No newline at end of file