MediaProvider: solve crash on Android 11 due to invalid contentProvider queries

This manifested mostly when trying to open "auto upload"

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>

src/main/java/com/owncloud/android/datamodel/ContentResolverHelper.kt

@@ -0,0 +1,93 @@
+package com.owncloud.android.datamodel
+
+import android.content.ContentResolver
+import android.database.Cursor
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.CancellationSignal
+import androidx.annotation.RequiresApi
+
+object ContentResolverHelper {
+    const val SORT_DIRECTION_ASCENDING = "ASC"
+    const val SORT_DIRECTION_DESCENDING = "DESC"
+
+    @JvmStatic
+    @JvmOverloads
+    @Suppress("LongParameterList")
+    /**
+     * Queries the content resolver with the given params using the correct API level-dependant syntax.
+     * This is needed in order to use LIMIT or OFFSET from android 11.
+     */
+    fun queryResolver(
+        contentResolver: ContentResolver,
+        uri: Uri,
+        projection: Array<String>,
+        selection: String? = null,
+        cancellationSignal: CancellationSignal? = null,
+        sortColumn: String? = null,
+        sortDirection: String? = null,
+        limit: Int? = null
+    ): Cursor? {
+        require(!(sortColumn != null && sortDirection == null)) {
+            "Sort direction is mandatory if sort column is provided"
+        }
+        require(
+            listOf(null, SORT_DIRECTION_ASCENDING, SORT_DIRECTION_DESCENDING).contains(sortDirection)
+        ) {
+            "Invalid sort direction"
+        }
+        return when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+                val queryArgs = getQueryArgsBundle(selection, sortColumn, sortDirection, limit)
+                contentResolver.query(uri, projection, queryArgs, cancellationSignal)
+            }
+            else -> {
+                val sortOrder = getSortOrderString(sortColumn, sortDirection, limit)
+                contentResolver.query(
+                    uri,
+                    projection,
+                    selection,
+                    null,
+                    sortOrder,
+                    cancellationSignal
+                )
+            }
+        }
+    }
+
+    private fun getSortOrderString(sortColumn: String?, sortDirection: String?, limit: Int?): String {
+        val sortOrderBuilder = StringBuilder()
+        if (sortColumn != null) {
+            sortOrderBuilder.append("$sortColumn $sortDirection")
+        }
+        if (limit != null) {
+            if (sortOrderBuilder.isNotEmpty()) {
+                sortOrderBuilder.append(" ")
+            }
+            sortOrderBuilder.append("LIMIT $limit")
+        }
+        return sortOrderBuilder.toString()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun
+    getQueryArgsBundle(selection: String?, sortColumn: String?, sortDirection: String?, limit: Int?): Bundle {
+        return Bundle().apply {
+            if (selection != null) {
+                putString(ContentResolver.QUERY_ARG_SQL_SELECTION, selection)
+            }
+            if (sortColumn != null) {
+                putString(ContentResolver.QUERY_ARG_SORT_COLUMNS, sortColumn)
+                val direction = when (sortDirection) {
+                    SORT_DIRECTION_ASCENDING -> ContentResolver.QUERY_SORT_DIRECTION_ASCENDING
+                    else -> ContentResolver.QUERY_SORT_DIRECTION_DESCENDING
+                }
+                putInt(ContentResolver.QUERY_ARG_SORT_DIRECTION, direction)
+            }
+            if (limit != null) {
+                putInt(ContentResolver.QUERY_ARG_LIMIT, limit)
+            }
+        }
+    }
+}

src/main/java/com/owncloud/android/datamodel/MediaProvider.java

@@ -54,11 +54,12 @@ public final class MediaProvider {
     private static final String[] FILE_PROJECTION = new String[]{MediaStore.MediaColumns.DATA};
     private static final String IMAGES_FILE_SELECTION = MediaStore.Images.Media.BUCKET_ID + "=";
     private static final String[] IMAGES_FOLDER_PROJECTION = {MediaStore.Images.Media.BUCKET_ID,
-            MediaStore.Images.Media.BUCKET_DISPLAY_NAME};
-    private static final String IMAGES_FOLDER_SORT_ORDER = MediaStore.Images.Media.BUCKET_DISPLAY_NAME + " ASC";
+        MediaStore.Images.Media.BUCKET_DISPLAY_NAME};
+    private static final String IMAGES_FOLDER_SORT_COLUMN = MediaStore.Images.Media.BUCKET_DISPLAY_NAME;
+    private static final String IMAGES_SORT_DIRECTION = ContentResolverHelper.SORT_DIRECTION_ASCENDING;
 
     private static final String[] VIDEOS_FOLDER_PROJECTION = {MediaStore.Video.Media.BUCKET_ID,
-            MediaStore.Video.Media.BUCKET_DISPLAY_NAME};
+        MediaStore.Video.Media.BUCKET_DISPLAY_NAME};
 
     private MediaProvider() {
         // utility class -> private constructor
@@ -80,15 +81,15 @@ public final class MediaProvider {
         Cursor cursorFolders = null;
         if ((activity != null && PermissionUtil.checkSelfPermission(activity.getApplicationContext(),
                 Manifest.permission.WRITE_EXTERNAL_STORAGE)) || getWithoutActivity) {
-            cursorFolders = contentResolver.query(IMAGES_MEDIA_URI, IMAGES_FOLDER_PROJECTION, null, null,
-                    IMAGES_FOLDER_SORT_ORDER);
+            cursorFolders = ContentResolverHelper.queryResolver(contentResolver, IMAGES_MEDIA_URI,
+                                                                IMAGES_FOLDER_PROJECTION, null, null,
+                                                                IMAGES_FOLDER_SORT_COLUMN, IMAGES_SORT_DIRECTION, null);
         }
 
         List<MediaFolder> mediaFolders = new ArrayList<>();
         String dataPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder();
 
         if (cursorFolders != null) {
-            String fileSortOrder = MediaStore.Images.Media.DATE_TAKEN + " DESC LIMIT " + itemLimit;
             Cursor cursorImages;
 
             Map<String, String> uniqueFolders = new HashMap<>();
@@ -111,13 +112,14 @@ public final class MediaProvider {
                 mediaFolder.filePaths = new ArrayList<>();
 
                 // query images
-                cursorImages = contentResolver.query(
-                    IMAGES_MEDIA_URI,
-                    FILE_PROJECTION,
-                    IMAGES_FILE_SELECTION + folder.getKey(),
-                    null,
-                    fileSortOrder
-                );
+                cursorImages = ContentResolverHelper.queryResolver(contentResolver,
+                                                                   IMAGES_MEDIA_URI,
+                                                                   FILE_PROJECTION,
+                                                                   IMAGES_FILE_SELECTION + folder.getKey(),
+                                                                   null,
+                                                                   MediaStore.Images.Media.DATE_TAKEN,
+                                                                   ContentResolverHelper.SORT_DIRECTION_DESCENDING,
+                                                                   itemLimit);
                 Log.d(TAG, "Reading images for " + mediaFolder.folderName);
 
                 if (cursorImages != null) {
@@ -207,7 +209,6 @@ public final class MediaProvider {
         String dataPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder();
 
         if (cursorFolders != null) {
-            String fileSortOrder = MediaStore.Video.Media.DATE_TAKEN + " DESC LIMIT " + itemLimit;
             Cursor cursorVideos;
 
             Map<String, String> uniqueFolders = new HashMap<>();
@@ -229,12 +230,15 @@ public final class MediaProvider {
                 mediaFolder.filePaths = new ArrayList<>();
 
                 // query videos
-                cursorVideos = contentResolver.query(
-                    MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                    FILE_PROJECTION,
-                    MediaStore.Video.Media.BUCKET_ID + "=" + folder.getKey(),
-                    null,
-                    fileSortOrder);
+                cursorVideos = ContentResolverHelper.queryResolver(contentResolver,
+                                                                   MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+                                                                   FILE_PROJECTION,
+                                                                   MediaStore.Video.Media.BUCKET_ID + "=" + folder.getKey(),
+                                                                   null,
+                                                                   MediaStore.Video.Media.DATE_TAKEN,
+                                                                   ContentResolverHelper.SORT_DIRECTION_DESCENDING,
+                                                                   itemLimit);
+
                 Log.d(TAG, "Reading videos for " + mediaFolder.folderName);
 
                 if (cursorVideos != null) {