From bd949f044b5a5c897bd951608d02e6ac70bc6ab3 Mon Sep 17 00:00:00 2001 From: Olga Miller Date: Sat, 7 Jan 2017 17:02:42 +0100 Subject: [PATCH] Request permissions only on Android 6.0 or later --- app/src/main/java/om/sstvencoder/MainActivity.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java index 22130bc..573e9d7 100644 --- a/app/src/main/java/om/sstvencoder/MainActivity.java +++ b/app/src/main/java/om/sstvencoder/MainActivity.java @@ -158,18 +158,16 @@ public class MainActivity extends AppCompatActivity { && ((ErrnoException) ex.getCause()).errno == OsConstants.EACCES; } - @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private boolean needsRequestReadPermission() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return false; String permission = Manifest.permission.READ_EXTERNAL_STORAGE; int state = ContextCompat.checkSelfPermission(this, permission); return state != PackageManager.PERMISSION_GRANTED; } - @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private boolean needsRequestWritePermission() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return false; String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE; int state = ContextCompat.checkSelfPermission(this, permission);