From 85bac9fc465c507ad4b1e57b55da7f6b04740aa6 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Tue, 15 Dec 2020 11:31:09 +1100
Subject: [PATCH] Fixed lock screen appears upon app start when there is no
 user setup yet.

---
 .../securesms/PassphraseRequiredActionBarActivity.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index 4b7960d50e..3ed8ae2011 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -38,7 +38,9 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     Log.i(TAG, "onCreate(" + savedInstanceState + ")");
     onPreCreate();
 
-    final boolean locked = KeyCachingService.isLocked(this);
+    final boolean locked = KeyCachingService.isLocked(this) &&
+            TextSecurePreferences.isScreenLockEnabled(this) &&
+            TextSecurePreferences.getLocalNumber(this) != null;
     routeApplicationState(locked);
 
     super.onCreate(savedInstanceState);