diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 833d27851..61c3c193e 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -112,7 +112,7 @@ "location" : "https://github.com/matrix-org/matrix-rust-components-swift", "state" : { "revision" : "9650501c92a1ed802a757f2c6807a36d59619f43", - "version" : "1.0.49-alpha" + "version" : "1.0.50-alpha" } }, { @@ -163,7 +163,7 @@ { "identity" : "swift-snapshot-testing", "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git", + "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { "revision" : "cef5b3f6f11781dd4591bdd1dd0a3d22bd609334", "version" : "1.11.0" diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift index 82aca42cd..27ace8f30 100644 --- a/ElementX/Sources/Application/AppCoordinator.swift +++ b/ElementX/Sources/Application/AppCoordinator.swift @@ -136,11 +136,9 @@ class AppCoordinator: AppCoordinatorProtocol { private func performMigrationsIfNecessary(from oldVersion: Version, to newVersion: Version) { guard oldVersion != newVersion else { return } - if oldVersion < Version(1, 0, 20) { - // Version 1.0.20 introduced a new format for restoration tokens. - // Remove user data to prevent conflict in the crypto store - // with the newly generated device ID when signing in again. - MXLog.warning("Clearing user data for hardcoded proxy.") + if oldVersion < Version(1, 1, 0) { + // Version 1.1.0 switched the Rust crypto store to SQLite + // There are no migrations in place so we need to reset everything wipeUserData() } } diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift index b6a96947f..122f994a1 100644 --- a/ElementX/Sources/Application/AppSettings.swift +++ b/ElementX/Sources/Application/AppSettings.swift @@ -36,6 +36,7 @@ final class AppSettings: ObservableObject { private static var store: UserDefaults! = UserDefaults(suiteName: suiteName) static func reset() { + MXLog.warning("Resetting the AppSettings.") store.removePersistentDomain(forName: suiteName) } diff --git a/ElementX/Sources/Services/Keychain/KeychainController.swift b/ElementX/Sources/Services/Keychain/KeychainController.swift index 98808b491..8d773dea4 100644 --- a/ElementX/Sources/Services/Keychain/KeychainController.swift +++ b/ElementX/Sources/Services/Keychain/KeychainController.swift @@ -68,6 +68,8 @@ class KeychainController: KeychainControllerProtocol { } func removeRestorationTokenForUsername(_ username: String) { + MXLog.warning("Removing restoration token for user: \(username).") + do { try keychain.remove(username) } catch { @@ -76,6 +78,8 @@ class KeychainController: KeychainControllerProtocol { } func removeAllRestorationTokens() { + MXLog.warning("Removing all user restoration tokens.") + do { try keychain.removeAll() } catch { diff --git a/ElementX/Sources/Services/UserSession/UserSessionStore.swift b/ElementX/Sources/Services/UserSession/UserSessionStore.swift index 1a6b00cc5..d9c8d95f7 100644 --- a/ElementX/Sources/Services/UserSession/UserSessionStore.swift +++ b/ElementX/Sources/Services/UserSession/UserSessionStore.swift @@ -38,6 +38,7 @@ class UserSessionStore: UserSessionStoreProtocol { /// Deletes all data stored in the shared container and keychain func reset() { + MXLog.warning("Resetting the UserSessionStore. All accounts will be affected.") try? FileManager.default.removeItem(at: baseDirectory) keychainController.removeAllRestorationTokens() } diff --git a/project.yml b/project.yml index 2ab38d544..a414a3753 100644 --- a/project.yml +++ b/project.yml @@ -27,7 +27,7 @@ settings: APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER) BASE_BUNDLE_IDENTIFIER: io.element.elementx KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER) - MARKETING_VERSION: 1.0.25 + MARKETING_VERSION: 1.1.0 CURRENT_PROJECT_VERSION: 1 DEVELOPMENT_TEAM: 7J4U792NQT @@ -42,7 +42,7 @@ include: packages: MatrixRustSDK: url: https://github.com/matrix-org/matrix-rust-components-swift - exactVersion: 1.0.49-alpha + exactVersion: 1.0.50-alpha # path: ../matrix-rust-sdk DesignKit: path: DesignKit