From 2f1199674cd84cdbd065019e355070f543a8d187 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 8 Jun 2023 13:17:03 +0200 Subject: [PATCH] Debug: screen on / Android 14 --- app/src/debug/AndroidManifest.xml | 757 ++++++++++++++++++ app/src/main/java/eu/faircode/email/Core.java | 3 +- .../email/FragmentOptionsNotifications.java | 3 +- 3 files changed, 761 insertions(+), 2 deletions(-) create mode 100644 app/src/debug/AndroidManifest.xml diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000000..d6d36facd8 --- /dev/null +++ b/app/src/debug/AndroidManifest.xml @@ -0,0 +1,757 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index e37e0e359a..d5a92527a2 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -5237,7 +5237,8 @@ class Core { if (redacted) notify_summary = true; if (notify_screen_on && - !(Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || + !(BuildConfig.DEBUG || + Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || Helper.hasPermission(context, "android.permission.TURN_SCREEN_ON"))) notify_screen_on = false; diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index 0b6ef84787..97a0b45c66 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -502,7 +502,8 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared }); grpScreenOn.setVisibility( - Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || + BuildConfig.DEBUG || + Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || hasPermission("android.permission.TURN_SCREEN_ON") ? View.VISIBLE : View.GONE); swNotifyScreenOn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {