From da629df63028d670e55539f99f58c3ea9dce6da3 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 26 Jun 2018 11:42:54 -0300
Subject: [PATCH] Ensure that pressing back after setup will always return the
user to home
---
.../org/briarproject/briar/android/login/SetupActivity.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
index d2dff6a28e..f91c57512f 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -94,7 +95,7 @@ public class SetupActivity extends BaseActivity
void showApp() {
Intent i = new Intent(this, OpenDatabaseActivity.class);
- i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+ i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
startActivity(i);
supportFinishAfterTransition();
overridePendingTransition(R.anim.screen_new_in, R.anim.screen_old_out);
--
GitLab