|
@@ -31,6 +31,7 @@ import android.app.ProgressDialog;
|
|
import android.content.BroadcastReceiver;
|
|
import android.content.BroadcastReceiver;
|
|
import android.content.ComponentName;
|
|
import android.content.ComponentName;
|
|
import android.content.ContentResolver;
|
|
import android.content.ContentResolver;
|
|
|
|
+import android.content.ContentUris;
|
|
import android.content.Context;
|
|
import android.content.Context;
|
|
import android.content.DialogInterface;
|
|
import android.content.DialogInterface;
|
|
import android.content.Intent;
|
|
import android.content.Intent;
|
|
@@ -41,9 +42,12 @@ import android.content.SyncRequest;
|
|
import android.content.res.Resources.NotFoundException;
|
|
import android.content.res.Resources.NotFoundException;
|
|
import android.database.Cursor;
|
|
import android.database.Cursor;
|
|
import android.net.Uri;
|
|
import android.net.Uri;
|
|
|
|
+import android.os.Build;
|
|
import android.os.Bundle;
|
|
import android.os.Bundle;
|
|
|
|
+import android.os.Environment;
|
|
import android.os.IBinder;
|
|
import android.os.IBinder;
|
|
import android.preference.PreferenceManager;
|
|
import android.preference.PreferenceManager;
|
|
|
|
+import android.provider.DocumentsContract;
|
|
import android.provider.MediaStore;
|
|
import android.provider.MediaStore;
|
|
import android.support.v4.app.Fragment;
|
|
import android.support.v4.app.Fragment;
|
|
import android.support.v4.app.FragmentManager;
|
|
import android.support.v4.app.FragmentManager;
|
|
@@ -866,25 +870,144 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|
return dialog;
|
|
return dialog;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
- * Translates a content URI of an image to a physical path
|
|
|
|
- * on the disk
|
|
|
|
|
|
+ * Translates a content URI of an content to a physical path on the disk
|
|
|
|
+ *
|
|
* @param uri The URI to resolve
|
|
* @param uri The URI to resolve
|
|
- * @return The path to the image or null if it could not be found
|
|
|
|
|
|
+ * @return The path to the content or null if it could not be found
|
|
*/
|
|
*/
|
|
public String getPath(Uri uri) {
|
|
public String getPath(Uri uri) {
|
|
- String[] projection = { MediaStore.Images.Media.DATA };
|
|
|
|
- Cursor cursor = managedQuery(uri, projection, null, null, null);
|
|
|
|
- if (cursor != null) {
|
|
|
|
- int column_index = cursor
|
|
|
|
- .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
|
|
|
|
- cursor.moveToFirst();
|
|
|
|
- return cursor.getString(column_index);
|
|
|
|
- }
|
|
|
|
|
|
+ final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
|
|
|
|
+
|
|
|
|
+ // DocumentProvider
|
|
|
|
+ if (isKitKat && DocumentsContract.isDocumentUri(getApplicationContext(), uri)) {
|
|
|
|
+ // ExternalStorageProvider
|
|
|
|
+ if (isExternalStorageDocument(uri)) {
|
|
|
|
+ final String docId = DocumentsContract.getDocumentId(uri);
|
|
|
|
+ final String[] split = docId.split(":");
|
|
|
|
+ final String type = split[0];
|
|
|
|
+
|
|
|
|
+ if ("primary".equalsIgnoreCase(type)) {
|
|
|
|
+ return Environment.getExternalStorageDirectory() + "/" + split[1];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // DownloadsProvider
|
|
|
|
+ else if (isDownloadsDocument(uri)) {
|
|
|
|
+
|
|
|
|
+ final String id = DocumentsContract.getDocumentId(uri);
|
|
|
|
+ final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
|
|
|
|
+ Long.valueOf(id));
|
|
|
|
+
|
|
|
|
+ return getDataColumn(getApplicationContext(), contentUri, null, null);
|
|
|
|
+ }
|
|
|
|
+ // MediaProvider
|
|
|
|
+ else if (isMediaDocument(uri)) {
|
|
|
|
+ final String docId = DocumentsContract.getDocumentId(uri);
|
|
|
|
+ final String[] split = docId.split(":");
|
|
|
|
+ final String type = split[0];
|
|
|
|
+
|
|
|
|
+ Uri contentUri = null;
|
|
|
|
+ if ("image".equals(type)) {
|
|
|
|
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
|
|
|
|
+ } else if ("video".equals(type)) {
|
|
|
|
+ contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
|
|
|
|
+ } else if ("audio".equals(type)) {
|
|
|
|
+ contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ final String selection = "_id=?";
|
|
|
|
+ final String[] selectionArgs = new String[] { split[1] };
|
|
|
|
+
|
|
|
|
+ return getDataColumn(getApplicationContext(), contentUri, selection, selectionArgs);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // MediaStore (and general)
|
|
|
|
+ else if ("content".equalsIgnoreCase(uri.getScheme())) {
|
|
|
|
+
|
|
|
|
+ // Return the remote address
|
|
|
|
+ if (isGooglePhotosUri(uri))
|
|
|
|
+ return uri.getLastPathSegment();
|
|
|
|
+
|
|
|
|
+ return getDataColumn(getApplicationContext(), uri, null, null);
|
|
|
|
+ }
|
|
|
|
+ // File
|
|
|
|
+ else if ("file".equalsIgnoreCase(uri.getScheme())) {
|
|
|
|
+ return uri.getPath();
|
|
|
|
+ }
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * Get the value of the data column for this Uri. This is useful for
|
|
|
|
+ * MediaStore Uris, and other file-based ContentProviders.
|
|
|
|
+ *
|
|
|
|
+ * @param context The context.
|
|
|
|
+ * @param uri The Uri to query.
|
|
|
|
+ * @param selection (Optional) Filter used in the query.
|
|
|
|
+ * @param selectionArgs (Optional) Selection arguments used in the query.
|
|
|
|
+ * @return The value of the _data column, which is typically a file path.
|
|
|
|
+ */
|
|
|
|
+ public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
|
|
|
|
+
|
|
|
|
+ Cursor cursor = null;
|
|
|
|
+ final String column = "_data";
|
|
|
|
+ final String[] projection = { column };
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
|
|
|
|
+ if (cursor != null && cursor.moveToFirst()) {
|
|
|
|
+
|
|
|
|
+ final int column_index = cursor.getColumnIndexOrThrow(column);
|
|
|
|
+ return cursor.getString(column_index);
|
|
|
|
+ }
|
|
|
|
+ } finally {
|
|
|
|
+ if (cursor != null)
|
|
|
|
+ cursor.close();
|
|
|
|
+ }
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param uri The Uri to check.
|
|
|
|
+ * @return Whether the Uri authority is ExternalStorageProvider.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isExternalStorageDocument(Uri uri) {
|
|
|
|
+ return "com.android.externalstorage.documents".equals(uri.getAuthority());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param uri The Uri to check.
|
|
|
|
+ * @return Whether the Uri authority is DownloadsProvider.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isDownloadsDocument(Uri uri) {
|
|
|
|
+ return "com.android.providers.downloads.documents".equals(uri.getAuthority());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param uri The Uri to check.
|
|
|
|
+ * @return Whether the Uri authority is MediaProvider.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isMediaDocument(Uri uri) {
|
|
|
|
+ return "com.android.providers.media.documents".equals(uri.getAuthority());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param uri The Uri to check.
|
|
|
|
+ * @return Whether the Uri authority is Google Photos.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isGooglePhotosUri(Uri uri) {
|
|
|
|
+ return "com.google.android.apps.photos.content".equals(uri.getAuthority());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ *
|
|
|
|
+ * @param uri The Uri to check.
|
|
|
|
+ * @return Whether the Uri authority is Google Drive.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isGoogleDriveDocument(Uri uri) {
|
|
|
|
+ return "com.google.android.apps.docs.storage".equals(uri.getAuthority());
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* Pushes a directory to the drop down list
|
|
* Pushes a directory to the drop down list
|
|
* @param directory to push
|
|
* @param directory to push
|