Merge pull request #436 from sora-xor/mwr-923

MWR-923
sora-xor · Oct 10, 2024 · 6bb9def · 6bb9def
2 parents 8ef5079 + a41747a
commit 6bb9def
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
 
     <queries>
         <package android:name="com.soracard.iban.wallet"/>

diff --git a/...va/jp/co/soramitsu/feature_assets_impl/presentation/screens/scan/QRCodeScannerActivity.kt b/...va/jp/co/soramitsu/feature_assets_impl/presentation/screens/scan/QRCodeScannerActivity.kt
@@ -32,14 +32,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.feature_assets_impl.presentation.screens.scan
 
-import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
+import android.net.Uri
 import android.os.Bundle
 import android.view.KeyEvent
 import android.widget.Toast
-import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -68,12 +68,10 @@ class QRCodeScannerActivity : AppCompatActivity() {
 
     private var capture: CaptureManager? = null
 
-    private val startForResultFromGallery: ActivityResultLauncher<Intent> =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                result.data?.data?.let { selectedImageUri ->
-                    viewModel.decodeScannedQrCodeUri(selectedImageUri)
-                }
+    private val startForResultFromGallery: ActivityResultLauncher<PickVisualMediaRequest> =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { resultUri: Uri? ->
+            resultUri?.let { selectedImageUri ->
+                viewModel.decodeScannedQrCodeUri(selectedImageUri)
             }
         }
 
@@ -176,14 +174,8 @@ class QRCodeScannerActivity : AppCompatActivity() {
     }
 
     private fun selectQrFromGallery() {
-        val intent = Intent().apply {
-            type = QR_CODE_IMAGE_TYPE
-            action = Intent.ACTION_GET_CONTENT
-        }
-        startForResultFromGallery.launch(intent)
-    }
-
-    private companion object {
-        const val QR_CODE_IMAGE_TYPE = "image/*"
+        val pickVisualMediaRequest =
+            PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
+        startForResultFromGallery.launch(pickVisualMediaRequest)
     }
 }