Notifications (#275)

ElementX/Sources/Services/Client/ClientProxy.swift

@@ -52,6 +52,7 @@ class ClientProxy: ClientProxyProtocol {
     private let client: ClientProtocol
     private let backgroundTaskService: BackgroundTaskServiceProtocol
     private var sessionVerificationControllerProxy: SessionVerificationControllerProxy?
+    private let mediaProxy: MediaProxyProtocol
     private let clientQueue: DispatchQueue
     
     private var slidingSyncObserverToken: StoppableSpawn?
@@ -75,6 +76,8 @@ class ClientProxy: ClientProxyProtocol {
         self.backgroundTaskService = backgroundTaskService
         clientQueue = .init(label: "ClientProxyQueue",
                             attributes: .concurrent)
+        mediaProxy = MediaProxy(client: client,
+                                clientQueue: clientQueue)
 
         await Task.dispatch(on: clientQueue) {
             do {
@@ -204,25 +207,7 @@ class ClientProxy: ClientProxyProtocol {
             .failure(.failedSettingAccountData)
         }
     }
-    
-    func mediaSourceForURLString(_ urlString: String) -> MatrixRustSDK.MediaSource {
-        MatrixRustSDK.mediaSourceFromUrl(url: urlString)
-    }
-    
-    func loadMediaContentForSource(_ source: MatrixRustSDK.MediaSource) async throws -> Data {
-        try await Task.dispatch(on: clientQueue) {
-            let bytes = try self.client.getMediaContent(source: source)
-            return Data(bytes: bytes, count: bytes.count)
-        }
-    }
-    
-    func loadMediaThumbnailForSource(_ source: MatrixRustSDK.MediaSource, width: UInt, height: UInt) async throws -> Data {
-        try await Task.dispatch(on: clientQueue) {
-            let bytes = try self.client.getMediaThumbnail(source: source, width: UInt64(width), height: UInt64(height))
-            return Data(bytes: bytes, count: bytes.count)
-        }
-    }
-    
+
     func sessionVerificationControllerProxy() async -> Result<SessionVerificationControllerProxyProtocol, ClientProxyError> {
         await Task.dispatch(on: clientQueue) {
             do {
@@ -243,6 +228,32 @@ class ClientProxy: ClientProxyProtocol {
             }
         }
     }
+
+    // swiftlint:disable:next function_parameter_count
+    func setPusher(pushkey: String,
+                   kind: PusherKind?,
+                   appId: String,
+                   appDisplayName: String,
+                   deviceDisplayName: String,
+                   profileTag: String?,
+                   lang: String,
+                   url: String?,
+                   format: PushFormat?,
+                   defaultPayload: [AnyHashable: Any]?) async throws {
+//        let defaultPayloadString = jsonString(from: defaultPayload)
+//        try await Task.dispatch(on: .global()) {
+//            try self.client.setPusher(pushkey: pushkey,
+//                                      kind: kind?.rustValue,
+//                                      appId: appId,
+//                                      appDisplayName: appDisplayName,
+//                                      deviceDisplayName: deviceDisplayName,
+//                                      profileTag: profileTag,
+//                                      lang: lang,
+//                                      url: url,
+//                                      format: format?.rustValue,
+//                                      defaultPayload: defaultPayloadString)
+//        }
+    }
     
     // MARK: Private
 
@@ -271,4 +282,29 @@ class ClientProxy: ClientProxyProtocol {
         
         callbacks.send(.receivedSyncUpdate)
     }
+
+    /// Convenience method to get the json string of an Encodable
+    private func jsonString(from dictionary: [AnyHashable: Any]?) -> String? {
+        guard let dictionary,
+              let data = try? JSONSerialization.data(withJSONObject: dictionary,
+                                                     options: [.fragmentsAllowed]) else {
+            return nil
+        }
+
+        return String(data: data, encoding: .utf8)
+    }
+}
+
+extension ClientProxy: MediaProxyProtocol {
+    func mediaSourceForURLString(_ urlString: String) -> MediaSourceProxy {
+        mediaProxy.mediaSourceForURLString(urlString)
+    }
+
+    func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data {
+        try await mediaProxy.loadMediaContentForSource(source)
+    }
+
+    func loadMediaThumbnailForSource(_ source: MediaSourceProxy, width: UInt, height: UInt) async throws -> Data {
+        try await mediaProxy.loadMediaThumbnailForSource(source, width: width, height: height)
+    }
 }