Skip to content

Add storage-permission-request #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jkrude wants to merge 1 commit into from
Closed

Add storage-permission-request #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 38 additions & 7 deletions qrcodescanner/src/main/java/com/blikoon/qrcodescanner/QrCodeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.blikoon.qrcodescanner;


import android.Manifest.permission;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
Expand Down Expand Up @@ -29,6 +30,9 @@
import android.widget.Toast;

import com.google.zxing.Result;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import com.blikoon.qrcodescanner.camera.CameraManager;
import com.blikoon.qrcodescanner.decode.CaptureActivityHandler;
import com.blikoon.qrcodescanner.decode.DecodeImageCallback;
Expand All @@ -49,6 +53,7 @@ public class QrCodeActivity extends Activity implements Callback, OnClickListene
private static final int REQUEST_PICTURE = 1;
public static final int MSG_DECODE_SUCCEED = 1;
public static final int MSG_DECODE_FAIL = 2;
private static final int STORAGE_PERMISSION_REQUEST = 3;
private CaptureActivityHandler mCaptureActivityHandler;
private boolean mHasSurface;
private boolean mPermissionOk;
Expand Down Expand Up @@ -136,6 +141,33 @@ private boolean hasCameraPermission() {
return PackageManager.PERMISSION_GRANTED == pm.checkPermission("android.permission.CAMERA", getPackageName());
}

private boolean hasStoragePermission() {
return ContextCompat.checkSelfPermission(
this, permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
}

private void showAndRequestStoragePermission(){
if(ActivityCompat.shouldShowRequestPermissionRationale(this, permission.READ_EXTERNAL_STORAGE)){
ActivityCompat.requestPermissions(QrCodeActivity.this,
new String[]{permission.READ_EXTERNAL_STORAGE},
STORAGE_PERMISSION_REQUEST);
}
}
@Override
public void onRequestPermissionsResult(
int requestCode,
@NonNull String[] permissions,
@NonNull int[] grantResults) {

if (requestCode == STORAGE_PERMISSION_REQUEST){
if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED){
openSystemAlbum();
}else{
Toast.makeText(QrCodeActivity.this, "Permission missing", Toast.LENGTH_SHORT).show();
}
}
}

@Override
protected void onResume() {
super.onResume();
Expand Down Expand Up @@ -306,14 +338,13 @@ public void onClick(View v) {

}else if(v.getId() == R.id.qr_code_header_black_pic)
{
if (!hasCameraPermission()) {
mDecodeManager.showPermissionDeniedDialog(this);
} else {
openSystemAlbum();
}

if(!hasStoragePermission()) {
showAndRequestStoragePermission();
// openSystemAlbum triggered in response to request
} else{
openSystemAlbum();
}
}

}

private void openSystemAlbum() {
Expand Down