summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2016-11-12 09:11:08 +0100
committerGitHub <noreply@github.com>2016-11-12 09:11:08 +0100
commit724ded484756b1a7374227208b607c90cec335bb (patch)
tree0be434b93edb12866447066f882349bd97eb5c6f /app/src/main/java/de/danoeh/antennapod
parentddef76a9cf6917ecc0be7e69829150b1851d834e (diff)
parent42380adb7c7f0afdf8b03bbb85daaf0cf2df2a1b (diff)
downloadAntennaPod-724ded484756b1a7374227208b607c90cec335bb.zip
Merge pull request #2175 from mfietz/issue/2143-opml-import-2.3
Do not check permissions for OPML import on pre-M Android versions
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
index 8b87aaaaf..07b0b3cdb 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
+import android.os.Build;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
@@ -76,7 +77,8 @@ public class OpmlImportBaseActivity extends AppCompatActivity {
return;
}
this.uri = uri;
- if(uri.toString().contains(Environment.getExternalStorageDirectory().toString())) {
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+ uri.toString().contains(Environment.getExternalStorageDirectory().toString())) {
int permission = ActivityCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE);
if (permission != PackageManager.PERMISSION_GRANTED) {
requestPermission();