Compare commits

...

3 Commits

Author SHA1 Message Date
Moxie Marlinspike
ca8c950553 Bump version to 2.0.8
// FREEBIE
2014-04-15 15:59:47 -07:00
Moxie Marlinspike
dc9a9b14b2 Merge pull request #1367 from mcginty/routing-undo
revert RoutingActivity flags
2014-04-14 15:02:42 -07:00
Jake McGinty
df9afc4e7f revert RoutingActivity flags
// FREEBIE
2014-04-14 14:49:15 -07:00
2 changed files with 2 additions and 11 deletions

View File

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.thoughtcrime.securesms"
android:versionCode="70"
android:versionName="2.0.7">
android:versionCode="71"
android:versionName="2.0.8">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>

View File

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