blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
Taylor Kline 2016-03-29 17:52:54 -05:00 committed by Moxie Marlinspike
parent 2a23b53988
commit 3aa024e553
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -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();