godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Fix invalid return value when multiple permission requests are dispatched

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2024-06-02 17:22:51 -07:00
parent 705b7a0b0b
commit 53279d2510
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java
View File

@@ -125,7 +125,7 @@ public final class PermissionsUtil {
} }
activity.requestPermissions(requestedPermissions.toArray(new String[0]), REQUEST_ALL_PERMISSION_REQ_CODE); activity.requestPermissions(requestedPermissions.toArray(new String[0]), REQUEST_ALL_PERMISSION_REQ_CODE);
return true; return false;
} }
/** /**
@@ -281,9 +281,10 @@ public final class PermissionsUtil {
public static boolean hasManifestPermission(Context context, String permission) { public static boolean hasManifestPermission(Context context, String permission) {
try { try {
for (String p : getManifestPermissions(context)) { for (String p : getManifestPermissions(context)) {
if (permission.equals(p)) if (permission.equals(p)) {
return true; return true;
} }
}
} catch (PackageManager.NameNotFoundException ignored) { } catch (PackageManager.NameNotFoundException ignored) {
} }
@@ -299,8 +300,9 @@ public final class PermissionsUtil {
public static ArrayList<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException { public static ArrayList<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException {
PackageManager packageManager = context.getPackageManager(); PackageManager packageManager = context.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS); PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS);
if (packageInfo.requestedPermissions == null) if (packageInfo.requestedPermissions == null) {
return new ArrayList<String>(); return new ArrayList<>();
}
return new ArrayList<>(Arrays.asList(packageInfo.requestedPermissions)); return new ArrayList<>(Arrays.asList(packageInfo.requestedPermissions));
} }