empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1367 from mcginty/routing-undo

Browse source 
revert RoutingActivity flags
This commit is contained in:
Moxie Marlinspike 2014-04-14 15:02:42 -07:00
commit dc9a9b14b2
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/RoutingActivity.java
View file

@ -132,19 +132,10 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
final Intent intent; final Intent intent;
if (isShareAction()) { if (isShareAction()) {
intent = getShareIntent(parameters); intent = getShareIntent(parameters);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
}
} else if (parameters.recipients != null) { } else if (parameters.recipients != null) {
intent = getConversationIntent(parameters); intent = getConversationIntent(parameters);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
} else { } else {
intent = getConversationListIntent(); intent = getConversationListIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);
}
} }
startActivity(intent); startActivity(intent);
finish(); finish();