Prevent throw for second thread call

home-assistant · Dec 7, 2023 · 90b4ffd · 90b4ffd
1 parent 738c6ac
commit 90b4ffd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Sources/App/ThreadCredentialsSharing/ThreadClientService.swift b/Sources/App/ThreadCredentialsSharing/ThreadClientService.swift
@@ -33,7 +33,8 @@ final class ThreadClientService: THClientProtocol {
         let preferredCredential = try await client.preferredCredentials()
 
         // All credentials retrieve the rest of the credentials after user acceps permission dialog
-        var allCredentials = try await client.allCredentials()
+        // This call may fail, but we don't want to throw error since preferredCredential succeeded
+        var allCredentials: Set<THCredentials> = (try? await client.allCredentials()) ?? []
         allCredentials = allCredentials.filter { $0.borderAgentID != preferredCredential.borderAgentID }
         allCredentials.insert(preferredCredential)
 

diff --git a/Sources/App/ThreadCredentialsSharing/ThreadCredentialsSharingViewModel.swift b/Sources/App/ThreadCredentialsSharing/ThreadCredentialsSharingViewModel.swift
@@ -27,7 +27,7 @@ final class ThreadCredentialsSharingViewModel: ObservableObject {
         showLoader = true
         do {
             credentials = try await threadClient.retrieveAllCredentials()
-        } catch {
+        } catch let error {
             showAlert(type: .error(title: L10n.errorLabel, message: "Error message: \(error.localizedDescription)"))
         }
         showLoader = false