commit fb2fb35587b5851ab8f347f8eab2e55b18051be8
author Sebastiano Barezzi <seba@sebaubuntu.dev> Fri Mar 01 23:49:55 2024 +0100
committer Sebastiano Barezzi <seba@sebaubuntu.dev> Sat Mar 02 00:31:31 2024 +0100
tree c0c99ce6da27a1af30664efa567f1057c4ea0433
parent e90283e76e21f2768a9d2010e67b65f7bfbe84ba

Aperture: QrImageAnalyzer: Fix views interaction on background thread

Change-Id: I962d6cd4589d4f33b29734f8eef6ae45600e464a

app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt

diff --git a/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt b/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
index 2c79aff..4c7ad64 100644
--- a/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
+++ b/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
@@ -136,10 +136,7 @@
                     bottomSheetDialogCardView.contentDescription = contentDescription
                     bottomSheetDialogData.movementMethod = null
                     bottomSheetDialogTitle.text = title
-                    scope.launch(Dispatchers.IO) {
-                        val drawable = icon.loadDrawable(activity)!!
-                        bottomSheetDialogIcon.setImageDrawable(drawable)
-                    }
+                    bottomSheetDialogIcon.setImageIcon(icon)
                 }
                 for (action in textClassification.actions.drop(1)) {
                     bottomSheetDialogActionsLayout.addView(inflateButton().apply {
@@ -156,12 +153,14 @@
                         }
                         contentDescription = action.contentDescription
                         this.text = action.title
-                        scope.launch(Dispatchers.IO) {
+                        withContext(Dispatchers.IO) {
                             val drawable = action.icon.loadDrawable(activity)!!
                             drawable.setBounds(0, 0, 15.px, 15.px)
-                            setCompoundDrawables(
-                                drawable, null, null, null
-                            )
+                            withContext(Dispatchers.Main) {
+                                setCompoundDrawables(
+                                    drawable, null, null, null
+                                )
+                            }
                         }
                     })
                 }