- Fixed permission issue

dreamfactorysoftware · Jun 29, 2016 · 4045b6d · 4045b6d
1 parent 2d26186
commit 4045b6d
Showing 1 changed file with 34 additions and 3 deletions.
diff --git a/android-sdk/app/src/main/java/com/dreamfactory/sampleapp/activities/ChooseImageActivity.java b/android-sdk/app/src/main/java/com/dreamfactory/sampleapp/activities/ChooseImageActivity.java
@@ -1,7 +1,10 @@
 package com.dreamfactory.sampleapp.activities;
 
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -35,6 +38,8 @@ public class ChooseImageActivity extends BaseActivity {
 
     protected static final int CHOOSE_IMAGE_REQUEST = 202;
 
+    protected static final int REQUEST_READ_EXTERNAL_STORAGE_PERMISSION = 121;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -64,13 +69,39 @@ public void onClick(View v) {
         uploadPhotoButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ChooseImageActivity.this.startActivityForResult(Intent.createChooser(
-                        new Intent(Intent.ACTION_GET_CONTENT).setType("image/*"),
-                        "Choose an image"), CHOOSE_IMAGE_REQUEST);
+                takePicture();
             }
         });
     }
 
+    private void takePicture() {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    != PackageManager.PERMISSION_GRANTED) {
+
+                requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                        REQUEST_READ_EXTERNAL_STORAGE_PERMISSION);
+                return;
+            }
+        }
+
+        ChooseImageActivity.this.startActivityForResult(Intent.createChooser(
+                new Intent(Intent.ACTION_GET_CONTENT).setType("image/*"),
+                "Choose an image"), CHOOSE_IMAGE_REQUEST);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case REQUEST_READ_EXTERNAL_STORAGE_PERMISSION:
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    takePicture();
+                }
+        }
+    }
+
     private void refresh() {
         Intent intent = getIntent();