Merge pull request #72 from stantmob/bug/INS-1088

Bug/INS-1088
stantmob · Oct 27, 2023 · 55a64cb · 55a64cb
2 parents 25d0f54 + 6fa957a
commit 55a64cb
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/.../main/java/br/com/stant/libraries/cardshowviewtakenpicturesview/utils/AppPermissions.java b/.../main/java/br/com/stant/libraries/cardshowviewtakenpicturesview/utils/AppPermissions.java
@@ -56,13 +56,13 @@ public class AppPermissions {
             Manifest.permission.VIBRATE};
 
     private static String[] getPermissions() {
-        switch (Build.VERSION.SDK_INT) {
-            case Build.VERSION_CODES.TIRAMISU:
-                return PERMISSIONS_SDK_33;
-            case Build.VERSION_CODES.Q:
-                return PERMISSIONS_SDK_29;
-            default:
-                return PERMISSIONS;
+        int sdkVersion = Build.VERSION.SDK_INT;
+        if (sdkVersion >= Build.VERSION_CODES.TIRAMISU) {
+            return PERMISSIONS_SDK_33;
+        } else if (sdkVersion >= Build.VERSION_CODES.Q) {
+            return PERMISSIONS_SDK_29;
+        } else {
+            return PERMISSIONS;
         }
     }
 
@@ -100,9 +100,7 @@ private static void configureDialogs(Activity activity, Dialog informationDialog
         TextView okButton = informationDialog.findViewById(R.id.permission_information_dialog_confirmation_text_view);
 
         informationText.setText(activity.getResources().getString(contentText));
-
         settingsButton.setVisibility(visibility);
-
         addListeners(activity, informationDialog, okButton, settingsButton);
 
     }
@@ -133,17 +131,17 @@ private static void requestPermission(Activity activity) {
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public static boolean hasPermissionsOn(Context context) {
         boolean result = true;
-        List<String> deniedPermissions = new ArrayList<>();
+        List<String> denied = new ArrayList<>();
 
         for (String permission : getPermissions()) {
             if (ActivityCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
-                deniedPermissions.add(permission);
+                denied.add(permission);
                 result = false;
             }
         }
 
-        AppPermissions.deniedPermissions = new String[deniedPermissions.size()];
-        deniedPermissions.toArray(AppPermissions.deniedPermissions);
+        deniedPermissions = new String[denied.size()];
+        denied.toArray(deniedPermissions);
 
         return result;
     }