mirror of
https://github.com/olgamiller/SSTVEncoder2.git
synced 2025-12-06 06:52:01 +01:00
Try load image again after permission granted,
added REQUEST_PERMISSION const
This commit is contained in:
parent
fbd4aef064
commit
3d887e8822
|
|
@ -49,8 +49,9 @@ import om.sstvencoder.TextOverlay.Label;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity {
|
||||||
private static final String CLASS_NAME = "ClassName";
|
private static final String CLASS_NAME = "ClassName";
|
||||||
private static final int REQUEST_IMAGE_CAPTURE = 1;
|
private static final int REQUEST_PERMISSION = 1;
|
||||||
private static final int REQUEST_PICK_IMAGE = 2;
|
private static final int REQUEST_PICK_IMAGE = 2;
|
||||||
|
private static final int REQUEST_IMAGE_CAPTURE = 3;
|
||||||
private Settings mSettings;
|
private Settings mSettings;
|
||||||
private TextOverlayTemplate mTextOverlayTemplate;
|
private TextOverlayTemplate mTextOverlayTemplate;
|
||||||
private CropView mCropView;
|
private CropView mCropView;
|
||||||
|
|
@ -151,9 +152,20 @@ public class MainActivity extends AppCompatActivity {
|
||||||
private void requestPermissions() {
|
private void requestPermissions() {
|
||||||
if (Build.VERSION_CODES.JELLY_BEAN > Build.VERSION.SDK_INT)
|
if (Build.VERSION_CODES.JELLY_BEAN > Build.VERSION.SDK_INT)
|
||||||
return;
|
return;
|
||||||
|
int permissionState = ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
|
||||||
|
if (permissionState != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
String[] permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
|
||||||
|
ActivityCompat.requestPermissions(this, permissions, REQUEST_PERMISSION);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
|
@Override
|
||||||
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1);
|
public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
|
||||||
|
if (requestCode == REQUEST_PERMISSION
|
||||||
|
&& grantResults.length > 0
|
||||||
|
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||||
|
loadImage(mSettings.getImageUri(), false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showFileNotLoadedMessage(Exception ex, boolean verbose) {
|
private void showFileNotLoadedMessage(Exception ex, boolean verbose) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue