diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2012-12-30 21:51:59 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2012-12-30 21:51:59 +0100 |
| commit | 65491d5436e714d148cb337706e723ee5b62c83d (patch) | |
| tree | 39299b79e63b3b111406673a4f8053cee452d1b7 /src/de | |
| parent | 236e467657621d5073badda41eb69b718a576a09 (diff) | |
| download | AntennaPod-65491d5436e714d148cb337706e723ee5b62c83d.zip | |
Added 'set to default folder' menu button
Diffstat (limited to 'src/de')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java | 16 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/PreferenceActivity.java | 11 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java index a83a77f28..b93620b05 100644 --- a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java +++ b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java @@ -158,13 +158,19 @@ public class DirectoryChooserActivity extends SherlockActivity { changeDirectory(Environment.getExternalStorageDirectory()); } - /** Finishes the activity and returns the selected folder as a result. */ + /** + * Finishes the activity and returns the selected folder as a result. The + * selected folder can also be null. + */ private void returnSelectedFolder() { - if (AppConfig.DEBUG) + if (selectedDir != null && AppConfig.DEBUG) Log.d(TAG, "Returning " + selectedDir.getAbsolutePath() + " as result"); Intent resultData = new Intent(); - resultData.putExtra(RESULT_SELECTED_DIR, selectedDir.getAbsolutePath()); + if (selectedDir != null) { + resultData.putExtra(RESULT_SELECTED_DIR, + selectedDir.getAbsolutePath()); + } setResult(RESULT_CODE_DIR_SELECTED, resultData); finish(); } @@ -299,6 +305,10 @@ public class DirectoryChooserActivity extends SherlockActivity { case R.id.new_folder_item: openNewFolderDialog(); return true; + case R.id.set_to_default_folder_item: + selectedDir = null; + returnSelectedFolder(); + return true; default: return false; } diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java index 9ce3074a9..8b3f87179 100644 --- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java +++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java @@ -177,14 +177,9 @@ public class PreferenceActivity extends SherlockPreferenceActivity { if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) { String dir = data .getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR); - if (dir != null) { - if (AppConfig.DEBUG) - Log.d(TAG, "Setting data folder"); - PodcastApp.getInstance().setDataFolder(dir); - } else { - if (AppConfig.DEBUG) - Log.d(TAG, "Result from DirectoryChooser was null"); - } + if (AppConfig.DEBUG) + Log.d(TAG, "Setting data folder"); + PodcastApp.getInstance().setDataFolder(dir); } } |