App permission

krmanik · Feb 10, 2021 · 7a0ffaf · 7a0ffaf
1 parent 6365604
commit 7a0ffaf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "io.infinyte7.ankiimageocclusion",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 14000,
+      "versionName": "14000",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/app/src/main/java/io/infinyte7/ankiimageocclusion/MainActivity.java b/app/src/main/java/io/infinyte7/ankiimageocclusion/MainActivity.java
@@ -71,8 +71,8 @@ public void onCreate(Bundle savedInstanceState)
 
     /* https://stackoverflow.com/questions/42275906/how-to-ask-runtime-permissions-for-camera-in-android-runtime-storage-permissio */
     private boolean checkPermission() {
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                && ContextCompat.checkSelfPermission(this, AddContentApi.READ_WRITE_PERMISSION) != PackageManager.PERMISSION_GRANTED) {
+        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                || (ContextCompat.checkSelfPermission(this, AddContentApi.READ_WRITE_PERMISSION) != PackageManager.PERMISSION_GRANTED)) {
             // Permission is not granted
             return false;
         }
@@ -90,7 +90,7 @@ private void requestPermission() {
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
         switch (requestCode) {
             case PERMISSION_REQUEST_CODE:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
                     Toast.makeText(getApplicationContext(), "Permission Granted", Toast.LENGTH_SHORT).show();
                     loadUrl(launchUrl);
                 } else {