Handle offline issue in UserSessionsDataProvider

element-hq · May 29, 2023 · 7275a49 · 7275a49
1 parent 94d19d4
commit 7275a49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...odules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsDataProvider.swift b/...odules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsDataProvider.swift
@@ -57,8 +57,17 @@ class UserSessionsDataProvider: UserSessionsDataProviderProtocol {
         guard let deviceInfo = deviceInfo else {
             return .permanentlyUnverified
         }
-
-        guard session.crypto?.crossSigning.canCrossSign == true else {
+
+        // When the app is launched offline the cross signing state is "notBootstrapped"
+        // In this edge case the verification state returned is `.unknown` since we cannot say more even for the current session.
+        guard
+            let crossSigning = session.crypto?.crossSigning,
+            crossSigning.state.rawValue > MXCrossSigningState.notBootstrapped.rawValue
+        else {
+            return .unknown
+        }
+
+        guard crossSigning.canCrossSign else {
             return deviceInfo.deviceId == session.myDeviceId ? .unverified : .unknown
         }
 

diff --git a/RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift b/RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift
@@ -35,6 +35,7 @@ struct UserSessionsOverview: View {
                 otherSessionsSection
             }
         }
+        .disabled(viewModel.viewState.showLoadingIndicator)
         .background(theme.colors.system.ignoresSafeArea())
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .navigationTitle(VectorL10n.userSessionsOverviewTitle)