From 4f5ce5711d41d2ca4a960c6bb19262763007a29e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Dec 2025 17:05:42 +0100
Subject: [PATCH] Remove nullability

---
 .../io/element/android/libraries/qrcode/QRCodeAnalyzer.kt  | 7 +++++--
 .../element/android/libraries/qrcode/QrCodeCameraView.kt   | 7 +------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
index ab2ee2ce7b..e9d43d86a3 100644
--- a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
@@ -15,7 +15,7 @@ import timber.log.Timber
 import zxingcpp.BarcodeReader
 
 internal class QRCodeAnalyzer(
-    private val onScanQrCode: (result: ByteArray?) -> Unit
+    private val onScanQrCode: (data: ByteArray) -> Unit
 ) : ImageAnalysis.Analyzer {
     private val reader by lazy { BarcodeReader() }
 
@@ -23,7 +23,10 @@ internal class QRCodeAnalyzer(
         if (image.format in SUPPORTED_IMAGE_FORMATS) {
             try {
                 val bytes = reader.read(image).firstNotNullOfOrNull { it.bytes }
-                bytes?.let { onScanQrCode(it) }
+                if (bytes != null) {
+                    Timber.d("QR code scanned!")
+                    onScanQrCode(bytes)
+                }
             } catch (e: Exception) {
                 Timber.w(e, "Error decoding QR code")
             } finally {
diff --git a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
index a0d6613a3f..8c7563c5f8 100644
--- a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
@@ -80,12 +80,7 @@ fun QrCodeCameraView(
                 .build()
             imageAnalysis.setAnalyzer(
                 ContextCompat.getMainExecutor(previewView.context),
-                QRCodeAnalyzer { result ->
-                    result?.let {
-                        Timber.d("QR code scanned!")
-                        onScanQrCode(it)
-                    }
-                }
+                QRCodeAnalyzer(onScanQrCode)
             )
             try {
                 // Make sure we unbind all use cases before binding them again