From 468659aa545d9d7c672ce44a2671d6cd8a2ab24e Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 11 Jun 2022 19:30:05 +0200 Subject: [PATCH] Fixed requesting permissions --- .../eu/faircode/email/FragmentDialogPermissions.java | 2 +- .../main/java/eu/faircode/email/FragmentMessages.java | 10 ++-------- .../main/java/eu/faircode/email/FragmentOptions.java | 2 +- app/src/main/java/eu/faircode/email/Helper.java | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java b/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java index 470a07a1f4..ddbfc95f74 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java @@ -74,7 +74,7 @@ public class FragmentDialogPermissions extends FragmentDialogBase { boolean hasContactPermissions = Helper.hasPermission(context, Manifest.permission.READ_CONTACTS); boolean hasNotificationPermissions = - (Helper.getTargetSdk(context) < Build.VERSION_CODES.TIRAMISU || + (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || Helper.hasPermission(context, Manifest.permission.POST_NOTIFICATIONS)); boolean isIgnoring = !Boolean.FALSE.equals(Helper.isIgnoringOptimizations(context)); boolean canScheduleExact = AlarmManagerCompatEx.canScheduleExactAlarms(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index bfae8aa500..c111ecbb27 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -623,14 +623,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. tvNotifications.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent; - if (Helper.getTargetSdk(v.getContext()) < Build.VERSION_CODES.TIRAMISU) - intent = new Intent( - Settings.ACTION_APPLICATION_DETAILS_SETTINGS, - Uri.parse("package:" + BuildConfig.APPLICATION_ID)); - else - intent = new Intent(v.getContext(), ActivitySetup.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + Intent intent = new Intent(v.getContext(), ActivitySetup.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); v.getContext().startActivity(intent); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 27cabf108e..8f40f1af31 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -491,7 +491,7 @@ public class FragmentOptions extends FragmentBase { boolean hasContactPermissions = hasPermission(Manifest.permission.READ_CONTACTS); boolean hasNotificationPermissions = - (Helper.getTargetSdk(context) < Build.VERSION_CODES.TIRAMISU || + (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || hasPermission(Manifest.permission.POST_NOTIFICATIONS)); boolean isIgnoring = !Boolean.FALSE.equals(Helper.isIgnoringOptimizations(context)); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 8c40fb2bd8..758bd8d54c 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -394,7 +394,7 @@ public class Helper { static String[] getDesiredPermissions(Context context) { List permissions = new ArrayList<>(); permissions.add(Manifest.permission.READ_CONTACTS); - if (getTargetSdk(context) >= Build.VERSION_CODES.TIRAMISU) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) permissions.add(Manifest.permission.POST_NOTIFICATIONS); return permissions.toArray(new String[0]); }