From 9fed8689682dacd9382030ce766f210ff479e608 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 22 Feb 2024 16:06:01 +0100
Subject: [PATCH] Merge try blocks.

---
 .../impl/certificates/DefaultUserCertificatesProvider.kt | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt
index 826e09489b..5919952a9a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt
@@ -46,16 +46,11 @@ class DefaultUserCertificatesProvider @Inject constructor() : UserCertificatesPr
             Timber.w(e, "Failed to get AndroidCAStore keystore")
             return emptyList()
         }
-        try {
-            keyStore.load(null)
-        } catch (e: Exception) {
-            Timber.w(e, "Failed to load AndroidCAStore keystore")
-            return emptyList()
-        }
         val aliases = try {
+            keyStore.load(null)
             keyStore.aliases()
         } catch (e: Exception) {
-            Timber.w(e, "Failed to get aliases from AndroidCAStore keystore")
+            Timber.w(e, "Failed to load and get aliases AndroidCAStore keystore")
             return emptyList()
         }
         return aliases.toList()