From b59c1b7706220c4a8fb986cb496722ecd25d7726 Mon Sep 17 00:00:00 2001 From: hipgnose Date: Wed, 22 Apr 2026 13:38:49 -0300 Subject: [PATCH 1/4] LoyaltyCardViewActivity opens over lockscreen and finish if DisableLockscreenWhileViewingCard --- app/src/main/AndroidManifest.xml | 3 ++- .../card_locker/LoyaltyCardViewActivity.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 596b2f9ba6..865b264f48 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -96,7 +96,8 @@ + android:theme="@style/AppTheme.NoActionBar" + android:showWhenLocked="true" /> = Build.VERSION_CODES.O_MR1) { - setShowWhenLocked(true); - } else { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) { showWhenLockedSdkLessThan27(window); } + } else if (isLockScreenShowing()) { + Log.d(TAG, "Finish activity due to disabled lock screen viewing"); + // If the user disabled lock screen viewing and lock the device with this activity open + // this will finish it and the user will go to the previous activity in the stack or none + // Unfortunately we don't have a better way to handle this yet + finish(); } window.setAttributes(attributes); @@ -1285,4 +1290,9 @@ private void copyCardIdToClipboard() { Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); } + + private boolean isLockScreenShowing() { + KeyguardManager km = (KeyguardManager) getSystemService(KEYGUARD_SERVICE); + return km.isKeyguardLocked(); + } } From ee6c74d79268fb4c0245a6a30e28861de32f853a Mon Sep 17 00:00:00 2001 From: hipgnose Date: Wed, 22 Apr 2026 15:36:24 -0300 Subject: [PATCH 2/4] LoyaltyCardViewActivity to not show when locked instead of finishing it --- .../java/protect/card_locker/LoyaltyCardViewActivity.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 62098a2092..6507997918 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -671,12 +671,8 @@ protected void onResume() { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) { showWhenLockedSdkLessThan27(window); } - } else if (isLockScreenShowing()) { - Log.d(TAG, "Finish activity due to disabled lock screen viewing"); - // If the user disabled lock screen viewing and lock the device with this activity open - // this will finish it and the user will go to the previous activity in the stack or none - // Unfortunately we don't have a better way to handle this yet - finish(); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { + setShowWhenLocked(false); } window.setAttributes(attributes); From 7c9d81d54a6d8e5365c6be88ab5e9cf726fc83f4 Mon Sep 17 00:00:00 2001 From: hipgnose Date: Wed, 22 Apr 2026 15:42:50 -0300 Subject: [PATCH 3/4] Remove unused function --- .../java/protect/card_locker/LoyaltyCardViewActivity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 6507997918..d57b7b206d 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -1286,9 +1286,4 @@ private void copyCardIdToClipboard() { Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); } - - private boolean isLockScreenShowing() { - KeyguardManager km = (KeyguardManager) getSystemService(KEYGUARD_SERVICE); - return km.isKeyguardLocked(); - } } From 429ba961e1a5a9680f70c78f507fd58d92ed1718 Mon Sep 17 00:00:00 2001 From: hipgnose Date: Wed, 22 Apr 2026 16:13:36 -0300 Subject: [PATCH 4/4] Removes unused import --- .../main/java/protect/card_locker/LoyaltyCardViewActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index d57b7b206d..2d3aa8e4ec 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -1,6 +1,5 @@ package protect.card_locker; -import android.app.KeyguardManager; import android.content.ActivityNotFoundException; import android.content.ClipData; import android.content.ClipboardManager;