Merge branch 'develop' into feat/define-default-protocol-WPB-14667

WireAPI/Sources/WireAPI/APIs/UpdateEventsAPI/Responses/UpdateEventEnvelopeV0.swift

@@ -18,7 +18,9 @@
 
 import Foundation
 
-struct UpdateEventEnvelopeV0: Decodable, ToAPIModelConvertible {
+// TODO: [WPB-9612] make internal
+// This is public for testing purposes.
+public struct UpdateEventEnvelopeV0: Decodable, ToAPIModelConvertible {
 
     let id: UUID
     let payload: [UpdateEventDecodingProxy]?

wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift

@@ -31,7 +31,7 @@ extension ZMOperationLoop: ZMPushChannelConsumer {
             // fix it. Once we're sure it works, we should remove this.
             do {
                 let decoder = JSONDecoder.defaultDecoder
-                _ = try decoder.decode(UpdateEventEnvelope.self, from: data)
+                _ = try decoder.decode(UpdateEventEnvelopeV0.self, from: data)
             } catch {
                 WireLogger.updateEvent.error("failed to decode 'UpdateEventEnvelope': \(error)")
             }

wire-ios-sync-engine/Source/UserSession/SyncStatus.swift

@@ -120,6 +120,7 @@ public class SyncStatus: NSObject, SyncStatusProtocol, SyncProgress {
         ZMUser.selfUser(in: managedObjectContext).needsPropertiesUpdate = true
         // Reset the status.
         currentSyncPhase = SyncPhase.fetchingLastUpdateEventID
+        RequestAvailableNotification.notifyNewRequestsAvailable(nil)
         log("slow sync")
         syncStateDelegate?.didStartSlowSync()
     }
@@ -130,6 +131,7 @@ public class SyncStatus: NSObject, SyncStatusProtocol, SyncProgress {
         ZMUser.selfUser(in: managedObjectContext).needsPropertiesUpdate = true
         // Set the status.
         currentSyncPhase = SyncPhase.fetchingLastUpdateEventID.nextPhase
+        RequestAvailableNotification.notifyNewRequestsAvailable(nil)
         log("resyncResources")
         syncStateDelegate?.didStartSlowSync()
     }

wire-ios/Wire-iOS UnitTests/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModelTests.swift

@@ -27,7 +27,7 @@ final class DeveloperDebugActionsViewModelTests: XCTestCase {
 
         // when
         // then
-        XCTAssertEqual(viewModel.buttons.count, 6)
+        XCTAssertEqual(viewModel.buttons.count, 8)
     }
 
     // MARK: - Helpers

wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift

@@ -28,6 +28,8 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
 
     private let selfClient: UserClient?
 
+    private let logger = WireLogger(tag: "developer")
+
     // MARK: - Initialize
 
     init(selfClient: UserClient?) {
@@ -40,10 +42,12 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
         buttons = [
             .init(title: "Send debug logs", action: sendDebugLogs),
             .init(title: "Perform quick sync", action: performQuickSync),
+            .init(title: "Resync resources", action: resyncResources),
             .init(title: "Break next quick sync", action: breakNextQuickSync),
             .init(title: "Update Conversation to mixed protocol", action: updateConversationProtocolToMixed),
             .init(title: "Update Conversation to MLS protocol", action: updateConversationProtocolToMLS),
-            .init(title: "Update MLS migration status", action: updateMLSMigrationStatus)
+            .init(title: "Update MLS migration status", action: updateMLSMigrationStatus),
+            .init(title: "Delete domains in the database", action: deleteDomains)
         ]
     }
 
@@ -88,6 +92,12 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
         }
     }
 
+    // MARK: Resync resources
+
+    private func resyncResources() {
+        DebugActions.triggerResyncResources()
+    }
+
     // MARK: Proteus to MLS migration
 
     private func updateMLSMigrationStatus() {
@@ -159,4 +169,37 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
         }
     }
 
+    // MARK: Delete domains
+
+    private func deleteDomains() {
+        guard let syncContext = userSession?.syncContext else {
+            logger.error("failed to delete domains: no sync context")
+            return
+        }
+
+        syncContext.perform { [logger] in
+            do {
+                logger.debug("deleted domains of users...")
+                let users = try syncContext.fetch(NSFetchRequest<ZMUser>(entityName: ZMUser.entityName()))
+
+                for user in users where !user.isSelfUser {
+                    user.domain = nil
+                }
+
+                logger.debug("deleted domains of conversations...")
+                let conversations = try syncContext.fetch(NSFetchRequest<ZMConversation>(entityName: ZMConversation.entityName()))
+
+                for conversation in conversations where conversation.conversationType.isOne(of: .oneOnOne, .group) {
+                    conversation.domain = nil
+                }
+
+                try syncContext.save()
+                logger.debug("successfully deleted domains")
+
+            } catch {
+                logger.error("failed to delete domains: \(error.localizedDescription)")
+            }
+        }
+    }
+
 }

wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Developer.swift

@@ -128,7 +128,7 @@ extension SettingsCellDescriptorFactory {
             Button(
                 title: "Trigger resyncResources",
                 isDestructive: false,
-                selectAction: DebugActions.triggerResyncResources
+                selectAction: { _ in DebugActions.triggerResyncResources() }
             )
         )
 

wire-ios/Wire-iOS/Sources/UserInterface/Settings/DebugActions.swift

@@ -145,7 +145,7 @@ enum DebugActions {
         sendNext(count: 0)
     }
 
-    static func triggerResyncResources(_ type: any SettingsCellDescriptorType) {
+    static func triggerResyncResources() {
         ZMUserSession.shared()?.syncManagedObjectContext.performGroupedBlock {
             ZMUserSession.shared()?.requestResyncResources()
         }
@@ -242,8 +242,10 @@ enum DebugActions {
             switch command {
             case .repairInvalidAccessRoles:
                 DebugActions.updateInvalidAccessRoles()
-            }
 
+            case .resyncResources:
+                DebugActions.triggerResyncResources()
+            }
         }
     }
 

wire-ios/Wire-iOS/Sources/UserInterface/Settings/DebugCommand.swift

@@ -20,15 +20,26 @@ import Foundation
 
 enum DebugCommand {
 
-    /// Update accessRoles for existing conversations where the team is nil and accessRoles == [.teamMember]
+    /// Update accessRoles for existing conversations where the
+    /// team is nil and accessRoles == [.teamMember]
+
     case repairInvalidAccessRoles
 
+    /// Fetch team, users, connections, conversations, etc, from
+    /// the backend to update local database.
+
+    case resyncResources
+
     init?(string: String) {
         // We may want to have commands that accept arguments, which means
         // we'd have to do the parsing of the command here.
         switch string {
         case "repairInvalidAccessRoles":
             self = .repairInvalidAccessRoles
+
+        case "resync resources":
+            self = .resyncResources
+
         default:
             return nil
         }