From eba872518826acad1355bc4836f1caf57c1d6a96 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Jun 2020 09:14:52 +0200
Subject: [PATCH] Fail safe

---
 app/src/main/java/eu/faircode/email/ActivityView.java  | 10 ++++++----
 .../main/java/eu/faircode/email/FragmentMessages.java  |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index b1c7c2fac8..d6a9e7253c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -395,10 +395,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         fragmentTransaction.commit();
     }
 
-    View getContentView() {
-        return drawerLayout.getChildAt(0);
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
@@ -731,6 +727,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         return super.onOptionsItemSelected(item);
     }
 
+    View getContentView() {
+        if (drawerLayout == null || drawerLayout.getChildCount() == 0)
+            return null;
+        return drawerLayout.getChildAt(0);
+    }
+
     private void checkFirst() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (prefs.getBoolean("first", true))
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4ec964ff84..e114188535 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4651,7 +4651,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             protected void onExecuted(Bundle args, final ArrayList<MessageTarget> result) {
                 ActivityView activity = (ActivityView) getActivity();
+                if (activity == null)
+                    return;
                 View content = activity.getContentView();
+                if (content == null)
+                    return;
 
                 // Show undo snackbar
                 final Snackbar snackbar = Snackbar.make(