fix(permissions): remove useless permissions

glpi-project · Sep 4, 2023 · 704fe36 · 704fe36
1 parent 08adc0c
commit 704fe36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/app/src/main/java/org/glpi/inventory/agent/ui/ActivityInventoryReport.java b/app/src/main/java/org/glpi/inventory/agent/ui/ActivityInventoryReport.java
@@ -87,9 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActivityCompat.requestPermissions(ActivityInventoryReport.this,
                 new String[]{
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
                         Manifest.permission.READ_PHONE_STATE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.CAMERA,
                 },
                 1);
@@ -197,15 +195,14 @@ public void sendInventory(String data, ArrayList<String> load) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
             case 1: {
 
                 // If request is cancelled, the result arrays are empty.
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[2] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[3] == PackageManager.PERMISSION_GRANTED) {
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
                 } else {
                     String message = getResources().getString(R.string.permission_error_result);
                     Helpers.snackClose(ActivityInventoryReport.this, message, getString(R.string.permission_snack_ok), true);

diff --git a/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java b/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java
@@ -136,9 +136,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActivityCompat.requestPermissions(ActivityMain.this,
                 new String[]{
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
                         Manifest.permission.READ_PHONE_STATE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.CAMERA,
                 },
                 1);
@@ -317,15 +315,14 @@ public void onBackPressed() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
             case 1: {
 
                 // If request is cancelled, the result arrays are empty.
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[2] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[3] == PackageManager.PERMISSION_GRANTED) {
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
                 } else {
                     String message = getResources().getString(R.string.permission_error_result);
                     Helpers.snackClose(ActivityMain.this, message, getString(R.string.permission_snack_ok), true);

diff --git a/app/src/main/java/org/glpi/inventory/agent/ui/PermissionActivity.java b/app/src/main/java/org/glpi/inventory/agent/ui/PermissionActivity.java
@@ -73,15 +73,14 @@ public void requestPermission(View view) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
             case 1: {
 
                 // If request is cancelled, the result arrays are empty.
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[2] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[3] == PackageManager.PERMISSION_GRANTED) {
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
                     presenter.permissionSuccess();
                 } else {
                     presenter.showError(getString(R.string.permission_error_result));