Fix picture attachment picker for Android 13

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 8 insertions, 7 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9c2f4f36..e8e3ae6e5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java
index a2ea6dd37..ab05e1c2e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java
@@ -1,5 +1,10 @@
 package it.niedermann.nextcloud.deck.ui.card.attachments.picker;
 
+import static android.database.Cursor.FIELD_TYPE_INTEGER;
+import static android.database.Cursor.FIELD_TYPE_NULL;
+import static androidx.recyclerview.widget.RecyclerView.NO_ID;
+import static java.util.Objects.requireNonNull;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -16,11 +21,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
 
-import static android.database.Cursor.FIELD_TYPE_INTEGER;
-import static android.database.Cursor.FIELD_TYPE_NULL;
-import static androidx.recyclerview.widget.RecyclerView.NO_ID;
-import static java.util.Objects.requireNonNull;
-
 /**
  * An {@link RecyclerView.Adapter} which provides previews of one type of files and also an option to open a native dialog.
  * <p>
@@ -45,7 +45,7 @@ public abstract class AbstractCursorPickerAdapter<T extends RecyclerView.ViewHol
      * This must only be one {@link Thread} because otherwise the cursor might change while fetching data from it.
      */
     @NonNull
-    protected final ExecutorService bindExecutor = Executors.newFixedThreadPool(1);
+    protected final ExecutorService bindExecutor = Executors.newSingleThreadExecutor();
 
     public AbstractCursorPickerAdapter(@NonNull Context context, @NonNull BiConsumer<Uri, Pair<String, RequestBuilder<?>>> onSelect, @NonNull Runnable openNativePicker, Uri subject, String idColumn, String sortOrder) {
         this(context, onSelect, openNativePicker, subject, idColumn, new String[]{idColumn}, sortOrder);