Merge branch 'android-filechooser-orig'

Conflicts:
	src/java/android-filechooser/code/project.properties
	src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks.png
	src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks_dark.png
	src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks_light.png
	src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks.png
	src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks_dark.png
	src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks_light.png
	src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks.png
	src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks_dark.png
	src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks_light.png
	src/java/android-filechooser/code/res/drawable-xxhdpi/afc_ic_menu_bookmarks_dark.png
	src/java/android-filechooser/code/res/drawable-xxhdpi/afc_ic_menu_bookmarks_light.png
	src/java/android-filechooser/code/res/values-v11/themes_light.xml
	src/java/android-filechooser/code/res/values-v7/themes_light.xml
	src/java/android-filechooser/code/res/values/env.xml
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/FragmentFiles.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/BaseFileProviderUtils.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkContract.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkHelper.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkProvider.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/Sys.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/Utils.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/LoadingDialog.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/bookmark/BookmarkCursorAdapter.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/bookmark/BookmarkFragment.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/history/HistoryCursorAdapter.java
	src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/history/HistoryFragment.java
This commit is contained in:
Philipp Crocoll 2013-10-25 04:45:52 +02:00
commit 55da547141
47 changed files with 883 additions and 758 deletions

View File

@ -1,6 +1,6 @@
# android-filechooser # android-filechooser
* Version: 5.4 * Version: 5.4.4 beta
Feel free to contact us at: Feel free to contact us at:
@ -18,11 +18,31 @@ project. We hope this project will be always useful for everyone.
* C * C
* Simon McCorkindale * Simon McCorkindale
+ [Website](http://www.aroha.mobi/) + [Website](http://www.aroha.mobi/)
* Philipp Crocoll
+ Author of open source project [Keepass2Android](https://keepass2android.codeplex.com/)
* And others. * And others.
# HISTORY # HISTORY
* Version 5.4.4 beta:
+ *Initialize:* October 23, 2013
* Version 5.4.3:
+ *Release:* October 23, 2013
* Version 5.4.3 beta:
+ *Initialize:* September 30, 2013
* Version 5.4.2
+ *Release:* September 27, 2013
+ Fix light themes with dark action bar.
* Version 5.4.1
+ *Release:* September 26, 2013
+ Fix light themes: now they use light action bar.
+ Add light themes with dark action bar.
* Version 5.4 * Version 5.4
+ *Release:* August 02, 2013 + *Release:* August 02, 2013
+ Integrate library `android-support-v7-appcompat` for action bar in APIs + Integrate library `android-support-v7-appcompat` for action bar in APIs

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

View File

@ -7,12 +7,10 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="group.pals.android.lib.ui.filechooser" package="group.pals.android.lib.ui.filechooser" >
android:versionCode="@integer/afc_lib_version_code"
android:versionName="@string/afc_lib_version_name" >
<uses-sdk <uses-sdk
android:minSdkVersion="4" android:minSdkVersion="4"
android:targetSdkVersion="17" /> android:targetSdkVersion="18" />
</manifest> </manifest>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 884 B

After

Width:  |  Height:  |  Size: 885 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 764 B

After

Width:  |  Height:  |  Size: 780 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 926 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -265,4 +265,5 @@ public class FileChooserActivity extends FragmentActivity {
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
}// onKeyDown() }// onKeyDown()
} }

View File

@ -7,14 +7,14 @@
package group.pals.android.lib.ui.filechooser.prefs; package group.pals.android.lib.ui.filechooser.prefs;
import android.content.Context;
import group.pals.android.lib.ui.filechooser.FileChooserActivity.ViewType; import group.pals.android.lib.ui.filechooser.FileChooserActivity.ViewType;
import group.pals.android.lib.ui.filechooser.R; import group.pals.android.lib.ui.filechooser.R;
import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileContract.BaseFile; import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileContract.BaseFile;
import android.content.Context;
/** /**
* Display preferences. * Display preferences.
* *
* @author Hai Bison * @author Hai Bison
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -43,8 +43,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Gets view type. * Gets view type.
* *
* @param c {@link Context} * @param c
* {@link Context}
* @return {@link ViewType} * @return {@link ViewType}
*/ */
public static ViewType getViewType(Context c) { public static ViewType getViewType(Context c) {
@ -57,9 +58,11 @@ public class DisplayPrefs extends Prefs {
/** /**
* Sets view type. * Sets view type.
* *
* @param c {@link Context} * @param c
* @param v {@link ViewType}, if {@code null}, default value will be used. * {@link Context}
* @param v
* {@link ViewType}, if {@code null}, default value will be used.
*/ */
public static void setViewType(Context c, ViewType v) { public static void setViewType(Context c, ViewType v) {
String key = c.getString(R.string.afc_pkey_display_view_type); String key = c.getString(R.string.afc_pkey_display_view_type);
@ -75,8 +78,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Gets sort type. * Gets sort type.
* *
* @param c {@link Context} * @param c
* {@link Context}
* @return one of {@link BaseFile#SORT_BY_MODIFICATION_TIME}, * @return one of {@link BaseFile#SORT_BY_MODIFICATION_TIME},
* {@link BaseFile#SORT_BY_NAME}, {@link BaseFile#SORT_BY_SIZE}. * {@link BaseFile#SORT_BY_NAME}, {@link BaseFile#SORT_BY_SIZE}.
*/ */
@ -89,11 +93,13 @@ public class DisplayPrefs extends Prefs {
/** /**
* Sets {@link SortType} * Sets {@link SortType}
* *
* @param c {@link Context} * @param c
* @param v one of {@link BaseFile#SORT_BY_MODIFICATION_TIME}, * {@link Context}
* {@link BaseFile#SORT_BY_NAME}, {@link BaseFile#SORT_BY_SIZE}., * @param v
* if {@code null}, default value will be used. * one of {@link BaseFile#SORT_BY_MODIFICATION_TIME},
* {@link BaseFile#SORT_BY_NAME}, {@link BaseFile#SORT_BY_SIZE}.,
* if {@code null}, default value will be used.
*/ */
public static void setSortType(Context c, Integer v) { public static void setSortType(Context c, Integer v) {
String key = c.getString(R.string.afc_pkey_display_sort_type); String key = c.getString(R.string.afc_pkey_display_sort_type);
@ -109,8 +115,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Gets sort ascending. * Gets sort ascending.
* *
* @param c {@link Context} * @param c
* {@link Context}
* @return {@code true} if sort is ascending, {@code false} otherwise. * @return {@code true} if sort is ascending, {@code false} otherwise.
*/ */
public static boolean isSortAscending(Context c) { public static boolean isSortAscending(Context c) {
@ -122,9 +129,11 @@ public class DisplayPrefs extends Prefs {
/** /**
* Sets sort ascending. * Sets sort ascending.
* *
* @param c {@link Context} * @param c
* @param v {@link Boolean}, if {@code null}, default value will be used. * {@link Context}
* @param v
* {@link Boolean}, if {@code null}, default value will be used.
*/ */
public static void setSortAscending(Context c, Boolean v) { public static void setSortAscending(Context c, Boolean v) {
if (v == null) if (v == null)
@ -139,8 +148,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Checks setting of showing time for old days in this year. Default is * Checks setting of showing time for old days in this year. Default is
* {@code false}. * {@code false}.
* *
* @param c {@link Context}. * @param c
* {@link Context}.
* @return {@code true} or {@code false}. * @return {@code true} or {@code false}.
* @since v4.7 beta * @since v4.7 beta
*/ */
@ -155,10 +165,12 @@ public class DisplayPrefs extends Prefs {
/** /**
* Enables or disables showing time of old days in this year. * Enables or disables showing time of old days in this year.
* *
* @param c {@link Context}. * @param c
* @param v your preferred flag. If {@code null}, default will be used ( * {@link Context}.
* {@code false}). * @param v
* your preferred flag. If {@code null}, default will be used (
* {@code false}).
* @since v4.7 beta * @since v4.7 beta
*/ */
public static void setShowTimeForOldDaysThisYear(Context c, Boolean v) { public static void setShowTimeForOldDaysThisYear(Context c, Boolean v) {
@ -175,8 +187,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Checks setting of showing time for old days in last year and older. * Checks setting of showing time for old days in last year and older.
* Default is {@code false}. * Default is {@code false}.
* *
* @param c {@link Context}. * @param c
* {@link Context}.
* @return {@code true} or {@code false}. * @return {@code true} or {@code false}.
* @since v4.7 beta * @since v4.7 beta
*/ */
@ -189,10 +202,12 @@ public class DisplayPrefs extends Prefs {
/** /**
* Enables or disables showing time of old days in last year and older. * Enables or disables showing time of old days in last year and older.
* *
* @param c {@link Context}. * @param c
* @param v your preferred flag. If {@code null}, default will be used ( * {@link Context}.
* {@code false}). * @param v
* your preferred flag. If {@code null}, default will be used (
* {@code false}).
* @since v4.7 beta * @since v4.7 beta
*/ */
public static void setShowTimeForOldDays(Context c, Boolean v) { public static void setShowTimeForOldDays(Context c, Boolean v) {
@ -207,8 +222,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Checks if remembering last location is enabled or not. * Checks if remembering last location is enabled or not.
* *
* @param c {@link Context}. * @param c
* {@link Context}.
* @return {@code true} if remembering last location is enabled. * @return {@code true} if remembering last location is enabled.
* @since v4.7 beta * @since v4.7 beta
*/ */
@ -218,10 +234,12 @@ public class DisplayPrefs extends Prefs {
/** /**
* Enables or disables remembering last location. * Enables or disables remembering last location.
* *
* @param c {@link Context}. * @param c
* @param v your preferred flag. If {@code null}, default will be used ( * {@link Context}.
* {@code true}). * @param v
* your preferred flag. If {@code null}, default will be used (
* {@code true}).
* @since v4.7 beta * @since v4.7 beta
*/ */
public static void setRememberLastLocation(Context c, Boolean v) { public static void setRememberLastLocation(Context c, Boolean v) {
@ -236,8 +254,9 @@ public class DisplayPrefs extends Prefs {
/** /**
* Gets last location. * Gets last location.
* *
* @param c {@link Context}. * @param c
* {@link Context}.
* @return the last location, or {@code null} if not available. * @return the last location, or {@code null} if not available.
* @since v4.7 beta * @since v4.7 beta
*/ */
@ -248,9 +267,11 @@ public class DisplayPrefs extends Prefs {
/** /**
* Sets last location. * Sets last location.
* *
* @param c {@link Context}. * @param c
* @param v the last location. * {@link Context}.
* @param v
* the last location.
*/ */
public static void setLastLocation(Context c, String v) { public static void setLastLocation(Context c, String v) {
p(c).edit() p(c).edit()
@ -265,7 +286,7 @@ public class DisplayPrefs extends Prefs {
/** /**
* File time display options. * File time display options.
* *
* @author Hai Bison * @author Hai Bison
* @see DisplayPrefs#isShowTimeForOldDaysThisYear(Context) * @see DisplayPrefs#isShowTimeForOldDaysThisYear(Context)
* @see DisplayPrefs#isShowTimeForOldDays(Context) * @see DisplayPrefs#isShowTimeForOldDays(Context)
@ -273,37 +294,20 @@ public class DisplayPrefs extends Prefs {
*/ */
public static class FileTimeDisplay { public static class FileTimeDisplay {
private boolean mShowTimeForOldDaysThisYear; public boolean showTimeForOldDaysThisYear;
private boolean mShowTimeForOldDays; public boolean showTimeForOldDays;
/** /**
* Creates new instance. * Creates new instance.
* *
* @param showTimeForOldDaysThisYear * @param showTimeForOldDaysThisYear
* @param showTimeForOldDays * @param showTimeForOldDays
*/ */
public FileTimeDisplay(boolean showTimeForOldDaysThisYear, public FileTimeDisplay(boolean showTimeForOldDaysThisYear,
boolean showTimeForOldDays) { boolean showTimeForOldDays) {
mShowTimeForOldDaysThisYear = showTimeForOldDaysThisYear; this.showTimeForOldDaysThisYear = showTimeForOldDaysThisYear;
mShowTimeForOldDays = showTimeForOldDays; this.showTimeForOldDays = showTimeForOldDays;
}// FileTimeDisplay() }// FileTimeDisplay()
public boolean isShowTimeForOldDaysThisYear() {
return mShowTimeForOldDaysThisYear;
}// isShowTimeForOldDaysThisYear()
public FileTimeDisplay setShowTimeForOldDaysThisYear(boolean v) {
mShowTimeForOldDaysThisYear = v;
return this;
}// setShowTimeForOldDaysThisYear()
public boolean isShowTimeForOldDays() {
return mShowTimeForOldDays;
}// isShowTimeForOldDays()
public FileTimeDisplay setShowTimeForOldDays(boolean v) {
mShowTimeForOldDays = v;
return this;
}// setShowTimeForOldDays()
}// FileTimeDisplay }// FileTimeDisplay
} }

View File

@ -9,7 +9,7 @@ package group.pals.android.lib.ui.filechooser.providers;
/** /**
* The base columns. * The base columns.
* *
* @author Hai Bison * @author Hai Bison
* @since v5.1 beta * @since v5.1 beta
*/ */
@ -32,4 +32,5 @@ public interface BaseColumns extends android.provider.BaseColumns {
* </P> * </P>
*/ */
public static final String COLUMN_MODIFICATION_TIME = "modification_time"; public static final String COLUMN_MODIFICATION_TIME = "modification_time";
} }

View File

@ -16,14 +16,11 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.MatrixCursor; import android.database.MatrixCursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
/** /**
* Utilities for base file provider. * Utilities for base file provider.
@ -118,10 +115,11 @@ public class BaseFileProviderUtils {
String result = getProviderName(providerId); String result = getProviderName(providerId);
if (result == null) { if (result == null) {
Cursor cursor = queryInBackground( Cursor cursor = context
context, .getContentResolver()
BaseFile.genContentUriApi(getProviderAuthority(providerId)), .query(BaseFile
null, null, null, null); .genContentUriApi(getProviderAuthority(providerId)),
null, null, null, null);
if (cursor == null) if (cursor == null)
return null; return null;
@ -167,10 +165,11 @@ public class BaseFileProviderUtils {
int attr = MAP_PROVIDER_INFO.get(providerId).getInt( int attr = MAP_PROVIDER_INFO.get(providerId).getInt(
BaseFile.COLUMN_PROVIDER_ICON_ATTR); BaseFile.COLUMN_PROVIDER_ICON_ATTR);
if (attr == 0) { if (attr == 0) {
Cursor cursor = queryInBackground( Cursor cursor = context
context, .getContentResolver()
BaseFile.genContentUriApi(getProviderAuthority(providerId)), .query(BaseFile
null, null, null, null); .genContentUriApi(getProviderAuthority(providerId)),
null, null, null, null);
if (cursor != null) { if (cursor != null) {
try { try {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
@ -250,8 +249,8 @@ public class BaseFileProviderUtils {
* otherwise. * otherwise.
*/ */
public static boolean isDirectory(Context context, Uri uri) { public static boolean isDirectory(Context context, Uri uri) {
//Log.d("AFC", "isDir? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return false; return false;
@ -286,8 +285,8 @@ public class BaseFileProviderUtils {
* @return {@code true} if {@code uri} is a file, {@code false} otherwise. * @return {@code true} if {@code uri} is a file, {@code false} otherwise.
*/ */
public static boolean isFile(Context context, Uri uri) { public static boolean isFile(Context context, Uri uri) {
//Log.d("AFC", "isFile? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return false; return false;
@ -321,8 +320,8 @@ public class BaseFileProviderUtils {
* @return the file name if {@code uri} is a file, {@code null} otherwise. * @return the file name if {@code uri} is a file, {@code null} otherwise.
*/ */
public static String getFileName(Context context, Uri uri) { public static String getFileName(Context context, Uri uri) {
//Log.d("AFC", "getFileName "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return null; return null;
@ -359,8 +358,8 @@ public class BaseFileProviderUtils {
* @return the real URI of {@code uri}. * @return the real URI of {@code uri}.
*/ */
public static Uri getRealUri(Context context, Uri uri) { public static Uri getRealUri(Context context, Uri uri) {
//Log.d("AFC", "getRealUri "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return null; return null;
@ -400,8 +399,8 @@ public class BaseFileProviderUtils {
* {@link #FILE_TYPE_UNKNOWN}, {@link #FILE_TYPE_NOT_EXISTED}. * {@link #FILE_TYPE_UNKNOWN}, {@link #FILE_TYPE_NOT_EXISTED}.
*/ */
public static int getFileType(Context context, Uri uri) { public static int getFileType(Context context, Uri uri) {
//Log.d("AFC", "filetype? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return BaseFile.FILE_TYPE_NOT_EXISTED; return BaseFile.FILE_TYPE_NOT_EXISTED;
@ -449,8 +448,8 @@ public class BaseFileProviderUtils {
* @return {@code true} or {@code false}. * @return {@code true} or {@code false}.
*/ */
public static boolean fileExists(Context context, Uri uri) { public static boolean fileExists(Context context, Uri uri) {
//Log.d("AFC", "exists? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return false; return false;
@ -474,8 +473,8 @@ public class BaseFileProviderUtils {
* @return {@code true} or {@code false}. * @return {@code true} or {@code false}.
*/ */
public static boolean fileCanRead(Context context, Uri uri) { public static boolean fileCanRead(Context context, Uri uri) {
//Log.d("AFC", "canread? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return false; return false;
@ -511,8 +510,8 @@ public class BaseFileProviderUtils {
* @return {@code true} or {@code false}. * @return {@code true} or {@code false}.
*/ */
public static boolean fileCanWrite(Context context, Uri uri) { public static boolean fileCanWrite(Context context, Uri uri) {
//Log.d("AFC", "canWrite? "+uri.toString()); Cursor cursor = context.getContentResolver().query(uri, null, null,
Cursor cursor = queryInBackground(context, uri, null, null, null, null); null, null);
if (cursor == null) if (cursor == null)
return false; return false;
@ -548,8 +547,7 @@ public class BaseFileProviderUtils {
* @return the default path, can be {@code null}. * @return the default path, can be {@code null}.
*/ */
public static Uri getDefaultPath(Context context, String authority) { public static Uri getDefaultPath(Context context, String authority) {
Cursor cursor = queryInBackground( Cursor cursor = context.getContentResolver().query(
context,
BaseFile.genContentUriApi(authority).buildUpon() BaseFile.genContentUriApi(authority).buildUpon()
.appendPath(BaseFile.CMD_GET_DEFAULT_PATH).build(), .appendPath(BaseFile.CMD_GET_DEFAULT_PATH).build(),
null, null, null, null); null, null, null, null);
@ -576,8 +574,7 @@ public class BaseFileProviderUtils {
* @return the parent file if it exists, {@code null} otherwise. * @return the parent file if it exists, {@code null} otherwise.
*/ */
public static Uri getParentFile(Context context, Uri uri) { public static Uri getParentFile(Context context, Uri uri) {
Cursor cursor = queryInBackground( Cursor cursor = context.getContentResolver().query(
context,
BaseFile.genContentUriApi(uri.getAuthority()) BaseFile.genContentUriApi(uri.getAuthority())
.buildUpon() .buildUpon()
.appendPath(BaseFile.CMD_GET_PARENT) .appendPath(BaseFile.CMD_GET_PARENT)
@ -610,8 +607,7 @@ public class BaseFileProviderUtils {
* {@code false} otherwise. * {@code false} otherwise.
*/ */
public static boolean isAncestorOf(Context context, Uri uri1, Uri uri2) { public static boolean isAncestorOf(Context context, Uri uri1, Uri uri2) {
return queryInBackground( return context.getContentResolver().query(
context,
BaseFile.genContentUriApi(uri1.getAuthority()) BaseFile.genContentUriApi(uri1.getAuthority())
.buildUpon() .buildUpon()
.appendPath(BaseFile.CMD_IS_ANCESTOR_OF) .appendPath(BaseFile.CMD_IS_ANCESTOR_OF)
@ -633,8 +629,7 @@ public class BaseFileProviderUtils {
* the task ID. * the task ID.
*/ */
public static void cancelTask(Context context, String authority, int taskId) { public static void cancelTask(Context context, String authority, int taskId) {
queryInBackground( context.getContentResolver().query(
context,
BaseFile.genContentUriApi(authority) BaseFile.genContentUriApi(authority)
.buildUpon() .buildUpon()
.appendPath(BaseFile.CMD_CANCEL) .appendPath(BaseFile.CMD_CANCEL)
@ -643,185 +638,4 @@ public class BaseFileProviderUtils {
null, null); null, null);
}// cancelTask() }// cancelTask()
/**
* Creates new background thread to delete given URI, waits for the thread
* to finish (or be interrupted) and returns the result.
*
* @param context
* the context.
* @param uri
* the URI to delete, see
* {@link ContentResolver#delete(Uri, String, String[])} for more
* details.
* @param where
* the {@code WHERE} clause, see
* {@link ContentResolver#delete(Uri, String, String[])} for more
* details.
* @param selectionArgs
* the selection arguments, see
* {@link ContentResolver#delete(Uri, String, String[])} for more
* details.
* @return the value returned from
* {@link ContentResolver#delete(Uri, String, String[])} , or
* {@code -1} if an error occurred.
*/
public static int deleteInBackground(final Context context, final Uri uri,
final String where, final String[] selectionArgs) {
final int[] result = { 0 };
Thread thread = new Thread() {
@Override
public void run() {
result[0] = context.getContentResolver().delete(uri, where,
selectionArgs);
}// run()
};
thread.start();
try {
thread.join();
return result[0];
} catch (InterruptedException e) {
return -1;
}
}// deleteInBackground()
/**
* Creates new background thread to insert values to given URI, waits for
* the thread to finish (or be interrupted) and returns the result.
*
* @param context
* the context.
* @param uri
* the URI to insert values into, see
* {@link ContentResolver#insert(Uri, ContentValues)} for more
* details.
* @param values
* the values to insert into, see
* {@link ContentResolver#insert(Uri, ContentValues)} for more
* details.
* @return the URI returned from
* {@link ContentResolver#insert(Uri, ContentValues)}, or
* {@code null} if an error occurred.
*/
public static Uri insertInBackground(final Context context, final Uri uri,
final ContentValues values) {
final Uri[] result = { null };
Thread thread = new Thread() {
@Override
public void run() {
result[0] = context.getContentResolver().insert(uri, values);
}// run()
};
thread.start();
try {
thread.join();
return result[0];
} catch (InterruptedException e) {
return null;
}
}// insertInBackground()
/**
* Creates new background thread to query given URI, waits for the thread to
* finish (or be interrupted) and returns the result.
*
* @param context
* the context.
* @param uri
* the URI to query, see
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* for more details.
* @param projection
* the projection, see
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* for more details.
* @param selection
* the selection, see
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* for more details.
* @param selectionArgs
* the selection arguments, see
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* for more details.
* @param sortOrder
* the sort order, see
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* for more details.
* @return the cursor returned from
* {@link ContentResolver#query(Uri, String[], String, String[], String)}
* , or {@code null} if an error occurred.
*/
public static Cursor queryInBackground(final Context context,
final Uri uri, final String[] projection, final String selection,
final String[] selectionArgs, final String sortOrder) {
final Cursor[] result = { null };
Thread thread = new Thread() {
@Override
public void run() {
result[0] = context.getContentResolver().query(uri, projection,
selection, selectionArgs, sortOrder);
}// run()
};
thread.start();
try {
thread.join();
return result[0];
} catch (InterruptedException e) {
return null;
}
}// queryInBackground()
/**
* Creates new background thread to update given URI, waits for the thread
* to finish (or be interrupted) and returns the result.
*
* @param context
* the context.
* @param uri
* the URI to update, see
* {@link ContentResolver#update(Uri, ContentValues, String, String[])}
* for more details.
* @param values
* the values to update, see
* {@link ContentResolver#update(Uri, ContentValues, String, String[])}
* for more details.
* @param where
* the {@code WHERE} clause, see
* {@link ContentResolver#update(Uri, ContentValues, String, String[])}
* for more details.
* @param selectionArgs
* the selection arguments, see
* {@link ContentResolver#update(Uri, ContentValues, String, String[])}
* for more details.
* @return the value returned from
* {@link ContentResolver#update(Uri, ContentValues, String, String[])}
* , or {@code -1} if an error occurred.
*/
public static int updateInBackground(final Context context, final Uri uri,
final ContentValues values, final String where,
final String[] selectionArgs) {
final int[] result = { 0 };
Thread thread = new Thread() {
@Override
public void run() {
result[0] = context.getContentResolver().update(uri, values,
where, selectionArgs);
}// run()
};
thread.start();
try {
thread.join();
return result[0];
} catch (InterruptedException e) {
return -1;
}
}// updateInBackground()
} }

View File

@ -11,7 +11,7 @@ import android.database.DatabaseUtils;
/** /**
* Database utilities. * Database utilities.
* *
* @author Hai Bison * @author Hai Bison
* @since v5.1 beta * @since v5.1 beta
*/ */
@ -20,13 +20,13 @@ public class DbUtils {
public static final String DATE_FORMAT = "yyyy:MM:dd'T'kk:mm:ss"; public static final String DATE_FORMAT = "yyyy:MM:dd'T'kk:mm:ss";
/** /**
* SQLite component FTS3. * SQLite component FTS3.
* *
* @since v4.6 beta * @since v4.6 beta
*/ */
public static final String SQLITE_FTS3 = "FTS3"; public static final String SQLITE_FTS3 = "FTS3";
/** /**
* SQLite component FTS4. * SQLite component FTS4.
* *
* @since v4.6 beta * @since v4.6 beta
*/ */
public static final String SQLITE_FTS4 = "FTS4"; public static final String SQLITE_FTS4 = "FTS4";
@ -38,8 +38,9 @@ public class DbUtils {
/** /**
* Joins all columns into one statement. * Joins all columns into one statement.
* *
* @param cols array of columns. * @param cols
* array of columns.
* @return E.g: "col1,col2,col3" * @return E.g: "col1,col2,col3"
*/ */
public static String joinColumns(String[] cols) { public static String joinColumns(String[] cols) {
@ -59,8 +60,9 @@ public class DbUtils {
* output string with {@code "0"} to make sure the results will always have * output string with {@code "0"} to make sure the results will always have
* same length (for a {@link Long}). So it will work when comparing * same length (for a {@link Long}). So it will work when comparing
* different values as text. * different values as text.
* *
* @param n a long value. * @param n
* a long value.
* @return the formatted string. * @return the formatted string.
*/ */
public static String formatNumber(long n) { public static String formatNumber(long n) {
@ -70,13 +72,15 @@ public class DbUtils {
/** /**
* Calls {@link DatabaseUtils#sqlEscapeString(String)}, then removes single * Calls {@link DatabaseUtils#sqlEscapeString(String)}, then removes single
* quotes at the begin and the end of the returned string. * quotes at the begin and the end of the returned string.
* *
* @param value the string to escape. If {@code null}, empty string will * @param value
* return; * the string to escape. If {@code null}, empty string will
* return;
* @return the "raw" escaped-string. * @return the "raw" escaped-string.
*/ */
public static String rawSqlEscapeString(String value) { public static String rawSqlEscapeString(String value) {
return value == null ? "" : DatabaseUtils.sqlEscapeString(value) return value == null ? "" : DatabaseUtils.sqlEscapeString(value)
.replaceFirst("(?msi)^'", "").replaceFirst("(?msi)'$", ""); .replaceFirst("(?msi)^'", "").replaceFirst("(?msi)'$", "");
}// rawSqlEscapeString() }// rawSqlEscapeString()
} }

View File

@ -12,7 +12,7 @@ import android.net.Uri;
/** /**
* Utilities for providers. * Utilities for providers.
* *
* @author Hai Bison * @author Hai Bison
* @since v5.1 beta * @since v5.1 beta
*/ */
@ -25,10 +25,13 @@ public class ProviderUtils {
/** /**
* Gets integer parameter. * Gets integer parameter.
* *
* @param uri the original URI. * @param uri
* @param key the key of query parameter. * the original URI.
* @param defaultValue will be returned if nothing found or parsing value failed. * @param key
* the key of query parameter.
* @param defaultValue
* will be returned if nothing found or parsing value failed.
* @return the integer value. * @return the integer value.
*/ */
public static int getIntQueryParam(Uri uri, String key, int defaultValue) { public static int getIntQueryParam(Uri uri, String key, int defaultValue) {
@ -41,10 +44,13 @@ public class ProviderUtils {
/** /**
* Gets long parameter. * Gets long parameter.
* *
* @param uri the original URI. * @param uri
* @param key the key of query parameter. * the original URI.
* @param defaultValue will be returned if nothing found or parsing value failed. * @param key
* the key of query parameter.
* @param defaultValue
* will be returned if nothing found or parsing value failed.
* @return the long value. * @return the long value.
*/ */
public static long getLongQueryParam(Uri uri, String key, long defaultValue) { public static long getLongQueryParam(Uri uri, String key, long defaultValue) {
@ -57,9 +63,11 @@ public class ProviderUtils {
/** /**
* Gets boolean parameter. * Gets boolean parameter.
* *
* @param uri the original URI. * @param uri
* @param key the key of query parameter. * the original URI.
* @param key
* the key of query parameter.
* @return {@code false} if the parameter does not exist, or it is either * @return {@code false} if the parameter does not exist, or it is either
* {@code "false"} or {@code "0"}. {@code true} otherwise. * {@code "false"} or {@code "0"}. {@code true} otherwise.
*/ */
@ -73,15 +81,18 @@ public class ProviderUtils {
/** /**
* Gets boolean parameter. * Gets boolean parameter.
* *
* @param uri the original URI. * @param uri
* @param key the key of query parameter. * the original URI.
* @param defaultValue the default value if the parameter does not exist. * @param key
* the key of query parameter.
* @param defaultValue
* the default value if the parameter does not exist.
* @return {@code defaultValue} if the parameter does not exist, or it is * @return {@code defaultValue} if the parameter does not exist, or it is
* either {@code "false"} or {@code "0"}. {@code true} otherwise. * either {@code "false"} or {@code "0"}. {@code true} otherwise.
*/ */
public static boolean getBooleanQueryParam(Uri uri, String key, public static boolean getBooleanQueryParam(Uri uri, String key,
boolean defaultValue) { boolean defaultValue) {
String param = uri.getQueryParameter(key); String param = uri.getQueryParameter(key);
if (param == null) if (param == null)
return defaultValue; return defaultValue;
@ -89,4 +100,5 @@ public class ProviderUtils {
return false; return false;
return true; return true;
}// getBooleanQueryParam() }// getBooleanQueryParam()
} }

View File

@ -533,4 +533,5 @@ public class BaseFileContract {
*/ */
public static final String COLUMN_PROVIDER_ICON_ATTR = "provider_icon_attr"; public static final String COLUMN_PROVIDER_ICON_ATTR = "provider_icon_attr";
}// BaseFile }// BaseFile
} }

View File

@ -7,11 +7,11 @@
package group.pals.android.lib.ui.filechooser.providers.history; package group.pals.android.lib.ui.filechooser.providers.history;
import android.content.Context;
import android.net.Uri;
import group.pals.android.lib.ui.filechooser.providers.BaseColumns; import group.pals.android.lib.ui.filechooser.providers.BaseColumns;
import group.pals.android.lib.ui.filechooser.providers.ProviderUtils; import group.pals.android.lib.ui.filechooser.providers.ProviderUtils;
import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileContract.BaseFile; import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileContract.BaseFile;
import android.content.Context;
import android.net.Uri;
/** /**
* History contract. * History contract.
@ -123,4 +123,5 @@ public final class HistoryContract implements BaseColumns {
* Type: {@code URI} * Type: {@code URI}
*/ */
public static final String COLUMN_URI = "uri"; public static final String COLUMN_URI = "uri";
} }

View File

@ -423,4 +423,5 @@ public class HistoryProvider extends ContentProvider {
return result; return result;
}// appendNameAndRealUri() }// appendNameAndRealUri()
} }

View File

@ -131,4 +131,5 @@ public class FileObserverEx extends FileObserver {
HandlerThreadCompat_v5.quit(mHandlerThread); HandlerThreadCompat_v5.quit(mHandlerThread);
mHandlerThread.interrupt(); mHandlerThread.interrupt();
}// stopWatching() }// stopWatching()
} }

View File

@ -11,7 +11,7 @@ import android.os.HandlerThread;
/** /**
* Helper class for backward compatibility of {@link HandlerThread} from API 5+. * Helper class for backward compatibility of {@link HandlerThread} from API 5+.
* *
* @author Hai Bison * @author Hai Bison
* @since v5.1 beta * @since v5.1 beta
*/ */
@ -19,10 +19,12 @@ public class HandlerThreadCompat_v5 {
/** /**
* Wrapper for {@link HandlerThread#quit()}. * Wrapper for {@link HandlerThread#quit()}.
* *
* @param thread the handler thread. * @param thread
* the handler thread.
*/ */
public static void quit(HandlerThread thread) { public static void quit(HandlerThread thread) {
thread.quit(); thread.quit();
}// quit() }// quit()
} }

View File

@ -11,7 +11,7 @@ import android.content.Context;
/** /**
* Contract for local file. * Contract for local file.
* *
* @author Hai Bison * @author Hai Bison
* @since v5.1 beta * @since v5.1 beta
*/ */
@ -24,8 +24,9 @@ public class LocalFileContract {
/** /**
* Gets the authority of this provider. * Gets the authority of this provider.
* *
* @param context the context. * @param context
* the context.
* @return the authority. * @return the authority.
*/ */
public static final String getAuthority(Context context) { public static final String getAuthority(Context context) {
@ -36,4 +37,5 @@ public class LocalFileContract {
* The unique ID of this provider. * The unique ID of this provider.
*/ */
public static final String _ID = "7dab9818-0a8b-47ef-88cc-10fe538bfaf7"; public static final String _ID = "7dab9818-0a8b-47ef-88cc-10fe538bfaf7";
} }

View File

@ -269,15 +269,11 @@ public class LocalFileProvider extends BaseFileProvider {
else if (BaseFile.CMD_IS_ANCESTOR_OF.equals(uri.getLastPathSegment())) { else if (BaseFile.CMD_IS_ANCESTOR_OF.equals(uri.getLastPathSegment())) {
return doCheckAncestor(uri); return doCheckAncestor(uri);
} else if (BaseFile.CMD_GET_PARENT.equals(uri.getLastPathSegment())) { } else if (BaseFile.CMD_GET_PARENT.equals(uri.getLastPathSegment())) {
String sourcePath = Uri.parse( File file = new File(Uri.parse(
uri.getQueryParameter(BaseFile.PARAM_SOURCE)).getPath(); uri.getQueryParameter(BaseFile.PARAM_SOURCE)).getPath());
File file = new File(sourcePath);
file = file.getParentFile(); file = file.getParentFile();
if (file == null) if (file == null)
{
Log.d(CLASSNAME,"returning null as parent for "+sourcePath);
return null; return null;
}
matrixCursor = BaseFileProviderUtils.newBaseFileCursor(); matrixCursor = BaseFileProviderUtils.newBaseFileCursor();
@ -286,8 +282,6 @@ public class LocalFileProvider extends BaseFileProvider {
.exists() ? BaseFile.FILE_TYPE_UNKNOWN .exists() ? BaseFile.FILE_TYPE_UNKNOWN
: BaseFile.FILE_TYPE_NOT_EXISTED)); : BaseFile.FILE_TYPE_NOT_EXISTED));
Log.d(CLASSNAME, "Returning " + Uri.fromFile(file).toString()+" as parent for "+sourcePath);
RowBuilder newRow = matrixCursor.newRow(); RowBuilder newRow = matrixCursor.newRow();
newRow.add(0);// _ID newRow.add(0);// _ID
newRow.add(BaseFile newRow.add(BaseFile
@ -747,4 +741,5 @@ public class LocalFileProvider extends BaseFileProvider {
return new File(fileName); return new File(fileName);
}// extractFile() }// extractFile()
} }

View File

@ -471,4 +471,5 @@ public class AfcSearchView extends LinearLayout {
mTextSearch.setText(null); mTextSearch.setText(null);
}// onClick() }// onClick()
};// mButtonClearOnClickListener };// mButtonClearOnClickListener
} }

View File

@ -47,4 +47,5 @@ public class Converter {
String.format("%s %%sB", digitGroups == 0 ? "%,.0f" : "%,.2f"), String.format("%s %%sB", digitGroups == 0 ? "%,.0f" : "%,.2f"),
size, units[digitGroups]); size, units[digitGroups]);
}// sizeToStr() }// sizeToStr()
} }

View File

@ -7,15 +7,16 @@
package group.pals.android.lib.ui.filechooser.utils; package group.pals.android.lib.ui.filechooser.utils;
import android.content.Context;
import group.pals.android.lib.ui.filechooser.R; import group.pals.android.lib.ui.filechooser.R;
import group.pals.android.lib.ui.filechooser.prefs.DisplayPrefs.FileTimeDisplay; import group.pals.android.lib.ui.filechooser.prefs.DisplayPrefs.FileTimeDisplay;
import java.util.Calendar; import java.util.Calendar;
import android.content.Context;
/** /**
* Date utilities. * Date utilities.
* *
* @author Hai Bison * @author Hai Bison
* @since v4.7 beta * @since v4.7 beta
*/ */
@ -45,14 +46,17 @@ public class DateUtils {
/** /**
* Formats date. * Formats date.
* *
* @param context {@link Context}. * @param context
* @param millis time in milliseconds. * {@link Context}.
* @param fileTimeDisplay {@link FileTimeDisplay}. * @param millis
* time in milliseconds.
* @param fileTimeDisplay
* {@link FileTimeDisplay}.
* @return the formatted string * @return the formatted string
*/ */
public static String formatDate(Context context, long millis, public static String formatDate(Context context, long millis,
FileTimeDisplay fileTimeDisplay) { FileTimeDisplay fileTimeDisplay) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(millis); cal.setTimeInMillis(millis);
return formatDate(context, cal, fileTimeDisplay); return formatDate(context, cal, fileTimeDisplay);
@ -60,14 +64,17 @@ public class DateUtils {
/** /**
* Formats date. * Formats date.
* *
* @param context {@link Context}. * @param context
* @param date {@link Calendar}. * {@link Context}.
* @param fileTimeDisplay {@link FileTimeDisplay}. * @param date
* {@link Calendar}.
* @param fileTimeDisplay
* {@link FileTimeDisplay}.
* @return the formatted string, for local human reading. * @return the formatted string, for local human reading.
*/ */
public static String formatDate(Context context, Calendar date, public static String formatDate(Context context, Calendar date,
FileTimeDisplay fileTimeDisplay) { FileTimeDisplay fileTimeDisplay) {
final Calendar yesterday = Calendar.getInstance(); final Calendar yesterday = Calendar.getInstance();
yesterday.add(Calendar.DAY_OF_YEAR, -1); yesterday.add(Calendar.DAY_OF_YEAR, -1);
@ -79,7 +86,7 @@ public class DateUtils {
}// today }// today
else if (date.get(Calendar.YEAR) == yesterday.get(Calendar.YEAR) else if (date.get(Calendar.YEAR) == yesterday.get(Calendar.YEAR)
&& date.get(Calendar.DAY_OF_YEAR) == yesterday && date.get(Calendar.DAY_OF_YEAR) == yesterday
.get(Calendar.DAY_OF_YEAR)) { .get(Calendar.DAY_OF_YEAR)) {
res = String.format( res = String.format(
"%s, %s", "%s, %s",
context.getString(R.string.afc_yesterday), context.getString(R.string.afc_yesterday),
@ -87,25 +94,26 @@ public class DateUtils {
date.getTimeInMillis(), FORMAT_SHORT_TIME)); date.getTimeInMillis(), FORMAT_SHORT_TIME));
}// yesterday }// yesterday
else if (date.get(Calendar.YEAR) == yesterday.get(Calendar.YEAR)) { else if (date.get(Calendar.YEAR) == yesterday.get(Calendar.YEAR)) {
if (fileTimeDisplay.isShowTimeForOldDaysThisYear()) if (fileTimeDisplay.showTimeForOldDaysThisYear)
res = android.text.format.DateUtils.formatDateTime(context, res = android.text.format.DateUtils.formatDateTime(context,
date.getTimeInMillis(), FORMAT_SHORT_TIME date.getTimeInMillis(), FORMAT_SHORT_TIME
| FORMAT_MONTH_AND_DAY); | FORMAT_MONTH_AND_DAY);
else else
res = android.text.format.DateUtils.formatDateTime(context, res = android.text.format.DateUtils.formatDateTime(context,
date.getTimeInMillis(), FORMAT_MONTH_AND_DAY); date.getTimeInMillis(), FORMAT_MONTH_AND_DAY);
}// this year }// this year
else { else {
if (fileTimeDisplay.isShowTimeForOldDays()) if (fileTimeDisplay.showTimeForOldDays)
res = android.text.format.DateUtils.formatDateTime(context, res = android.text.format.DateUtils.formatDateTime(context,
date.getTimeInMillis(), FORMAT_SHORT_TIME date.getTimeInMillis(), FORMAT_SHORT_TIME
| FORMAT_MONTH_AND_DAY | FORMAT_YEAR); | FORMAT_MONTH_AND_DAY | FORMAT_YEAR);
else else
res = android.text.format.DateUtils.formatDateTime(context, res = android.text.format.DateUtils.formatDateTime(context,
date.getTimeInMillis(), FORMAT_MONTH_AND_DAY date.getTimeInMillis(), FORMAT_MONTH_AND_DAY
| FORMAT_YEAR); | FORMAT_YEAR);
}// other years (maybe older or newer than this year) }// other years (maybe older or newer than this year)
return res; return res;
}// formatDate() }// formatDate()
} }

View File

@ -28,4 +28,5 @@ public class EnvUtils {
public static final int genId() { public static final int genId() {
return mId++; return mId++;
}// genId() }// genId()
} }

View File

@ -95,4 +95,5 @@ public class FileUtils {
public static boolean isFilenameValid(String name) { public static boolean isFilenameValid(String name) {
return name != null && name.trim().matches("[^\\\\/?%*:|\"<>]+"); return name != null && name.trim().matches("[^\\\\/?%*:|\"<>]+");
}// isFilenameValid() }// isFilenameValid()
} }

View File

@ -77,4 +77,5 @@ public class MimeTypes {
public static final String REGEX_FILE_TYPE_COMPRESSED = "(?si)^.+\\.(zip|" public static final String REGEX_FILE_TYPE_COMPRESSED = "(?si)^.+\\.(zip|"
+ "7z|lz?|[jrt]ar|gz|gzip|bzip|xz|cab|sfx|z|iso|bz?|rz|s7z|apk|" + "7z|lz?|[jrt]ar|gz|gzip|bzip|xz|cab|sfx|z|iso|bz?|rz|s7z|apk|"
+ "dmg)$"; + "dmg)$";
} }

View File

@ -23,11 +23,11 @@ public class Sys {
/** /**
* The library version name. * The library version name.
*/ */
public static final String LIB_VERSION_NAME = "5.4.3 beta"; public static final String LIB_VERSION_NAME = "5.4.4 beta";
/** /**
* The library version code. * The library version code.
*/ */
public static final int LIB_VERSION_CODE = 54; public static final int LIB_VERSION_CODE = 56;
} }

View File

@ -11,7 +11,7 @@ import java.util.regex.Pattern;
/** /**
* Text utilities. * Text utilities.
* *
* @author Hai Bison * @author Hai Bison
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -19,8 +19,9 @@ public class TextUtils {
/** /**
* Quotes a text in double quotation mark. * Quotes a text in double quotation mark.
* *
* @param s the text, if {@code null}, empty string will be used * @param s
* the text, if {@code null}, empty string will be used
* @return the quoted text * @return the quoted text
*/ */
public static String quote(String s) { public static String quote(String s) {
@ -29,8 +30,9 @@ public class TextUtils {
/** /**
* Compiles {@code regex}. * Compiles {@code regex}.
* *
* @param regex the regex. * @param regex
* the regex.
* @return a compiled {@link Pattern}, or {@code null} if there is an error * @return a compiled {@link Pattern}, or {@code null} if there is an error
* while compiling. * while compiling.
*/ */
@ -43,4 +45,5 @@ public class TextUtils {
return null; return null;
} }
}// compileRegex() }// compileRegex()
} }

View File

@ -7,14 +7,15 @@
package group.pals.android.lib.ui.filechooser.utils.history; package group.pals.android.lib.ui.filechooser.utils.history;
import android.os.Parcelable;
import java.util.ArrayList; import java.util.ArrayList;
import android.os.Parcelable;
/** /**
* A history store of any object. * A history store of any object.
* *
* @param <A> any type * @param <A>
* any type
* @author Hai Bison * @author Hai Bison
* @since v2.0 alpha * @since v2.0 alpha
*/ */
@ -23,15 +24,17 @@ public interface History<A> extends Parcelable {
/** /**
* Pushes {@code newItem} to the history. If the top item is same as this * Pushes {@code newItem} to the history. If the top item is same as this
* one, then does nothing. * one, then does nothing.
* *
* @param newItem the new item * @param newItem
* the new item
*/ */
void push(A newItem); void push(A newItem);
/** /**
* Finds {@code item} and if it exists, removes all items after it. * Finds {@code item} and if it exists, removes all items after it.
* *
* @param item {@link A} * @param item
* {@link A}
* @return the total items truncated. * @return the total items truncated.
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -39,54 +42,59 @@ public interface History<A> extends Parcelable {
/** /**
* Removes an item. * Removes an item.
* *
* @param item {@link A} * @param item
* {@link A}
* @since v4.0 beta * @since v4.0 beta
*/ */
void remove(A item); void remove(A item);
/** /**
* Removes all items by a filter. * Removes all items by a filter.
* *
* @param filter {@link HistoryFilter} * @param filter
* {@link HistoryFilter}
* @since v4.0 beta * @since v4.0 beta
*/ */
void removeAll(HistoryFilter<A> filter); void removeAll(HistoryFilter<A> filter);
/** /**
* Gets size of the history * Gets size of the history
* *
* @return the size of the history * @return the size of the history
*/ */
int size(); int size();
/** /**
* Gets index of item {@code a} * Gets index of item {@code a}
* *
* @param a an item * @param a
* an item
* @return index of the {@code a}, or -1 if there is no one * @return index of the {@code a}, or -1 if there is no one
*/ */
int indexOf(A a); int indexOf(A a);
/** /**
* Gets previous item of {@code a} * Gets previous item of {@code a}
* *
* @param a current item * @param a
* current item
* @return the previous item, can be {@code null} * @return the previous item, can be {@code null}
*/ */
A prevOf(A a); A prevOf(A a);
/** /**
* Gets next item of {@code a} * Gets next item of {@code a}
* *
* @param a current item * @param a
* current item
* @return the next item, can be {@code null} * @return the next item, can be {@code null}
*/ */
A nextOf(A a); A nextOf(A a);
/** /**
* Retrieves all items in this history, in an <i>independent</i> list. * Retrieves all items in this history, in an <i>independent</i> list.
* *
* @return list of {@link A}. * @return list of {@link A}.
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -94,7 +102,7 @@ public interface History<A> extends Parcelable {
/** /**
* Checks if the history is empty or not. * Checks if the history is empty or not.
* *
* @return {@code true} if this history is empty, {@code false} otherwise. * @return {@code true} if this history is empty, {@code false} otherwise.
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -102,23 +110,25 @@ public interface History<A> extends Parcelable {
/** /**
* Clears this history. * Clears this history.
* *
* @since v4.3 beta. * @since v4.3 beta.
*/ */
void clear(); void clear();
/** /**
* Adds a {@link HistoryListener} * Adds a {@link HistoryListener}
* *
* @param listener {@link HistoryListener} * @param listener
* {@link HistoryListener}
* @since v4.0 beta * @since v4.0 beta
*/ */
void addListener(HistoryListener<A> listener); void addListener(HistoryListener<A> listener);
/** /**
* Removes a {@link HistoryListener} * Removes a {@link HistoryListener}
* *
* @param listener {@link HistoryListener} * @param listener
* {@link HistoryListener}
* @return the removed listener * @return the removed listener
* @since v4.0 beta * @since v4.0 beta
*/ */
@ -131,13 +141,16 @@ public interface History<A> extends Parcelable {
/** /**
* Finds items with a filter. * Finds items with a filter.
* *
* @param filter {@link HistoryFilter} * @param filter
* @param ascending {@code true} if you want to process the history list ascending * {@link HistoryFilter}
* (oldest to newest), {@code false} for descending. * @param ascending
* {@code true} if you want to process the history list ascending
* (oldest to newest), {@code false} for descending.
* @return {@code true} if the desired items have been found, {@code false} * @return {@code true} if the desired items have been found, {@code false}
* otherwise. * otherwise.
* @since v5.1 beta * @since v5.1 beta
*/ */
boolean find(HistoryFilter<A> filter, boolean ascending); boolean find(HistoryFilter<A> filter, boolean ascending);
} }

View File

@ -9,7 +9,7 @@ package group.pals.android.lib.ui.filechooser.utils.history;
/** /**
* Filter of {@link History} * Filter of {@link History}
* *
* @author Hai Bison * @author Hai Bison
* @since v4.0 beta * @since v4.0 beta
*/ */
@ -17,9 +17,11 @@ public interface HistoryFilter<A> {
/** /**
* Filters item. * Filters item.
* *
* @param item {@link A} * @param item
* {@link A}
* @return {@code true} if the {@code item} is accepted * @return {@code true} if the {@code item} is accepted
*/ */
boolean accept(A item); boolean accept(A item);
} }

View File

@ -9,7 +9,7 @@ package group.pals.android.lib.ui.filechooser.utils.history;
/** /**
* Listener of {@link History} * Listener of {@link History}
* *
* @author Hai Bison * @author Hai Bison
* @since v4.0 beta * @since v4.0 beta
*/ */
@ -17,8 +17,10 @@ public interface HistoryListener<A> {
/** /**
* Will be called after the history changed. * Will be called after the history changed.
* *
* @param history {@link History} * @param history
* {@link History}
*/ */
void onChanged(History<A> history); void onChanged(History<A> history);
} }

View File

@ -259,4 +259,5 @@ public class HistoryStore<A extends Parcelable> implements History<A> {
private HistoryStore(Parcel in) { private HistoryStore(Parcel in) {
readFromParcel(in); readFromParcel(in);
}// HistoryStore() }// HistoryStore()
} }

View File

@ -129,4 +129,5 @@ public class ContextMenuUtils {
*/ */
void onClick(int resId); void onClick(int resId);
}// OnMenuItemClickListener }// OnMenuItemClickListener
} }

View File

@ -7,17 +7,17 @@
package group.pals.android.lib.ui.filechooser.utils.ui; package group.pals.android.lib.ui.filechooser.utils.ui;
import group.pals.android.lib.ui.filechooser.R;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.widget.Toast; import android.widget.Toast;
import group.pals.android.lib.ui.filechooser.R;
/** /**
* Utilities for message boxes. * Utilities for message boxes.
* *
* @author Hai Bison * @author Hai Bison
* @since v2.1 alpha * @since v2.1 alpha
*/ */
@ -36,10 +36,13 @@ public class Dlg {
/** /**
* Shows a toast message. * Shows a toast message.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param duration can be {@link #LENGTH_LONG} or {@link #LENGTH_SHORT}. * @param msg
* the message.
* @param duration
* can be {@link #LENGTH_LONG} or {@link #LENGTH_SHORT}.
*/ */
public static void toast(Context context, CharSequence msg, int duration) { public static void toast(Context context, CharSequence msg, int duration) {
if (mToast != null) if (mToast != null)
@ -50,10 +53,13 @@ public class Dlg {
/** /**
* Shows a toast message. * Shows a toast message.
* *
* @param context {@link Context} * @param context
* @param msgId the resource ID of the message. * {@link Context}
* @param duration can be {@link #LENGTH_LONG} or {@link #LENGTH_SHORT}. * @param msgId
* the resource ID of the message.
* @param duration
* can be {@link #LENGTH_LONG} or {@link #LENGTH_SHORT}.
*/ */
public static void toast(Context context, int msgId, int duration) { public static void toast(Context context, int msgId, int duration) {
toast(context, context.getString(msgId), duration); toast(context, context.getString(msgId), duration);
@ -61,13 +67,16 @@ public class Dlg {
/** /**
* Shows an info dialog. * Shows an info dialog.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param listener the {@link DialogInterface.OnDismissListener}. * @param msg
* the message.
* @param listener
* the {@link DialogInterface.OnDismissListener}.
*/ */
public static void showInfo(Context context, CharSequence msg, public static void showInfo(Context context, CharSequence msg,
DialogInterface.OnDismissListener listener) { DialogInterface.OnDismissListener listener) {
AlertDialog dlg = newAlertDlg(context); AlertDialog dlg = newAlertDlg(context);
dlg.setIcon(android.R.drawable.ic_dialog_info); dlg.setIcon(android.R.drawable.ic_dialog_info);
dlg.setTitle(R.string.afc_title_info); dlg.setTitle(R.string.afc_title_info);
@ -78,21 +87,26 @@ public class Dlg {
/** /**
* Shows an info dialog. * Shows an info dialog.
* *
* @param context the context. * @param context
* @param msgId the resource ID of the message. * the context.
* @param listener the {@link DialogInterface.OnDismissListener}. * @param msgId
* the resource ID of the message.
* @param listener
* the {@link DialogInterface.OnDismissListener}.
*/ */
public static void showInfo(Context context, int msgId, public static void showInfo(Context context, int msgId,
DialogInterface.OnDismissListener listener) { DialogInterface.OnDismissListener listener) {
showInfo(context, context.getString(msgId), listener); showInfo(context, context.getString(msgId), listener);
}// showInfo() }// showInfo()
/** /**
* Shows an info dialog. * Shows an info dialog.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param msg
* the message.
*/ */
public static void showInfo(Context context, CharSequence msg) { public static void showInfo(Context context, CharSequence msg) {
showInfo(context, msg, null); showInfo(context, msg, null);
@ -100,9 +114,11 @@ public class Dlg {
/** /**
* Shows an info dialog. * Shows an info dialog.
* *
* @param context {@link Context} * @param context
* @param msgId the resource ID of the message. * {@link Context}
* @param msgId
* the resource ID of the message.
*/ */
public static void showInfo(Context context, int msgId) { public static void showInfo(Context context, int msgId) {
showInfo(context, context.getString(msgId)); showInfo(context, context.getString(msgId));
@ -110,13 +126,16 @@ public class Dlg {
/** /**
* Shows an error message. * Shows an error message.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param listener will be called after the user cancelled the dialog. * @param msg
* the message.
* @param listener
* will be called after the user cancelled the dialog.
*/ */
public static void showError(Context context, CharSequence msg, public static void showError(Context context, CharSequence msg,
DialogInterface.OnCancelListener listener) { DialogInterface.OnCancelListener listener) {
AlertDialog dlg = newAlertDlg(context); AlertDialog dlg = newAlertDlg(context);
dlg.setIcon(android.R.drawable.ic_dialog_alert); dlg.setIcon(android.R.drawable.ic_dialog_alert);
dlg.setTitle(R.string.afc_title_error); dlg.setTitle(R.string.afc_title_error);
@ -127,25 +146,31 @@ public class Dlg {
/** /**
* Shows an error message. * Shows an error message.
* *
* @param context {@link Context} * @param context
* @param msgId the resource ID of the message. * {@link Context}
* @param listener will be called after the user cancelled the dialog. * @param msgId
* the resource ID of the message.
* @param listener
* will be called after the user cancelled the dialog.
*/ */
public static void showError(Context context, int msgId, public static void showError(Context context, int msgId,
DialogInterface.OnCancelListener listener) { DialogInterface.OnCancelListener listener) {
showError(context, context.getString(msgId), listener); showError(context, context.getString(msgId), listener);
}// showError() }// showError()
/** /**
* Shows an unknown error. * Shows an unknown error.
* *
* @param context {@link Context} * @param context
* @param t the {@link Throwable} * {@link Context}
* @param listener will be called after the user cancelled the dialog. * @param t
* the {@link Throwable}
* @param listener
* will be called after the user cancelled the dialog.
*/ */
public static void showUnknownError(Context context, Throwable t, public static void showUnknownError(Context context, Throwable t,
DialogInterface.OnCancelListener listener) { DialogInterface.OnCancelListener listener) {
showError( showError(
context, context,
String.format( String.format(
@ -155,16 +180,20 @@ public class Dlg {
/** /**
* Shows a confirmation dialog. * Shows a confirmation dialog.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param onYes will be called if the user selects positive answer (a * @param msg
* <i>Yes</i> or <i>OK</i>). * the message.
* @param onNo will be called after the user cancelled the dialog. * @param onYes
* will be called if the user selects positive answer (a
* <i>Yes</i> or <i>OK</i>).
* @param onNo
* will be called after the user cancelled the dialog.
*/ */
public static void confirmYesno(Context context, CharSequence msg, public static void confirmYesno(Context context, CharSequence msg,
DialogInterface.OnClickListener onYes, DialogInterface.OnClickListener onYes,
DialogInterface.OnCancelListener onNo) { DialogInterface.OnCancelListener onNo) {
AlertDialog dlg = newAlertDlg(context); AlertDialog dlg = newAlertDlg(context);
dlg.setIcon(android.R.drawable.ic_dialog_alert); dlg.setIcon(android.R.drawable.ic_dialog_alert);
dlg.setTitle(R.string.afc_title_confirmation); dlg.setTitle(R.string.afc_title_confirmation);
@ -177,22 +206,26 @@ public class Dlg {
/** /**
* Shows a confirmation dialog. * Shows a confirmation dialog.
* *
* @param context {@link Context} * @param context
* @param msg the message. * {@link Context}
* @param onYes will be called if the user selects positive answer (a * @param msg
* <i>Yes</i> or <i>OK</i>). * the message.
* @param onYes
* will be called if the user selects positive answer (a
* <i>Yes</i> or <i>OK</i>).
*/ */
public static void confirmYesno(Context context, CharSequence msg, public static void confirmYesno(Context context, CharSequence msg,
DialogInterface.OnClickListener onYes) { DialogInterface.OnClickListener onYes) {
confirmYesno(context, msg, onYes, null); confirmYesno(context, msg, onYes, null);
}// confirmYesno() }// confirmYesno()
/** /**
* Creates new {@link Dialog}. Set canceled on touch outside to {@code true} * Creates new {@link Dialog}. Set canceled on touch outside to {@code true}
* . * .
* *
* @param context the context which uses this library's theme. * @param context
* the context which uses this library's theme.
* @return the {@link Dialog}. * @return the {@link Dialog}.
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -206,8 +239,9 @@ public class Dlg {
/** /**
* Creates new {@link AlertDialog}. Set canceled on touch outside to * Creates new {@link AlertDialog}. Set canceled on touch outside to
* {@code true}. * {@code true}.
* *
* @param context the context which uses this library's theme. * @param context
* the context which uses this library's theme.
* @return {@link AlertDialog} * @return {@link AlertDialog}
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -219,8 +253,9 @@ public class Dlg {
/** /**
* Creates new {@link AlertDialog.Builder}. * Creates new {@link AlertDialog.Builder}.
* *
* @param context the context which uses this library's theme. * @param context
* the context which uses this library's theme.
* @return {@link AlertDialog} * @return {@link AlertDialog}
* @since v4.3 beta * @since v4.3 beta
*/ */
@ -228,4 +263,5 @@ public class Dlg {
return new AlertDialog.Builder(new ContextThemeWrapper(context, return new AlertDialog.Builder(new ContextThemeWrapper(context,
Ui.resolveAttribute(context, R.attr.afc_theme_dialog))); Ui.resolveAttribute(context, R.attr.afc_theme_dialog)));
}// newAlertDlgBuilder() }// newAlertDlgBuilder()
} }

View File

@ -23,7 +23,7 @@ import android.widget.AbsListView;
*/ */
public class GestureUtils { public class GestureUtils {
public static final String CLASSNAME = GestureUtils.class.getName(); private static final String CLASSNAME = GestureUtils.class.getName();
/** /**
* The fling direction. * The fling direction.
@ -218,4 +218,5 @@ public class GestureUtils {
} }
}); });
}// setupGestureDetector() }// setupGestureDetector()
} }

View File

@ -7,6 +7,7 @@
package group.pals.android.lib.ui.filechooser.utils.ui; package group.pals.android.lib.ui.filechooser.utils.ui;
import group.pals.android.lib.ui.filechooser.R;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -24,7 +25,7 @@ import android.util.Log;
public abstract class LoadingDialog<Params, Progress, Result> extends public abstract class LoadingDialog<Params, Progress, Result> extends
AsyncTask<Params, Progress, Result> { AsyncTask<Params, Progress, Result> {
public static final String CLASSNAME = LoadingDialog.class.getName(); private static final String CLASSNAME = LoadingDialog.class.getName();
private final ProgressDialog mDialog; private final ProgressDialog mDialog;
/** /**
@ -79,6 +80,19 @@ public abstract class LoadingDialog<Params, Progress, Result> extends
this(context, context.getString(msgId), cancelable); this(context, context.getString(msgId), cancelable);
}// LoadingDialog() }// LoadingDialog()
/**
* Creates new {@link LoadingDialog} showing "Loading..." (
* {@link R.string#afc_msg_loading}).
*
* @param context
* {@link Context}
* @param cancelable
* as the name means.
*/
public LoadingDialog(Context context, boolean cancelable) {
this(context, context.getString(R.string.afc_msg_loading), cancelable);
}// LoadingDialog()
/** /**
* If you override this method, you must call {@code super.onPreExecute()} * If you override this method, you must call {@code super.onPreExecute()}
* at very first of the method. * at very first of the method.

View File

@ -65,4 +65,5 @@ public class MenuItemAdapter extends BaseAdapter {
return convertView; return convertView;
}// getView() }// getView()
} }

View File

@ -24,4 +24,5 @@ public interface TaskListener {
* the user data, can be {@code null}. * the user data, can be {@code null}.
*/ */
public void onFinish(boolean ok, Object any); public void onFinish(boolean ok, Object any);
} }

View File

@ -145,4 +145,5 @@ public class Ui {
dialogWindow.setLayout(width, height); dialogWindow.setLayout(width, height);
} }
}// adjustDialogSizeForLargeScreen() }// adjustDialogSizeForLargeScreen()
} }