Update the SDK.

Handles changes that removed support for the sliding sync proxy.

ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift

@@ -36,8 +36,6 @@ enum HomeScreenViewAction {
     case confirmRecoveryKey
     case resetEncryption
     case skipRecoveryKeyConfirmation
-    case confirmSlidingSyncUpgrade
-    case skipSlidingSyncUpgrade
     case updateVisibleItemRange(Range<Int>)
     case globalSearch
     case markRoomAsUnread(roomIdentifier: String)
@@ -86,17 +84,12 @@ enum HomeScreenSecurityBannerMode: Equatable {
     }
 }
 
-enum HomeScreenMigrationBannerMode {
-    case none, show, dismissed
-}
-
 struct HomeScreenViewState: BindableState {
     let userID: String
     var userDisplayName: String?
     var userAvatarURL: URL?
     
     var securityBannerMode = HomeScreenSecurityBannerMode.none
-    var slidingSyncMigrationBannerMode = HomeScreenMigrationBannerMode.none
     
     var requiresExtraAccountSetup = false
         

ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift

@@ -145,11 +145,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             actionsSubject.send(.presentEncryptionResetScreen)
         case .skipRecoveryKeyConfirmation:
             state.securityBannerMode = .dismissed
-        case .confirmSlidingSyncUpgrade:
-            appSettings.slidingSyncDiscovery = .native
-            actionsSubject.send(.logout)
-        case .skipSlidingSyncUpgrade:
-            state.slidingSyncMigrationBannerMode = .dismissed
         case .updateVisibleItemRange(let range):
             roomSummaryProvider?.updateVisibleRange(range)
         case .startChat:
@@ -307,30 +302,18 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
     /// Check whether we can inform the user about potential migrations
     /// or have him logout as his proxy is no longer available
     private func checkSlidingSyncMigration() async {
-        // Not logged in with a proxy, don't need to do anything
-        guard userSession.clientProxy.slidingSyncVersion.isProxy else {
+        guard userSession.clientProxy.needsSlidingSyncMigration else {
             return
         }
         
-        let versions = await userSession.clientProxy.availableSlidingSyncVersions
-        
-        // Native not available, nothing we can do
-        guard versions.contains(.native) else {
-            return
-        }
-        
-        if versions.contains(where: \.isProxy) { // Both available, prompt for migration
-            state.slidingSyncMigrationBannerMode = .show
-        } else { // The proxy has been removed and logout is needed
-            // Delay setting the alert otherwise it automatically gets dismissed. Same as the crashed last run one
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                self.state.bindings.alertInfo = AlertInfo(id: UUID(),
-                                                          title: L10n.bannerMigrateToNativeSlidingSyncForceLogoutTitle,
-                                                          primaryButton: .init(title: L10n.bannerMigrateToNativeSlidingSyncAction) { [weak self] in
-                                                              self?.appSettings.slidingSyncDiscovery = .native
-                                                              self?.actionsSubject.send(.logoutWithoutConfirmation)
-                                                          })
-            }
+        // The proxy is no longer supported so a logout is needed.
+        // Delay setting the alert otherwise it automatically gets dismissed. Same as the crashed last run one
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            self.state.bindings.alertInfo = AlertInfo(id: UUID(),
+                                                      title: L10n.bannerMigrateToNativeSlidingSyncAppForceLogoutTitle,
+                                                      primaryButton: .init(title: L10n.bannerMigrateToNativeSlidingSyncAction) { [weak self] in
+                                                          self?.actionsSubject.send(.logoutWithoutConfirmation)
+                                                      })
         }
     }
     
@@ -460,14 +443,3 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
                                          message: L10n.errorUnknown)
     }
 }
-
-extension SlidingSyncVersion {
-    var isProxy: Bool {
-        switch self {
-        case .proxy:
-            return true
-        default:
-            return false
-        }
-    }
-}

ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift

@@ -119,17 +119,13 @@ struct HomeScreenContent: View {
     @ViewBuilder
     private var topSection: some View {
         // An empty VStack causes glitches within the room list
-        if context.viewState.shouldShowFilters ||
-            context.viewState.securityBannerMode.isShown ||
-            context.viewState.slidingSyncMigrationBannerMode == .show {
+        if context.viewState.shouldShowFilters || context.viewState.securityBannerMode.isShown {
             VStack(spacing: 0) {
                 if context.viewState.shouldShowFilters {
                     RoomListFiltersView(state: $context.filtersState)
                 }
             
-                if context.viewState.slidingSyncMigrationBannerMode == .show {
-                    HomeScreenSlidingSyncMigrationBanner(context: context)
-                } else if case let .show(state) = context.viewState.securityBannerMode {
+                if case let .show(state) = context.viewState.securityBannerMode {
                     HomeScreenRecoveryKeyConfirmationBanner(state: state, context: context)
                 }
             }

ElementX/Sources/Screens/HomeScreen/View/HomeScreenSlidingSyncMigrationBanner.swift

@@ -1,68 +0,0 @@
-//
-// Copyright 2024 New Vector Ltd.
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-// Please see LICENSE files in the repository root for full details.
-//
-
-import Combine
-import SwiftUI
-
-struct HomeScreenSlidingSyncMigrationBanner: View {
-    var context: HomeScreenViewModel.Context
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 16) {
-            VStack(alignment: .leading, spacing: 4) {
-                HStack(spacing: 16) {
-                    Text(L10n.bannerMigrateToNativeSlidingSyncTitle)
-                        .font(.compound.bodyLGSemibold)
-                        .foregroundColor(.compound.textPrimary)
-                    
-                    Spacer()
-                    
-                    Button {
-                        context.send(viewAction: .skipSlidingSyncUpgrade)
-                    } label: {
-                        Image(systemName: "xmark")
-                            .foregroundColor(.compound.iconSecondary)
-                            .frame(width: 12, height: 12)
-                    }
-                }
-                Text(L10n.bannerMigrateToNativeSlidingSyncDescription)
-                    .font(.compound.bodyMD)
-                    .foregroundColor(.compound.textSecondary)
-            }
-            
-            Button(L10n.bannerMigrateToNativeSlidingSyncAction) {
-                context.send(viewAction: .confirmSlidingSyncUpgrade)
-            }
-            .frame(maxWidth: .infinity)
-            .buttonStyle(.compound(.primary, size: .medium))
-        }
-        .padding(16)
-        .background(Color.compound.bgSubtleSecondary)
-        .cornerRadius(14)
-        .padding(.horizontal, 16)
-    }
-}
-
-struct HomeScreenSlidingSyncMigrationBanner_Previews: PreviewProvider, TestablePreview {
-    static let viewModel = buildViewModel()
-    
-    static var previews: some View {
-        HomeScreenSlidingSyncMigrationBanner(context: viewModel.context)
-    }
-    
-    static func buildViewModel() -> HomeScreenViewModel {
-        let clientProxy = ClientProxyMock(.init())
-        
-        let userSession = UserSessionMock(.init(clientProxy: clientProxy))
-        
-        return HomeScreenViewModel(userSession: userSession,
-                                   analyticsService: ServiceLocator.shared.analytics,
-                                   appSettings: ServiceLocator.shared.settings,
-                                   selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
-                                   userIndicatorController: ServiceLocator.shared.userIndicatorController)
-    }
-}