yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dm

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
This commit is contained in:
Nikolay Pultsin 2014-05-03 03:32:57 +01:00
commit 7c15fe932c
6 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/org/geometerplus/android/util/FileChooserUtil.java
View file

@ -32,8 +32,6 @@ import group.pals.android.lib.ui.filechooser.io.localfile.LocalFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.android.fbreader.DirectoriesManagerActivity;
public abstract class FileChooserUtil {
private FileChooserUtil() {
}
@ -46,11 +44,11 @@ public abstract class FileChooserUtil {
ArrayList<String> initinalValue,
boolean chooseWritableDirsOnly
) {
final Intent intent = new Intent(activity, DirectoriesManagerActivity.class);
intent.putExtra(DirectoriesManagerActivity.TITLE, title);
intent.putExtra(DirectoriesManagerActivity.CHOOSER_TITLE, fileChooserTitle);
intent.putStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST, initinalValue);
intent.putExtra(DirectoriesManagerActivity.WRITABLE_DIRS_ONLY, chooseWritableDirsOnly);
final Intent intent = new Intent(activity, FolderListDialogActivity.class);
intent.putExtra(FolderListDialogActivity.TITLE, title);
intent.putExtra(FolderListDialogActivity.CHOOSER_TITLE, fileChooserTitle);
intent.putStringArrayListExtra(FolderListDialogActivity.DIR_LIST, initinalValue);
intent.putExtra(FolderListDialogActivity.WRITABLE_DIRS_ONLY, chooseWritableDirsOnly);
activity.startActivityForResult(intent, requestCode);
}
@ -81,7 +79,7 @@ public abstract class FileChooserUtil {
}
public static ArrayList<String> pathArrayFromData(Intent data) {
return data.getStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST);
return data.getStringArrayListExtra(FolderListDialogActivity.DIR_LIST);
}
private static HashMap<String,String> textResources(String title) {