diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-04-25 07:56:18 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-04-25 07:56:18 -0400 |
| commit | 72b8143b780d130e87d48c4830065d338ad3aa66 (patch) | |
| tree | f1941a5a7a291fed9c705f02db21ceeddc455b05 /app/src/main/java | |
| parent | c836bc458df4e1adfb6501f444d90578b33b8743 (diff) | |
| parent | 960b58b748af8f8d9c8bdecdb2363c7c3b2afcd3 (diff) | |
| download | AntennaPod-72b8143b780d130e87d48c4830065d338ad3aa66.zip | |
Merge pull request #1894 from mfietz/issue/1893-statvfs-permission-denied
Prevent permission denied when determining free space
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java index e980764ec..f22507f4c 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java @@ -132,7 +132,8 @@ public class StorageErrorActivity extends AppCompatActivity { List<String> folders = new ArrayList<>(mediaDirs.length); List<CharSequence> choices = new ArrayList<>(mediaDirs.length); for(int i=0; i < mediaDirs.length; i++) { - if(mediaDirs[i] == null) { + File dir = mediaDirs[i]; + if(dir == null || !dir.exists() || !dir.canRead() || !dir.canWrite()) { continue; } String path = mediaDirs[i].getAbsolutePath(); diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 23534e4f8..3c1332e33 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -819,7 +819,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc List<String> folders = new ArrayList<>(mediaDirs.length); List<CharSequence> choices = new ArrayList<>(mediaDirs.length); for(int i=0; i < mediaDirs.length; i++) { - if(mediaDirs[i] == null) { + File dir = mediaDirs[i]; + if(dir == null || !dir.exists() || !dir.canRead() || !dir.canWrite()) { continue; } String path = mediaDirs[i].getAbsolutePath(); |