From 3aa024e55372dfa72d8eafac507dd089420eaa63 Mon Sep 17 00:00:00 2001
From: Taylor Kline <taylor.kline@streamingfreebies.com>
Date: Tue, 29 Mar 2016 17:52:54 -0500
Subject: [PATCH] Ensure the browser does not re-use the current tab by
 removing the Browser.EXTRA_APPLICATION_ID Extra instead of adding the newer
 EXTRA_CREATE_NEW_TAB extra.

Closes #5397
Fixes #4874
Fixes #5356
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 1504e885a0..566b81f5ed 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -33,6 +33,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
+import android.provider.Browser;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
 import android.support.v4.view.WindowCompat;
@@ -368,6 +369,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  @Override
+  public void startActivity(Intent intent) {
+    if (intent.getStringExtra(Browser.EXTRA_APPLICATION_ID) != null) {
+      intent.removeExtra(Browser.EXTRA_APPLICATION_ID);
+    }
+    super.startActivity(intent);
+  }
+
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     MenuInflater inflater = this.getMenuInflater();