From 9c5c58794b8c594c8ea71a251baa2ff9d89f1fd6 Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Thu, 27 Jun 2024 16:12:38 -0400 Subject: [PATCH] Fix invalid qr code crash. --- .../thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt index 093a1fe8be..5ca5afc81e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt @@ -81,6 +81,10 @@ object LinkDeviceRepository { } fun isValidQr(uri: Uri): Boolean { + if (!uri.isHierarchical) { + return false + } + val ephemeralId: String? = uri.getQueryParameter("uuid") val publicKeyEncoded: String? = uri.getQueryParameter("pub_key") return ephemeralId.isNotNullOrBlank() && publicKeyEncoded.isNotNullOrBlank()