summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-02-28 02:33:19 +0100
committerMartin Fietz <Martin.Fietz@gmail.com>2015-02-28 02:33:19 +0100
commit66121d606ed07608e61aeb43e4847e9c2df8cbbd (patch)
tree95d4272a94c094528b398a7ee7466984c635c0a5 /app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
parentc9e8af52c24b405c65fc9220a6c5c573574df672 (diff)
downloadAntennaPod-66121d606ed07608e61aeb43e4847e9c2df8cbbd.zip
Implementation of AntennaPod/AntennaPod#623
Instead of having a fixed path, the user can now choose the path to import from via dialog. This made the rather bloated instruction text superfluous. Some minor changes to the DirectoryChooserActivity and the OMPL Import layout.
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java7
1 files changed, 4 insertions, 3 deletions
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 ffac05321..a8636874d 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -163,9 +163,10 @@ public class PreferenceController {
@Override
public boolean onPreferenceClick(Preference preference) {
- activity.startActivityForResult(
- new Intent(activity,
- DirectoryChooserActivity.class),
+ Intent intent = new Intent(activity,
+ DirectoryChooserActivity.class);
+ intent.putExtra(DirectoryChooserActivity.NON_EMPTY_DIRECTORY_WARNING, true);
+ activity.startActivityForResult(intent,
DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED
);
return true;