From d7f2bbe2f94b3cbe2e2f1036fa17477e464d1d80 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Sat, 30 May 2020 13:22:34 +0200
Subject: [PATCH] smoothen out some stuffs

---
 lib/src/utils/device_keys_list.dart | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/src/utils/device_keys_list.dart b/lib/src/utils/device_keys_list.dart
index 211e2a3..79e4c63 100644
--- a/lib/src/utils/device_keys_list.dart
+++ b/lib/src/utils/device_keys_list.dart
@@ -30,7 +30,7 @@ class DeviceKeysList {
   }
 
   CrossSigningKey getCrossSigningKey(String type) =>
-      crossSigningKeys.values.firstWhere((k) => k.usage.contains(type));
+      crossSigningKeys.values.firstWhere((k) => k.usage.contains(type), orElse: () => null);
 
   CrossSigningKey get masterKey => getCrossSigningKey('master');
   CrossSigningKey get selfSigningKey => getCrossSigningKey('self_signing');
@@ -144,17 +144,7 @@ abstract class SignedKey {
 
   bool get directVerified => _verified;
 
-  bool get crossVerified {
-    try {
-      return hasValidSignatureChain();
-    } catch (err, stacktrace) {
-      print(
-          '[Cross Signing] Error during trying to determine signature chain: ' +
-              err.toString());
-      print(stacktrace);
-      return false;
-    }
-  }
+  bool get crossVerified => hasValidSignatureChain();
 
   bool get signed => hasValidSignatureChain(verifiedOnly: false);