From 9603ff93e913d3e8e59e7ff306fc0372e00e427b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 13 Aug 2020 10:19:33 +0100
Subject: [PATCH] Don't sign out when panic button is triggered if configured
 not to.

---
 .../briar/android/panic/PanicResponderActivity.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java
index 1491e3659..f75167fb4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java
@@ -57,15 +57,19 @@ public class PanicResponderActivity extends BriarActivity {
 					if (sharedPref.getBoolean(KEY_PURGE, false)) {
 						LOG.info("Purging all data...");
 						signOut(true, true);
-					} else {
+					} else if (sharedPref.getBoolean(KEY_LOCK, true)) {
 						LOG.info("Signing out...");
 						signOut(true, false);
+					} else {
+						LOG.info("Configured not to purge or lock");
 					}
 				} else if (sharedPref.getBoolean(KEY_LOCK, true)) {
 					// non-destructive actions are allowed by non-connected
 					// trusted apps
 					LOG.info("Signing out...");
 					signOut(true, false);
+				} else {
+					LOG.info("Configured not to lock");
 				}
 			}
 		}