diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java index df0a518d5..d861dff37 100644 --- a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java @@ -19,7 +19,7 @@ package org.geometerplus.android.fbreader.preferences.fileChooser; -import java.util.*; +import java.util.List; import android.app.Activity; import android.content.Context; @@ -49,7 +49,7 @@ class FileChooserStringListPreference extends FileChooserPreference { myRegCode, myResource.getValue(), myResource.getResource("chooserTitle").getValue(), - new ArrayList(myOption.getValue()), + myOption.getValue(), myChooseWritableDirectoriesOnly ); } diff --git a/src/org/geometerplus/android/util/FileChooserUtil.java b/src/org/geometerplus/android/util/FileChooserUtil.java index 83b7e507d..2930fe32c 100644 --- a/src/org/geometerplus/android/util/FileChooserUtil.java +++ b/src/org/geometerplus/android/util/FileChooserUtil.java @@ -19,8 +19,7 @@ package org.geometerplus.android.util; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; import android.app.Activity; import android.content.Intent; @@ -41,13 +40,13 @@ public abstract class FileChooserUtil { int requestCode, String title, String fileChooserTitle, - ArrayList initialValue, + List initialValue, boolean chooseWritableDirsOnly ) { final Intent intent = new Intent(activity, FolderListDialogActivity.class); intent.putExtra(FolderListDialogActivity.Key.ACTIVITY_TITLE, title); intent.putExtra(FolderListDialogActivity.Key.CHOOSER_TITLE, fileChooserTitle); - intent.putExtra(FolderListDialogActivity.Key.FOLDER_LIST, initialValue); + intent.putExtra(FolderListDialogActivity.Key.FOLDER_LIST, new ArrayList(initialValue)); intent.putExtra(FolderListDialogActivity.Key.WRITABLE_FOLDERS_ONLY, chooseWritableDirsOnly); activity.startActivityForResult(intent, requestCode); } @@ -78,7 +77,7 @@ public abstract class FileChooserUtil { return data.getStringExtra(FileChooserActivity._FolderPath); } - public static ArrayList pathArrayFromData(Intent data) { + public static List pathArrayFromData(Intent data) { return data.getStringArrayListExtra(FolderListDialogActivity.Key.FOLDER_LIST); }