From 7fe0d12ba44d77bf9a7f5bfb3e43b2a845b2bd54 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 6 Feb 2019 18:03:47 +0100
Subject: [PATCH] Potential crashes

---
 .../gouv/etalab/mastodon/activities/BaseMainActivity.java   | 6 +++++-
 .../main/java/fr/gouv/etalab/mastodon/helper/Helper.java    | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index 02591207f..aaf1103e0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -1548,7 +1548,11 @@ public abstract class BaseMainActivity extends BaseActivity
                     editor.putBoolean(Helper.SET_POPUP_PUSH, true);
                     editor.apply();
                 }
-            }).show();
+            });
+            try {
+                dialogBuilder.show();
+            }catch (Exception ignored){};
+
         }
         Helper.switchLayout(BaseMainActivity.this);
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index afbc0302d..c338bbce0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -79,6 +79,7 @@ import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -544,7 +545,7 @@ public class Helper {
 
     /**
      * Log out the authenticated user by removing its token
-     * @param context Context
+     * @param activity Activity
      */
     public static void logoutCurrentUser(Activity activity) {
         SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);