fix issue refresh token and update unreadCount using int64

Author: Arief Nur Putranto

QiscusCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = "QiscusCore"
-s.version      = "1.14.4"
+s.version      = "1.14.5"
 s.summary      = "Qiscus Core SDK for iOS"
 s.description  = <<-DESC
 Qiscus SDK for iOS contains Qiscus public Model.

QiscusCore.xcodeproj/project.xcworkspace/xcuserdata/ariefnurputranto.xcuserdatad/UserInterfaceState.xcuserstate

@@ -24,7 +24,7 @@ extension Room {
     @NSManaged  var uniqueId: String?
     @NSManaged  var avatarUrl: String?
     @NSManaged  var options: String?
-    @NSManaged  var unreadCount: Int16
+    @NSManaged  var unreadCount: Int
     @NSManaged  var localData: String?
     @NSManaged public var members: NSSet?
 

Source/QiscusCore/Database/QiscusDatabase/Model/Room+CoreDataProperties.swift

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19E266" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="1.0">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D60" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="1.0">
     <entity name="Comment" representedClassName="QiscusCore.Comment" syncable="YES">
         <attribute name="commentBeforeId" optional="YES" attributeType="String"/>
         <attribute name="extras" optional="YES" attributeType="String"/>
@@ -50,17 +50,12 @@
         <attribute name="options" optional="YES" attributeType="String"/>
         <attribute name="type" optional="YES" attributeType="String"/>
         <attribute name="uniqueId" optional="YES" attributeType="String"/>
-        <attribute name="unreadCount" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="unreadCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="members" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Member" inverseName="rooms" inverseEntity="Member"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
                 <constraint value="id"/>
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
-    <elements>
-        <element name="Comment" positionX="-164" positionY="132" width="128" height="313"/>
-        <element name="Member" positionX="243" positionY="108" width="128" height="178"/>
-        <element name="Room" positionX="9" positionY="306" width="128" height="195"/>
-    </elements>
 </model>

Source/QiscusCore/Database/QiscusDatabase/Qiscus.xcdatamodeld/Qiscus.xcdatamodel/contents

@@ -254,7 +254,7 @@ extension RoomStorage {
         }
         result.id            = core.id
         result.uniqueId      = core.uniqueId
-        result.unreadCount   = Int16(core.unreadCount)
+        result.unreadCount   = core.unreadCount
         result.name          = core.name
         result.avatarUrl     = core.avatarUrl?.absoluteString ?? ""
         result.options       = core.options

Source/QiscusCore/Database/RoomStorage.swift

@@ -91,6 +91,11 @@ open class CommentModel {
             if let _payload = self.payload {
                 self.payload?.removeAll()
                 self.payload = getPayload(fromPayload: _payload)
+                
+                if payload == nil {
+                    self.payload?.removeAll()
+                    self.payload = getPayloadCustom(fromPayload: _payload)
+                }
             }
         }
 
@@ -135,6 +140,18 @@ extension CommentModel {
         }
     }
 
+    private func getPayloadCustom(fromPayload data: [String:Any]) -> [String:Any]? {
+        if let payload = data as? [String:Any]{
+            if !payload.isEmpty {
+                return payload
+            }else {
+                return nil
+            }
+        }else {
+            return nil
+        }
+    }
+    
     func getDate() -> Date {
         //let timezone = TimeZone.current.identifier
         let formatter = DateFormatter()

Source/QiscusCore/Model/CommentModel.swift

@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 
 public class QiscusCore: NSObject {
-    public static let qiscusCoreVersionNumber:String = "1.14.4"
+    public static let qiscusCoreVersionNumber:String = "1.14.5"
     class var bundle:Bundle{
         get{
             let podBundle = Bundle(for: QiscusCore.self)
@@ -1439,7 +1439,9 @@ public class QiscusCore: NSObject {
         if  userID.isEmpty == true || refreshUserToken.isEmpty == true {
             onError(QError(message: "Please force logout and setUser first"))
         }else{
+            QiscusCore.realtime.unsubcribeCommentUpdateComemntNotification()
             QiscusCore.network.refreshUserToken(userId: userID, refreshToken: refreshUserToken) { success in
+                QiscusCore.realtime.subcribeCommentUpdateComemntNotification()
                 onSuccess(success)
             } onError: { error in
                 onError(error)

Source/QiscusCore/QiscusCore.swift

@@ -81,6 +81,46 @@ class RealtimeManager {
 
     }
 
+    func unsubcribeCommentUpdateComemntNotification(){
+        guard let c = client else {
+            return
+        }
+        
+        if let user = QiscusCore.getUserData() {
+            if ConfigManager.shared.isEnableDisableRealtimeManually == true {
+                c.unsubscribe(endpoint: .comment(token: user.token))
+                c.unsubscribe(endpoint: .updateComment(token: user.token))
+                c.unsubscribe(endpoint: .notification(token: user.token))
+            }
+        }
+        
+        print("today check unsubcribeCommentUpdateComemntNotification")
+    }
+    
+    func subcribeCommentUpdateComemntNotification(){
+        guard let c = client else {
+            return
+        }
+        
+        if let user = QiscusCore.getUserData() {
+            if ConfigManager.shared.isEnableDisableRealtimeManually == true {
+                if !c.subscribe(endpoint: .comment(token: user.token)){
+                    self.pendingSubscribeTopic.append(.comment(token: user.token))
+                }
+                
+                if !c.subscribe(endpoint: .updateComment(token: user.token)){
+                    self.pendingSubscribeTopic.append(.updateComment(token: user.token))
+                }
+                
+                if !c.subscribe(endpoint: .notification(token: user.token)){
+                    self.pendingSubscribeTopic.append(.notification(token: user.token))
+                }
+            }
+        }
+        
+        print("today check subcribeCommentUpdateComemntNotification")
+    }
+    
     /// Subscribe comment(deliverd and read), typing by member in the room, and online status
     ///
     /// - Parameter rooms: array of rooms