From ad38f63bf83b1c8d5a7bad28f99639d71c5484dc Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Sun, 9 Feb 2014 17:43:40 +0000 Subject: [PATCH] Don't launch more than one instance of PasswordActivity. --- briar-android/src/org/briarproject/android/BriarActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java index 3b6ad77e94..c2692b613e 100644 --- a/briar-android/src/org/briarproject/android/BriarActivity.java +++ b/briar-android/src/org/briarproject/android/BriarActivity.java @@ -1,6 +1,7 @@ package org.briarproject.android; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; +import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; import static java.util.logging.Level.INFO; import java.util.logging.Logger; @@ -35,7 +36,7 @@ public class BriarActivity extends RoboFragmentActivity { if(databaseConfig.getEncryptionKey() == null) { if(LOG.isLoggable(INFO)) LOG.info("No password"); Intent i = new Intent(this, PasswordActivity.class); - i.setFlags(FLAG_ACTIVITY_NO_ANIMATION); + i.setFlags(FLAG_ACTIVITY_NO_ANIMATION | FLAG_ACTIVITY_SINGLE_TOP); startActivityForResult(i, REQUEST_PASSWORD); } else { startAndBindService(); -- GitLab