luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-23 17:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove redundant permission request code from ScannerActivity

Browse source
This commit is contained in:
Alexander Bakker 2017-12-24 21:47:05 +01:00
parent 782f24342c
commit 93eeef142d
1 changed files with 1 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/me/impy/aegis/ScannerActivity.java
View file

@ -1,11 +1,8 @@
package me.impy.aegis; package me.impy.aegis;
import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.support.v4.app.ActivityCompat;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
@ -21,8 +18,6 @@ import me.impy.aegis.db.DatabaseEntry;
import me.impy.aegis.helpers.SquareFinderView; import me.impy.aegis.helpers.SquareFinderView;
public class ScannerActivity extends AegisActivity implements ZXingScannerView.ResultHandler { public class ScannerActivity extends AegisActivity implements ZXingScannerView.ResultHandler {
private static final int CODE_ASK_PERMS = 0;
private ZXingScannerView _scannerView; private ZXingScannerView _scannerView;
@Override @Override
@ -35,11 +30,8 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
return new SquareFinderView(context); return new SquareFinderView(context);
} }
}; };
setContentView(_scannerView);
_scannerView.setFormats(Collections.singletonList(BarcodeFormat.QR_CODE)); _scannerView.setFormats(Collections.singletonList(BarcodeFormat.QR_CODE));
setContentView(_scannerView);
ActivityCompat.requestPermissions(ScannerActivity.this, new String[]{Manifest.permission.CAMERA}, CODE_ASK_PERMS);
} }
@Override @Override
@ -75,19 +67,4 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
_scannerView.resumeCameraPreview(this); _scannerView.resumeCameraPreview(this);
} }
@Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
switch (requestCode) {
case CODE_ASK_PERMS: {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
_scannerView.setResultHandler(this);
_scannerView.startCamera();
} else {
Toast.makeText(ScannerActivity.this, "Permission denied to get access to the camera", Toast.LENGTH_SHORT).show();
}
break;
}
}
}
} }