Merge pull request #1367 from mcginty/routing-undo

revert RoutingActivity flags
pull/1/head
Moxie Marlinspike 10 years ago
commit dc9a9b14b2

@ -132,19 +132,10 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
final Intent intent;
if (isShareAction()) {
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) {
intent = getConversationIntent(parameters);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
} else {
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);
finish();

Loading…
Cancel
Save