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

Merge branch 'master' into dm

Browse source 
Conflicts:
	src/org/geometerplus/android/util/FileChooserUtil.java
This commit is contained in:
Nikolay Pultsin 2014-05-03 14:14:34 +01:00
commit 3af51e5348
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
View file

@ -19,7 +19,7 @@
package org.geometerplus.android.fbreader.preferences.fileChooser; package org.geometerplus.android.fbreader.preferences.fileChooser;
import java.util.*; import java.util.List;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -49,7 +49,7 @@ class FileChooserStringListPreference extends FileChooserPreference {
myRegCode, myRegCode,
myResource.getValue(), myResource.getValue(),
myResource.getResource("chooserTitle").getValue(), myResource.getResource("chooserTitle").getValue(),
new ArrayList<String>(myOption.getValue()), myOption.getValue(),
myChooseWritableDirectoriesOnly myChooseWritableDirectoriesOnly
); );
} }

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

@ -19,8 +19,7 @@
package org.geometerplus.android.util; package org.geometerplus.android.util;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -41,13 +40,13 @@ public abstract class FileChooserUtil {
int requestCode, int requestCode,
String title, String title,
String fileChooserTitle, String fileChooserTitle,
ArrayList<String> initialValue, List<String> initialValue,
boolean chooseWritableDirsOnly boolean chooseWritableDirsOnly
) { ) {
final Intent intent = new Intent(activity, FolderListDialogActivity.class); final Intent intent = new Intent(activity, FolderListDialogActivity.class);
intent.putExtra(FolderListDialogActivity.Key.ACTIVITY_TITLE, title); intent.putExtra(FolderListDialogActivity.Key.ACTIVITY_TITLE, title);
intent.putExtra(FolderListDialogActivity.Key.CHOOSER_TITLE, fileChooserTitle); intent.putExtra(FolderListDialogActivity.Key.CHOOSER_TITLE, fileChooserTitle);
intent.putExtra(FolderListDialogActivity.Key.FOLDER_LIST, initialValue); intent.putExtra(FolderListDialogActivity.Key.FOLDER_LIST, new ArrayList<String>(initialValue));
intent.putExtra(FolderListDialogActivity.Key.WRITABLE_FOLDERS_ONLY, chooseWritableDirsOnly); intent.putExtra(FolderListDialogActivity.Key.WRITABLE_FOLDERS_ONLY, chooseWritableDirsOnly);
activity.startActivityForResult(intent, requestCode); activity.startActivityForResult(intent, requestCode);
} }
@ -78,7 +77,7 @@ public abstract class FileChooserUtil {
return data.getStringExtra(FileChooserActivity._FolderPath); return data.getStringExtra(FileChooserActivity._FolderPath);
} }
public static ArrayList<String> pathArrayFromData(Intent data) { public static List<String> pathArrayFromData(Intent data) {
return data.getStringArrayListExtra(FolderListDialogActivity.Key.FOLDER_LIST); return data.getStringArrayListExtra(FolderListDialogActivity.Key.FOLDER_LIST);
} }