From 4cb1616a3187b62362e6d07147d1a7693057a57a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 1 Jun 2020 17:56:30 +0200
Subject: [PATCH] Some fixes

---
 .../java/app/fedilab/android/activities/WebviewActivity.java    | 2 +-
 .../main/java/app/fedilab/android/client/Entities/Account.java  | 2 +-
 app/src/main/java/app/fedilab/android/helper/Helper.java        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
index 181b39523..a0eda86da 100644
--- a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
@@ -190,7 +190,7 @@ public class WebviewActivity extends BaseActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         if (!peertubeLink)
-            setCount(this, "0");
+            setCount(WebviewActivity.this, "0");
         defaultMenu = menu;
         return super.onPrepareOptionsMenu(menu);
     }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
index 0a6f3e98e..f901f3fe1 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
@@ -202,7 +202,7 @@ public class Account implements Parcelable {
 
     public static void makeAccountNameEmoji(final WeakReference<Context> contextWeakReference, Account account) {
         Context context = contextWeakReference.get();
-        if ((context instanceof Activity && ((Activity) context).isFinishing()) || account.getDisplay_name() == null)
+        if ((context instanceof Activity && ((Activity) context).isFinishing()) || account == null || account.getDisplay_name() == null)
             return;
 
         account.setDisplayNameSpan(new SpannableString(account.getDisplay_name()));
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index d0ede0a82..c5dc98209 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -3135,6 +3135,7 @@ public class Helper {
                 finalUrl = "http://" + url;
             b.putString("url", finalUrl);
             intent.putExtras(b);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
         } else {
             boolean custom_tabs = sharedpreferences.getBoolean(Helper.SET_CUSTOM_TABS, true);
@@ -3149,6 +3150,7 @@ public class Helper {
                 }
             } else {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.setData(Uri.parse(url));
                 try {
                     context.startActivity(intent);