From: jabarros Date: Wed, 12 Nov 2014 07:46:29 +0000 (+0100) Subject: Modify kitkat document provider implementation in order to cover all 'content://... X-Git-Tag: oc-android-1.7.0_signed~101^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3cae3d3eb84a0b734ee9ca8a27ee7df29232d90e?ds=sidebyside Modify kitkat document provider implementation in order to cover all 'content://' cases --- diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index bc0231fb..2469dcf7 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -949,8 +949,8 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { return getDataColumn(getApplicationContext(), contentUri, selection, selectionArgs); } - // Google Drive - else if (isGoogleDriveDocument(uri)) { + // Documents providers returned as content://... + else if (isAContentDocument(uri)) { return uri.toString(); } } @@ -1042,6 +1042,15 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { } /** + * + * @param uri The Uri to check. + * @return Whether the Uri is from a content provider as kind "content://..." + */ + public static boolean isAContentDocument(Uri uri) { + return uri.toString().startsWith("content://"); + } + + /** * Pushes a directory to the drop down list * @param directory to push * @throws IllegalArgumentException If the {@link OCFile#isFolder()} returns false.