From 66e007df59bf99870d946f25598cb7ce56c2b2a9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 16 Oct 2018 10:20:31 +0000
Subject: [PATCH] Fixed crash

---
 .../java/eu/faircode/email/ActivityView.java  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 744b9cc8..8e54affd 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -256,7 +256,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle"));
 
         checkFirst();
-        checkIntent(getIntent());
         checkCrash();
         if (!Helper.isPlayStoreInstall(this))
             checkUpdate();
@@ -276,8 +275,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
     @Override
     protected void onNewIntent(Intent intent) {
-        checkIntent(intent);
         super.onNewIntent(intent);
+        setIntent(intent);
     }
 
     @Override
@@ -294,6 +293,18 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         iff.addAction(ACTION_STORE_ATTACHMENT);
         iff.addAction(ACTION_SHOW_PRO);
         lbm.registerReceiver(receiver, iff);
+
+        Intent intent = getIntent();
+        String action = intent.getAction();
+        Log.i(Helper.TAG, "View intent=" + intent + " action=" + action);
+        if (action != null && action.startsWith("thread")) {
+            intent.setAction(null);
+            setIntent(intent);
+
+            getSupportFragmentManager().popBackStack("unified", 0);
+            intent.putExtra("id", Long.parseLong(action.split(":")[1]));
+            onViewThread(intent);
+        }
     }
 
     @Override
@@ -457,19 +468,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }.load(this, new Bundle());
     }
 
-    private void checkIntent(Intent intent) {
-        String action = intent.getAction();
-        Log.i(Helper.TAG, "View intent=" + intent + " action=" + action);
-        if (action != null && action.startsWith("thread")) {
-            intent.setAction(null);
-            setIntent(intent);
-
-            getSupportFragmentManager().popBackStack("unified", 0);
-            intent.putExtra("id", Long.parseLong(action.split(":")[1]));
-            onViewThread(intent);
-        }
-    }
-
     private class UpdateInfo {
         public String tag_name; // version
         public String html_url;