From 75a91ce191afb78ed7e9c1d50fe08d72f0ba7fe5 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 9 Jun 2018 19:23:30 +0200
Subject: [PATCH] Also ask for camera permissions when launching through an app
 shortcut

---
 .../java/me/impy/aegis/ui/MainActivity.java    | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/me/impy/aegis/ui/MainActivity.java b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
index dba22e3c..0a53832b 100644
--- a/app/src/main/java/me/impy/aegis/ui/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
@@ -173,7 +173,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
         switch (requestCode) {
             case CODE_PERM_CAMERA:
-                onScan();
+                startScanActivity();
                 break;
         }
     }
@@ -197,18 +197,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         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) {
         if (resultCode == RESULT_OK) {
             DatabaseEntry entry = (DatabaseEntry) data.getSerializableExtra("entry");
@@ -291,6 +279,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     }
 
     private void startScanActivity() {
+        if (!PermissionHelper.request(this, CODE_PERM_CAMERA, Manifest.permission.CAMERA)) {
+            return;
+        }
+
         Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
         startActivityForResult(scannerActivity, CODE_SCAN);
     }