diff --git a/Podfile b/Podfile index f27057546..13516d6d6 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.15.0-RC02' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.15.0-RC03' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift index b0b657bfe..cebaf0abb 100644 --- a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift +++ b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift @@ -143,15 +143,7 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol { } func pinUnlocked() { - checkMaintenanceStatus() - enableMaintenanceTimer(true) - - self.bwiCheckForMatomoPromt() - BWIAnalytics.sharedTracker.readUserConfig() - - if BWIBuildSettings.shared.bwiPersonalNotesRoom { - self.bwiCheckForPersonalNotesRoom() - } + onBWIAppStart() } func bwiOnUnlockedByPin() { @@ -765,6 +757,21 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol { maintenanceTimer = Timer.scheduledTimer(timeInterval: 10.0, target: self, selector: #selector(checkMaintenanceStatus), userInfo: nil, repeats: true) } } + + private func onBWIAppStart() { + checkMaintenanceStatus() + enableMaintenanceTimer(true) + + self.bwiCheckForMatomoPromt() + BWIAnalytics.sharedTracker.readUserConfig() + + if BWIBuildSettings.shared.bwiPersonalNotesRoom { + self.bwiCheckForPersonalNotesRoom() + } + + // bwi #4478: refresh wellknown a bit more often + self.currentMatrixSession?.refreshHomeserverWellknown(false, success: nil, failure: nil) + } } extension AllChatsCoordinator: SignOutFlowPresenterDelegate { @@ -788,15 +795,7 @@ extension AllChatsCoordinator: AllChatsViewControllerDelegate { func allChatsViewControllerDidCompleteAuthentication(_ allChatsViewController: AllChatsViewController) { self.delegate?.splitViewMasterCoordinatorDidCompleteAuthentication(self) - checkMaintenanceStatus() - enableMaintenanceTimer(true) - - self.bwiCheckForMatomoPromt() - BWIAnalytics.sharedTracker.resetMatomo() - - if BWIBuildSettings.shared.bwiPersonalNotesRoom { - self.bwiCheckForPersonalNotesRoom() - } + onBWIAppStart() } func allChatsViewController(_ allChatsViewController: AllChatsViewController, didSelectRoomWithParameters roomNavigationParameters: RoomNavigationParameters, completion: @escaping () -> Void) { diff --git a/RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/AuthenticationService.swift b/RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/AuthenticationService.swift index 5802166bb..94e185d07 100644 --- a/RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/AuthenticationService.swift +++ b/RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/AuthenticationService.swift @@ -236,6 +236,7 @@ class AuthenticationService: NSObject { var identityServerURL: URL? + // FRROT wellknown call for identity server after server selection if let wellKnown = try? await wellKnown(for: homeserverURL) { self.wellknown = wellKnown