Skip to content

Commit 704fe36

Browse files
committed
fix(permissions): remove useless permissions
1 parent 08adc0c commit 704fe36

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

app/src/main/java/org/glpi/inventory/agent/ui/ActivityInventoryReport.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
8787

8888
ActivityCompat.requestPermissions(ActivityInventoryReport.this,
8989
new String[]{
90-
Manifest.permission.READ_EXTERNAL_STORAGE,
9190
Manifest.permission.READ_PHONE_STATE,
92-
Manifest.permission.WRITE_EXTERNAL_STORAGE,
9391
Manifest.permission.CAMERA,
9492
},
9593
1);
@@ -197,15 +195,14 @@ public void sendInventory(String data, ArrayList<String> load) {
197195

198196
@Override
199197
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
198+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
200199
switch (requestCode) {
201200
case 1: {
202201

203202
// If request is cancelled, the result arrays are empty.
204203
if (grantResults.length > 0
205204
&& grantResults[0] == PackageManager.PERMISSION_GRANTED
206-
&& grantResults[1] == PackageManager.PERMISSION_GRANTED
207-
&& grantResults[2] == PackageManager.PERMISSION_GRANTED
208-
&& grantResults[3] == PackageManager.PERMISSION_GRANTED) {
205+
&& grantResults[1] == PackageManager.PERMISSION_GRANTED) {
209206
} else {
210207
String message = getResources().getString(R.string.permission_error_result);
211208
Helpers.snackClose(ActivityInventoryReport.this, message, getString(R.string.permission_snack_ok), true);

app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,7 @@ protected void onCreate(Bundle savedInstanceState) {
136136

137137
ActivityCompat.requestPermissions(ActivityMain.this,
138138
new String[]{
139-
Manifest.permission.READ_EXTERNAL_STORAGE,
140139
Manifest.permission.READ_PHONE_STATE,
141-
Manifest.permission.WRITE_EXTERNAL_STORAGE,
142140
Manifest.permission.CAMERA,
143141
},
144142
1);
@@ -317,15 +315,14 @@ public void onBackPressed() {
317315

318316
@Override
319317
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
318+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
320319
switch (requestCode) {
321320
case 1: {
322321

323322
// If request is cancelled, the result arrays are empty.
324323
if (grantResults.length > 0
325324
&& grantResults[0] == PackageManager.PERMISSION_GRANTED
326-
&& grantResults[1] == PackageManager.PERMISSION_GRANTED
327-
&& grantResults[2] == PackageManager.PERMISSION_GRANTED
328-
&& grantResults[3] == PackageManager.PERMISSION_GRANTED) {
325+
&& grantResults[1] == PackageManager.PERMISSION_GRANTED) {
329326
} else {
330327
String message = getResources().getString(R.string.permission_error_result);
331328
Helpers.snackClose(ActivityMain.this, message, getString(R.string.permission_snack_ok), true);

app/src/main/java/org/glpi/inventory/agent/ui/PermissionActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,14 @@ public void requestPermission(View view) {
7373

7474
@Override
7575
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
76+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
7677
switch (requestCode) {
7778
case 1: {
7879

7980
// If request is cancelled, the result arrays are empty.
8081
if (grantResults.length > 0
8182
&& grantResults[0] == PackageManager.PERMISSION_GRANTED
82-
&& grantResults[1] == PackageManager.PERMISSION_GRANTED
83-
&& grantResults[2] == PackageManager.PERMISSION_GRANTED
84-
&& grantResults[3] == PackageManager.PERMISSION_GRANTED) {
83+
&& grantResults[1] == PackageManager.PERMISSION_GRANTED) {
8584
presenter.permissionSuccess();
8685
} else {
8786
presenter.showError(getString(R.string.permission_error_result));

0 commit comments

Comments
 (0)