Merge pull request #16 from QuickBlox/Release-0.3.3

Release 0.3.3

Author: VladimirNybozhinsky

Sources/QuickBloxData/DTO/Message/RemoteOriginalMessageDTO.swift

@@ -29,10 +29,10 @@ public struct RemoteOriginalMessageDTO: Codable {
                 senderId: UInt = 0,
                 dateSent: Int64,
                 attachments: [RemoteOriginalFileInfoDTO] = [],
-                createdAt: Date,
-                updatedAt: Date,
-                deliveredIds: [UInt],
-                readIds: [UInt]) {
+                createdAt: Date = Date(),
+                updatedAt: Date = Date(),
+                deliveredIds: [UInt] = [],
+                readIds: [UInt] = []) {
         self.id = id
         self.dialogId = dialogId
         self.text = text
@@ -62,11 +62,11 @@ public struct RemoteOriginalMessageDTO: Codable {
 }
 
 public struct RemoteOriginalFileInfoDTO: Codable {
-    var id: String
-    var name: String
-    var type: String
-    var url: String
-    var uid: String
+    var id: String = ""
+    var name: String = ""
+    var type: String = ""
+    var url: String = ""
+    var uid: String = ""
 }
 
 extension RemoteOriginalFileInfoDTO {
@@ -98,10 +98,6 @@ extension RemoteOriginalMessageDTO {
 }
 
 private extension Date {
-    var timeStampString: String {
-        return String(Int64(self.timeIntervalSince1970 * 1000))
-    }
-    
     var timeStampInt: Int64 {
         return Int64(self.timeIntervalSince1970 * 1000)
     }

Sources/QuickBloxData/Repository/MessagesRepository.swift

@@ -81,6 +81,7 @@ private extension RemoteMessageDTO {
         if let originSenderName = value.originSenderName {
             self.originSenderName = originSenderName
         }
+        
         originalMessages = value.originalMessages.compactMap { RemoteMessageDTO($0) }
         relatedId = value.relatedId
     }

Sources/QuickBloxData/Source/Remote/Extension/RemoteMessageDTO+QBChatMessage.swift

@@ -35,7 +35,17 @@ extension RemoteMessageDTO {
         if let attachments = value.attachments {
             self.filesInfo = attachments.compactMap {
                 do {
-                    return try RemoteFileInfoDTO($0)
+                    var fileInfo = try RemoteFileInfoDTO($0)
+                    if text.contains("MediaContentEntity|") {
+                        var separated: [String] = text.components(separatedBy: "|")
+                        separated.removeLast()
+                        if let uid = separated.last {
+                            fileInfo.id = uid
+                            fileInfo.uid = uid
+                            fileInfo.path = ""
+                        }
+                    }
+                    return fileInfo
                 } catch {
                     prettyLog(error)
                     return nil
@@ -57,15 +67,11 @@ extension RemoteMessageDTO {
 
         if let originalMessages = value.customParameters[QBChatMessage.Key.originalMessages] as? String {
             self.originalMessages = originaldMessages(originalMessages, messageId: id,
-                                                      dateSent: dateSent,
+                                                      date: dateSent,
                                                       actionType: actionType,
                                                       originSenderName: originSenderName)
         }
 
-        if self.originalMessages.isEmpty == true {
-            actionType = .none
-        }
-        
         let current = String(QBSession.current.currentUserID)
         isOwnedByCurrentUser = senderId == current
         if isOwnedByCurrentUser {
@@ -87,30 +93,73 @@ extension RemoteMessageDTO {
 
     private func originaldMessages(_ jsonString: String,
                                    messageId: String,
-                                   dateSent: Date,
+                                   date: Date,
                                    actionType: MessageAction,
                                    originSenderName: String) -> [RemoteMessageDTO] {
-        guard let data = jsonString.data(using: .utf8) else { return [] }
-        let jsonDecoder = JSONDecoder()
-        jsonDecoder.dateDecodingStrategy = .iso8601
-        do {
-            let decodedOriginalMessages = try jsonDecoder.decode([RemoteOriginalMessageDTO].self, from: data)
-            var originalMessages: [RemoteMessageDTO] = []
-            for (i, decodedOriginalMessage) in decodedOriginalMessages.enumerated() {
-                var originalMessage = RemoteMessageDTO(decodedOriginalMessage)
-                originalMessage.actionType = actionType
-                originalMessage.relatedId = messageId
-                originalMessage.dateSent = dateSent
-                if i == 0 {
-                    originalMessage.originSenderName = originSenderName
+        guard let decodedOriginalMessages = jsonString.toJSON() as? [[String: AnyObject]] else { return  [] }
+        var originalMessages: [RemoteMessageDTO] = []
+        for (i, object) in decodedOriginalMessages.enumerated() {
+            let id  = object[RemoteOriginalMessageDTO.CodingKeys.id.stringValue] as? String ?? ""
+            let dialogId  = object[RemoteOriginalMessageDTO.CodingKeys.dialogId.stringValue] as? String ?? ""
+            let text  = object[RemoteOriginalMessageDTO.CodingKeys.text.stringValue] as? String ?? ""
+            let senderId = object[RemoteOriginalMessageDTO.CodingKeys.senderId.stringValue] as? UInt ?? 0
+            let dateSent = object[RemoteOriginalMessageDTO.CodingKeys.dateSent.stringValue] as? Int64 ?? 0
+            var attachments: [RemoteOriginalFileInfoDTO] = []
+            if let decodedAttachments = object[RemoteOriginalMessageDTO.CodingKeys.attachments.stringValue] as? [[String: AnyObject]] {
+                for decodedAttachment in decodedAttachments {
+                    var fileInfoDTO = RemoteOriginalFileInfoDTO()
+                    if let id = decodedAttachment["id"] as? String {
+                        fileInfoDTO.id = id
+                    } else {
+                        if let urlPath = decodedAttachment["url"] as? String,
+                           let url = URL(string: urlPath) {
+                            fileInfoDTO.id = url.lastPathComponent
+                        }
+                        if let uid = decodedAttachment["uid"] as? String {
+                            fileInfoDTO.id = uid
+                        }
+                        if let contentType = decodedAttachment["content-type"] as? String {
+                            fileInfoDTO.type = contentType
+                        }
+                    }
+                    if let name = decodedAttachment["name"] as? String {
+                        fileInfoDTO.name = name
+                    }
+                    if let type = decodedAttachment["type"] as? String {
+                        fileInfoDTO.type = type
+                        if type == "audio/mp4" { // fix voice message from Safari
+                            fileInfoDTO.type = "audio/mp3"
+                            fileInfoDTO.name = fileInfoDTO.name.replacingOccurrences(of: "mp4", with: "mp3")
+                        }
+                    }
+                    if let url = decodedAttachment["url"] as? String {
+                        fileInfoDTO.url = url
+                    }
+                    if let uid = decodedAttachment["uid"] as? String {
+                        fileInfoDTO.uid = uid
+                    }
+                    
+                    attachments.append(fileInfoDTO)
                 }
-                originalMessages.append(originalMessage)
             }
-            return originalMessages
-        } catch {
-            print("Error: \(error.localizedDescription)")
-            return []
+            
+            let decodedOriginalMessage = RemoteOriginalMessageDTO(id: id,
+                                                                  dialogId: dialogId,
+                                                                  text: text,
+                                                                  senderId: senderId,
+                                                                  dateSent: dateSent,
+                                                                  attachments: attachments)
+            var originalMessage = RemoteMessageDTO(decodedOriginalMessage)
+            originalMessage.actionType = actionType
+            originalMessage.relatedId = messageId
+            originalMessage.dateSent = date
+            if i == 0 {
+                originalMessage.originSenderName = originSenderName
+            }
+            
+            originalMessages.append(originalMessage)
         }
+        return originalMessages
     }
 
     static func eventMessage(_ text: String,
@@ -168,8 +217,6 @@ extension RemoteMessageDTO {
         senderId = value.senderId != 0 ? String(value.senderId) : ""
         recipientId = value.recipientId != 0 ? String(value.recipientId) : ""
         dateSent = value.dateSent.dateTimeIntervalSince1970
-        createdAt = value.createdAt
-        updatedAt = value.updatedAt
 
         if value.attachments.isEmpty == false {
             self.filesInfo = value.attachments.compactMap{ RemoteFileInfoDTO($0) }
@@ -201,3 +248,9 @@ private extension Int64 {
         return Date(timeIntervalSince1970: timestampInSeconds)
     }
 }
+
+extension  String {
+func toJSON() -> Any? {
+    guard let data = self.data(using: .utf8, allowLossyConversion: false) else { return nil }
+    return try? JSONSerialization.jsonObject(with: data, options: .mutableContainers)
+}}

Sources/QuickBloxData/Utils.swift

@@ -25,22 +25,6 @@ extension ComparisonResult {
     }
 }
 
-extension Array where Element: Hashable {
-    mutating func removeDuplicates() {
-        var set = Set<Element>()
-        var newArray = [Element]()
-        
-        for element in self {
-            if !set.contains(element) {
-                newArray.append(element)
-                set.insert(element)
-            }
-        }
-        
-        self = newArray
-    }
-}
-
 extension Array where Element: Dated, Element: Identifiable, Element: Hashable {
     mutating func insertElement(_ new: Element, withSorting order: ComparisonResult) {
         if isEmpty {
@@ -70,7 +54,6 @@ extension Array where Element: Dated, Element: Identifiable, Element: Hashable {
                     append(new)
                 }
             }
-            self.removeDuplicates()
         }
     }
 }

Sources/QuickBloxDomain/UseCase/Dialog/SyncDialog.swift

@@ -58,7 +58,7 @@ where Dialog == DialogsRepo.DialogEntityItem,
 
                 if let usersRepo = self?.usersRepo,
                    let users = try? await usersRepo.get(usersFromRemote: ids),
-                   users.isEmpty != false {
+                   users.isEmpty == false {
                     try? await usersRepo.save(usersToLocal: users)
                 }
                 try await dialogsRepo.save(dialogToLocal: dialog)

Sources/QuickBloxDomain/UseCase/SyncData.swift

@@ -196,12 +196,6 @@ where Pagination == DialogsRepo.PaginationItem {
                     try Task.checkCancellation()
                     try await self?.connectRepo.connect()
                 }
-                
-                
-                if self?.stateSubject.value == .syncing(stage: .disconnected) {
-                    try Task.checkCancellation()
-                    try await self?.connectRepo.connect()
-                }
             } catch { prettyLog(error) }
 
             self?.taskConnect = nil

Sources/QuickBloxUIKit/QuickBloxUIKit.swift

@@ -68,7 +68,7 @@ class Sync {
     }
 }
 
-var syncState: AnyPublisher<SyncState, Never> {
+public var syncState: AnyPublisher<SyncState, Never> {
     syncData()
     return sync!.state
 }
@@ -81,33 +81,23 @@ private func syncData() {
     }
 }
 
-let imageCache = ImageCache.shared
-
 //FIXME: add dialogsView screen
 @MainActor @ViewBuilder
-public func dialogsView(onExit: (() -> Void)? = nil, onAppear: ((Bool) -> Void)? = nil) -> some View {
+public func dialogsView(onExit: (() -> Void)? = nil,
+                        onSelect: @escaping (_ tabIndex: TabIndex) -> Void) -> some View {
     DialogsView(dialogsList: DialogsViewModel(dialogsRepo: RepositoriesFabric.dialogs),
-                content: { dialogsList in
-        DialogsListView(dialogsList: dialogsList, detailContent: { item, onDismiss in
-            if item.type == .group {
-                GroupDialogView(viewModel: DialogViewModel(dialog: item), onDismiss: onDismiss)
-            } else if item.type == .private {
-                PrivateDialogView(viewModel: DialogViewModel(dialog: item), onDismiss: onDismiss)
-            }
-        },
-                        content: DialogsRowBuilder.defaultRow)
-    }, detailContent: { item, onDismiss in
+                detailContent: { item, isInfoPresented in
         if item.type == .group {
-            GroupDialogView(viewModel: DialogViewModel(dialog: item), onDismiss: onDismiss)
+            GroupDialogView(viewModel: DialogViewModel(dialog: item), isInfoPresented: isInfoPresented)
         } else if item.type == .private {
-            PrivateDialogView(viewModel: DialogViewModel(dialog: item), onDismiss: onDismiss)
+            PrivateDialogView(viewModel: DialogViewModel(dialog: item), isInfoPresented: isInfoPresented)
         }
     }, selectTypeContent: { onClose in
         DialogTypeView(onClose: onClose)
     }, onBack: {
         onExit?()
-    }, onAppear: { appear in
-        onAppear?(appear)
+    }, onSelect: { tabIndex in
+        onSelect(tabIndex)
     })
     .onAppear {
         syncData()

Sources/QuickBloxUIKit/Resources/Assets.xcassets/ThemeColor/HighLight.colorset/Contents.json

@@ -12,24 +12,6 @@
       },
       "idiom" : "universal"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC1",
-          "green" : "0xFD",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    },
     {
       "appearances" : [
         {

Sources/QuickBloxUIKit/Resources/en.lproj/Localizable.strings

@@ -9,6 +9,7 @@
 "dialog.items.empty" = "There are no dialogs";
 "dialog.members.empty" = "You don’t have any users.";
 "dialog.messages.empty" = "You don’t have any messages.";
+"dialog.info.selectDialog" = "Select a dialog to start communication";
 "dialog.type.private" = "Private";
 "dialog.type.group" = "Group";
 "dialog.type.public" = "Public";
@@ -50,7 +51,7 @@
 "alert.actions.remove" = "Remove";
 "alert.actions.cancel" = "Cancel";
 "alert.actions.ok" = "Ok";
-"alert.message.removeUser" = "Are you sure you want to remove ";
+"alert.message.removeItem" = "Are you sure you want to remove ";
 "alert.message.questionMark" = "?";
 "alert.message.errorValidation" = "Error Validation";
 "alert.message.addUser" = "Are you sure you want to add ";
@@ -92,6 +93,7 @@
 "utils.string.hasLeft" = "has left";
 "utils.string.today" = "Today";
 "utils.string.yesterday" = "Yesterday";
+"utils.string.unknown" = "Unknown";
 
 "utils.string.connecting" = "connecting";
 "utils.string.update" = "update";

Sources/QuickBloxUIKit/SwiftUIView/Dialog/AddMembers/AddMembersDialogView.swift

@@ -13,8 +13,7 @@ import QuickBloxData
 public struct AddMembersDialogView<ViewModel: AddMembersDialogProtocol>: View {
     @State public var settings
     = QuickBloxUIKit.settings.addMembersScreen
-    
-    @Environment(\.dismiss) var dismiss
+
     @Environment(\.isSearching) private var isSearching: Bool
 
     @StateObject public var viewModel: ViewModel
@@ -61,9 +60,7 @@ public struct AddMembersDialogView<ViewModel: AddMembersDialogProtocol>: View {
                 })
         }
 
-        .addMembersHeader(onDismiss: {
-            dismiss()
-        })
+        .addMembersHeader()
 
         .disabled(viewModel.isProcessing == true)
         .if(viewModel.isProcessing == true) { view in