Merge branch 'release/tchap_v2.0.3'

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.0.2
+MARKETING_VERSION = 2.0.3
 CURRENT_PROJECT_VERSION = 1

Riot/Modules/Application/AppCoordinator.swift

@@ -201,7 +201,15 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         self.splitViewCoordinator = splitViewCoordinator
 
         // Tchap: Add expired account management
+        self.registerAllNotifications()
+    }
+
+    // Tchap: Add expired account management
+    private func registerAllNotifications() {
         self.registerTrackedServerErrorNotification()
+        self.registerLogoutNotification()
+        self.registerDidCorruptDataNotification()
+        self.registerIgnoredUsersDidChangeNotification()
     }
 
     private func addSideMenu() {
@@ -313,6 +321,22 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name.legacyAppDelegateDidLogout, object: nil)
     }
 
+    private func registerIgnoredUsersDidChangeNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadSessionAndClearCache), name: NSNotification.Name.mxSessionIgnoredUsersDidChange, object: nil)
+    }
+
+    private func unregisterIgnoredUsersDidChangeNotification() {
+        NotificationCenter.default.removeObserver(self, name: NSNotification.Name.mxSessionIgnoredUsersDidChange, object: nil)
+    }
+
+    private func registerDidCorruptDataNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadSessionAndClearCache), name: NSNotification.Name.mxSessionDidCorruptData, object: nil)
+    }
+
+    private func unregisterDidCorruptDataNotification() {
+        NotificationCenter.default.removeObserver(self, name: NSNotification.Name.mxSessionDidCorruptData, object: nil)
+    }
+
     @objc private func handleTrackedServerError(notification: Notification) {
         guard let error = notification.userInfo?[kMXHTTPClientMatrixErrorNotificationErrorKey] as? MXError else {
             return
@@ -403,6 +427,8 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
 
     private func reloadSession(clearCache: Bool) {
         self.unregisterLogoutNotification()
+        self.unregisterIgnoredUsersDidChangeNotification()
+        self.unregisterDidCorruptDataNotification()
         self.unregisterTrackedServerErrorNotification()
 
         if let accounts = MXKAccountManager.shared().activeAccounts, !accounts.isEmpty {
@@ -422,14 +448,22 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
             }
         }
 
-        self.showSplitView()
+        self.navigate(to: .homeSpace)
+        self.registerAllNotifications()
     }
 
     @objc private func userDidLogout() {
         self.unregisterLogoutNotification()
+        self.unregisterIgnoredUsersDidChangeNotification()
+        self.unregisterDidCorruptDataNotification()
         self.unregisterTrackedServerErrorNotification()
     }
 
+    @objc private func reloadSessionAndClearCache() {
+        // Reload entirely the app
+        self.reloadSession(clearCache: true)
+    }
+
     private func showError(_ error: Error) {
         // FIXME: Present an error on coordinator.toPresentable()
         AppDelegate.theDelegate().showError(asAlert: error)

Riot/Modules/TabBar/TabBarCoordinator.swift

@@ -397,15 +397,15 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
 
     // FIXME: Should be displayed from a tab.
     private func showContactDetails(with contact: MXKContact, presentationParameters: ScreenPresentationParameters) {
-//
-//        let coordinatorParameters = ContactDetailsCoordinatorParameters(contact: contact)
-//        let coordinator = ContactDetailsCoordinator(parameters: coordinatorParameters)
-//        coordinator.start()
-//        self.add(childCoordinator: coordinator)
-//
-//        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
-//            self?.remove(childCoordinator: coordinator)
-//        }
+
+        let coordinatorParameters = ContactDetailsCoordinatorParameters(contact: contact)
+        let coordinator = ContactDetailsCoordinator(parameters: coordinatorParameters)
+        coordinator.start()
+        self.add(childCoordinator: coordinator)
+
+        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
+            self?.remove(childCoordinator: coordinator)
+        }
     }
 
     // FIXME: Should be displayed from a tab.
@@ -516,7 +516,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
 
         self.add(childCoordinator: roomPreviewCoordinator)
 
-        self.navigationRouter.push(roomPreviewCoordinator, animated: true) { [weak self] in
+        self.showSplitViewDetails(with: roomPreviewCoordinator, stackedOnSplitViewDetail: false) { [weak self] in
             self?.remove(childCoordinator: roomPreviewCoordinator)
         }
     }

TCHAP_CHANGES.md

@@ -1,3 +1,12 @@
+## Changes in 2.0.3 (2022-07-13)
+
+🐛 Bugfixes
+
+- On reply messages, redirection to user card doesn't work when tapping on user's name ([#596](https://github.com/tchapgouv/tchap-ios/issues/596))
+- Fix SplitView issue when joining a forum on iPad ([#598](https://github.com/tchapgouv/tchap-ios/issues/598))
+- Application is frozen after renewing the account ([#615](https://github.com/tchapgouv/tchap-ios/issues/615))
+
+
 ## Changes in 2.0.2 (2022-06-30)
 
 ✨ Features

towncrier.toml

@@ -1,6 +1,6 @@
 [tool.towncrier]
 name = "Changes in"
-version = "2.0.2"
+version = "2.0.3"
 filename = "TCHAP_CHANGES.md"
 directory = "changelog.d"
 template = "changelog.d/_template.md.jinja"