From 89b2b1f88c57641630a998d0d23e647b1640b418 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 8 May 2024 15:02:37 +0200 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/FragmentOptionsNotifications.java | 3 ++- app/src/main/java/eu/faircode/email/NotificationHelper.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index eef0c76777..dd6647717a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -21,6 +21,7 @@ package eu.faircode.email; import static android.app.Activity.RESULT_OK; +import android.Manifest; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.StatusBarManager; @@ -511,7 +512,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared grpScreenOn.setVisibility( BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || - hasPermission("android.permission.TURN_SCREEN_ON") + hasPermission(Manifest.permission.TURN_SCREEN_ON) ? View.VISIBLE : View.GONE); swNotifyScreenOn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override diff --git a/app/src/main/java/eu/faircode/email/NotificationHelper.java b/app/src/main/java/eu/faircode/email/NotificationHelper.java index 4d72790228..0ee2551acf 100644 --- a/app/src/main/java/eu/faircode/email/NotificationHelper.java +++ b/app/src/main/java/eu/faircode/email/NotificationHelper.java @@ -22,6 +22,7 @@ package eu.faircode.email; import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS; import static androidx.core.app.NotificationCompat.DEFAULT_SOUND; +import android.Manifest; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; @@ -395,7 +396,7 @@ class NotificationHelper { if (notify_screen_on && !(BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU || - Helper.hasPermission(context, "android.permission.TURN_SCREEN_ON"))) + Helper.hasPermission(context, Manifest.permission.TURN_SCREEN_ON))) notify_screen_on = false; Log.i("Notify messages=" + messages.size() +