From c0e1507ef4311370c9d884264e164879e6fd4d65 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 7 Mar 2022 09:58:48 -0500
Subject: [PATCH] Don't cancel KeyCachingService if not necessary.

This relates to #12043. There's some xiaomi-specific issue, and this
code was causing a pending intent creation on every app startup,
preventing it from opening. This call shouldn't be necessary unless
screenlock is active.
---
 .../org/thoughtcrime/securesms/service/KeyCachingService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
index 04273c615..f7811b73e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -103,7 +103,9 @@ public class KeyCachingService extends Service {
   }
 
   public static void onAppForegrounded(@NonNull Context context) {
-    ServiceUtil.getAlarmManager(context).cancel(buildExpirationPendingIntent(context));
+    if (TextSecurePreferences.isScreenLockEnabled(context) || !TextSecurePreferences.isPasswordDisabled(context)) {
+      ServiceUtil.getAlarmManager(context).cancel(buildExpirationPendingIntent(context));
+    }
   }
 
   public static void onAppBackgrounded(@NonNull Context context) {