From 6fa957a2ab632f94a582332ea42b7207ba85cbd5 Mon Sep 17 00:00:00 2001 From: Cleylson Freire Date: Fri, 27 Oct 2023 10:00:33 -0300 Subject: [PATCH] INS-1088 Fix conditions for app permissions. --- .../utils/AppPermissions.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/cardshowviewtakenpicturesview/src/main/java/br/com/stant/libraries/cardshowviewtakenpicturesview/utils/AppPermissions.java b/cardshowviewtakenpicturesview/src/main/java/br/com/stant/libraries/cardshowviewtakenpicturesview/utils/AppPermissions.java index 0327c22..3853b04 100644 --- a/cardshowviewtakenpicturesview/src/main/java/br/com/stant/libraries/cardshowviewtakenpicturesview/utils/AppPermissions.java +++ b/cardshowviewtakenpicturesview/src/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 deniedPermissions = new ArrayList<>(); + List 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; }