From 6f1e19551eaba9a9386886d38998b7e6856166da Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Tue, 28 Oct 2025 11:39:04 +0100 Subject: [PATCH 1/2] Remove unused private Method PermissionHelper.deliverPermissionResult - The method deliverPermissionResult is private and nowhere used. Because it's private, it cannot be called from outside and cannot be overwritten and is safe to remove. --- .../src/org/apache/cordova/PermissionHelper.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index bac8b8fe5..8263255fa 100644 --- a/framework/src/org/apache/cordova/PermissionHelper.java +++ b/framework/src/org/apache/cordova/PermissionHelper.java @@ -71,18 +71,4 @@ public static void requestPermissions(CordovaPlugin plugin, int requestCode, Str public static boolean hasPermission(CordovaPlugin plugin, String permission) { return plugin.cordova.hasPermission(permission); } - - private static void deliverPermissionResult(CordovaPlugin plugin, int requestCode, String[] permissions) { - // Generate the request results - int[] requestResults = new int[permissions.length]; - Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED); - - try { - // This one is deprecated - see https://github.com/apache/cordova-android/issues/592 - plugin.onRequestPermissionResult(requestCode, permissions, requestResults); - plugin.onRequestPermissionsResult(requestCode, permissions, requestResults); - } catch (JSONException e) { - LOG.e(LOG_TAG, "JSONException when delivering permissions results", e); - } - } } \ No newline at end of file From 4dd78c075458da8ce5f17843c670e77ea96b11cb Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Tue, 28 Oct 2025 11:39:04 +0100 Subject: [PATCH 2/2] Remove unused private Method PermissionHelper.deliverPermissionResult - The method deliverPermissionResult is private and nowhere used. Because it's private, it cannot be called from outside and cannot be overwritten and is safe to remove. --- .../src/org/apache/cordova/PermissionHelper.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index bac8b8fe5..c4d4cb2ad 100644 --- a/framework/src/org/apache/cordova/PermissionHelper.java +++ b/framework/src/org/apache/cordova/PermissionHelper.java @@ -29,8 +29,6 @@ Licensed to the Apache Software Foundation (ASF) under one * written for cordova-android 5.0.0+ can still compile with earlier cordova-android versions. */ public class PermissionHelper { - private static final String LOG_TAG = "CordovaPermissionHelper"; - /** * Requests a "dangerous" permission for the application at runtime. This is a helper method * alternative to cordovaInterface.requestPermission() that does not require the project to be @@ -71,18 +69,4 @@ public static void requestPermissions(CordovaPlugin plugin, int requestCode, Str public static boolean hasPermission(CordovaPlugin plugin, String permission) { return plugin.cordova.hasPermission(permission); } - - private static void deliverPermissionResult(CordovaPlugin plugin, int requestCode, String[] permissions) { - // Generate the request results - int[] requestResults = new int[permissions.length]; - Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED); - - try { - // This one is deprecated - see https://github.com/apache/cordova-android/issues/592 - plugin.onRequestPermissionResult(requestCode, permissions, requestResults); - plugin.onRequestPermissionsResult(requestCode, permissions, requestResults); - } catch (JSONException e) { - LOG.e(LOG_TAG, "JSONException when delivering permissions results", e); - } - } } \ No newline at end of file