luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 14:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Also ask for camera permissions when launching through an app shortcut

Browse source
This commit is contained in:
Alexander Bakker 2018-06-09 19:23:30 +02:00
parent 3f979843c7
commit 75a91ce191
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/me/impy/aegis/ui/MainActivity.java
View file

@ -173,7 +173,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
switch (requestCode) { switch (requestCode) {
case CODE_PERM_CAMERA: case CODE_PERM_CAMERA:
onScan(); startScanActivity();
break; break;
} }
} }
@ -197,18 +197,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
startActivityForResult(intent, requestCode); startActivityForResult(intent, requestCode);
} }
private void onEnterEntry() {
startEditProfileActivity(CODE_ENTER_ENTRY, null, true);
}
private void onScan() {
if (!PermissionHelper.request(this, CODE_PERM_CAMERA, Manifest.permission.CAMERA)) {
return;
}
startScanActivity();
}
private void onScanResult(int resultCode, Intent data) { private void onScanResult(int resultCode, Intent data) {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
DatabaseEntry entry = (DatabaseEntry) data.getSerializableExtra("entry"); DatabaseEntry entry = (DatabaseEntry) data.getSerializableExtra("entry");
@ -291,6 +279,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void startScanActivity() { private void startScanActivity() {
if (!PermissionHelper.request(this, CODE_PERM_CAMERA, Manifest.permission.CAMERA)) {
return;
}
Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class); Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
startActivityForResult(scannerActivity, CODE_SCAN); startActivityForResult(scannerActivity, CODE_SCAN);
} }