From 1e6878205622c0110b862870b827f0f2b4bd5ec8 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 22 Aug 2022 12:24:12 +0800
Subject: [PATCH] Use Tiramisu's imageselector

---
 .../com/hippo/ehviewer/ui/scene/GalleryListScene.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index c16be6a19..80fcc0769 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -40,6 +40,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.PickVisualMediaRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
@@ -151,8 +152,8 @@ public final class GalleryListScene extends BaseScene
     private EasyRecyclerView mRecyclerView;
     @Nullable
     private SearchLayout mSearchLayout;
-    ActivityResultLauncher<String[]> selectImageLauncher = registerForActivityResult(
-            new ActivityResultContracts.OpenDocument(),
+    ActivityResultLauncher<PickVisualMediaRequest> selectImageLauncher = registerForActivityResult(
+            new ActivityResultContracts.PickVisualMedia(),
             result -> mSearchLayout.setImageUri(result));
     @Nullable
     private SearchBar mSearchBar;
@@ -1334,7 +1335,9 @@ public final class GalleryListScene extends BaseScene
     @Override
     public void onSelectImage() {
         try {
-            selectImageLauncher.launch(new String[]{"image/*"});
+            PickVisualMediaRequest.Builder builder = new PickVisualMediaRequest.Builder();
+            builder.setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE);
+            selectImageLauncher.launch(builder.build());
         } catch (Throwable e) {
             ExceptionUtils.throwIfFatal(e);
             showTip(R.string.error_cant_find_activity, BaseScene.LENGTH_SHORT);