commit b53fda3f6d4fd6d7a8539320a9d4603e5faaa1c7
author LuK1337 <priv.luk@gmail.com> Sat Aug 13 13:19:43 2022 +0200
committer LuK1337 <priv.luk@gmail.com> Thu Sep 29 22:28:28 2022 +0200
tree ea4fa2171d678202724deb5d7c844aeb748130dd
parent 5b5a80d2acd0e9c52f625fd4ad2443789f5f0cb3

Aperture: Run whole updateGalleryButton() on UI thread

Fixes crash when uri is null.

Change-Id: Ib3ee3ba7fd096399ad94919d6bb21ed67f6229fb

app/src/main/java/org/lineageos/aperture/MainActivity.kt

diff --git a/app/src/main/java/org/lineageos/aperture/MainActivity.kt b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
index e9cabc1..98bcb53 100644
--- a/app/src/main/java/org/lineageos/aperture/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
@@ -811,19 +811,19 @@
     }
 
     private fun updateGalleryButton(uri: Uri?, enable: Boolean = true) {
-        if (uri != null && enable) {
-            getThumbnail(uri)?.let {
-                runOnUiThread {
+        runOnUiThread {
+            if (uri != null && enable) {
+                getThumbnail(uri)?.let {
                     galleryButton.setPadding(0)
                     galleryButton.setImageBitmap(it)
                 }
+            } else if (keyguardManager.isKeyguardLocked) {
+                galleryButton.setPadding(convertDpToPx(15))
+                galleryButton.setImageResource(R.drawable.ic_lock)
+            } else {
+                galleryButton.setPadding(convertDpToPx(15))
+                galleryButton.setImageResource(R.drawable.ic_image)
             }
-        } else if (keyguardManager.isKeyguardLocked) {
-            galleryButton.setPadding(convertDpToPx(15))
-            galleryButton.setImageResource(R.drawable.ic_lock)
-        } else {
-            galleryButton.setPadding(convertDpToPx(15))
-            galleryButton.setImageResource(R.drawable.ic_image)
         }
     }