瀏覽代碼

refractor name Nexilis in DigiXLite

alqindiirsyam 2 年之前
父節點
當前提交
bfc1337f50
共有 62 個文件被更改,包括 570 次插入570 次删除
  1. 4 4
      appbuilder-ios/DigiXLite/DigiXLite.xcodeproj/project.pbxproj
  2. 二進制
      appbuilder-ios/DigiXLite/DigiXLite.xcworkspace/xcuserdata/akhmadalqindiirsyam.xcuserdatad/UserInterfaceState.xcuserstate
  3. 5 5
      appbuilder-ios/DigiXLite/DigiXLite/Source/APIS.swift
  4. 14 14
      appbuilder-ios/DigiXLite/DigiXLite/Source/Callback.swift
  5. 2 2
      appbuilder-ios/DigiXLite/DigiXLite/Source/DigiX.swift
  6. 6 6
      appbuilder-ios/DigiXLite/DigiXLite/Source/Download.swift
  7. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/Extension.swift
  8. 8 8
      appbuilder-ios/DigiXLite/DigiXLite/Source/FloatingButton/FloatingButton.swift
  9. 74 74
      appbuilder-ios/DigiXLite/DigiXLite/Source/IncomingThread.swift
  10. 2 2
      appbuilder-ios/DigiXLite/DigiXLite/Source/InquiryThread.swift
  11. 10 10
      appbuilder-ios/DigiXLite/DigiXLite/Source/Network.swift
  12. 7 7
      appbuilder-ios/DigiXLite/DigiXLite/Source/OutgoingThread.swift
  13. 2 2
      appbuilder-ios/DigiXLite/DigiXLite/Source/TMessage.swift
  14. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/BNIView/BNIBookingWebView.swift
  15. 3 3
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/AudioViewController.swift
  16. 2 2
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/CallProviderDelegate.swift
  17. 10 10
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraAudioConference.swift
  18. 16 16
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraAudioViewController.swift
  19. 6 6
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraCallContactViewController.swift
  20. 18 18
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraVideoViewController.swift
  21. 5 5
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/ScreenSharingViewController.swift
  22. 7 7
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/WhiteboardViewController.swift
  23. 33 33
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorGroup.swift
  24. 55 55
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorPersonal.swift
  25. 8 8
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorStarMessages.swift
  26. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/FormEditor.swift
  27. 5 5
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/PreviewAttachmentImageVideo.swift
  28. 8 8
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Contact/ContactCallViewController.swift
  29. 3 3
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/AddFriendTableViewController.swift
  30. 4 4
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BackupRestoreView.swift
  31. 8 8
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BroadcastMembersTableViewController.swift
  32. 9 9
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BroadcastViewController.swift
  33. 20 20
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeDeviceViewController.swift
  34. 7 7
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeNamePassswordViewController.swift
  35. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeNameTableViewController.swift
  36. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangePasswordViewController.swift
  37. 26 26
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ContactChatViewController.swift
  38. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupCreateViewController.swift
  39. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupDescViewController.swift
  40. 18 18
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupDetailViewController.swift
  41. 5 5
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupMemberViewController.swift
  42. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupNameViewController.swift
  43. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupTopicViewController.swift
  44. 3 3
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/HistoryBroadcastViewController.swift
  45. 22 22
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/MessageInfo.swift
  46. 23 23
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ProfileViewController.swift
  47. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ScannerViewController.swift
  48. 11 11
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SetInternalCSAccount.swift
  49. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SetOfficerBNI.swift
  50. 23 23
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SettingTableViewController.swift
  51. 22 22
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SignUpSignIn.swift
  52. 6 6
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/CreateSeminarViewController.swift
  53. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/CreateViewController.swift
  54. 6 6
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraCreateStreamingViewController.swift
  55. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraGroupChooserViewController.swift
  56. 8 8
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraStreamingViewController.swift
  57. 2 2
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraUserChooserViewController.swift
  58. 3 3
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/SeminarListViewController.swift
  59. 12 12
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/SeminarViewController.swift
  60. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/StreamingViewController.swift
  61. 4 4
      appbuilder-ios/DigiXLite/DigiXLite/Source/Whiteboard.swift
  62. 1 1
      appbuilder-ios/DigiXLite/DigiXLite/Source/WhiteboardCanvas.swift

+ 4 - 4
appbuilder-ios/DigiXLite/DigiXLite.xcodeproj/project.pbxproj

@@ -34,7 +34,7 @@
 		CD1E72182A0BA86100BF871F /* WorkingArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71632A0BA86100BF871F /* WorkingArea.swift */; };
 		CD1E72192A0BA86100BF871F /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71642A0BA86100BF871F /* Group.swift */; };
 		CD1E721A2A0BA86100BF871F /* NotifSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71652A0BA86100BF871F /* NotifSound.swift */; };
-		CD1E721B2A0BA86100BF871F /* Nexilis.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71662A0BA86100BF871F /* Nexilis.swift */; };
+		CD1E721B2A0BA86100BF871F /* DigiX.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71662A0BA86100BF871F /* DigiX.swift */; };
 		CD1E721C2A0BA86100BF871F /* ContactCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E71692A0BA86100BF871F /* ContactCallViewController.swift */; };
 		CD1E721D2A0BA86100BF871F /* WorkingAreaPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E716B2A0BA86100BF871F /* WorkingAreaPicker.swift */; };
 		CD1E721E2A0BA86100BF871F /* BNIBookingWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E716C2A0BA86100BF871F /* BNIBookingWebView.swift */; };
@@ -276,7 +276,7 @@
 		CD1E71632A0BA86100BF871F /* WorkingArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WorkingArea.swift; sourceTree = "<group>"; };
 		CD1E71642A0BA86100BF871F /* Group.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Group.swift; sourceTree = "<group>"; };
 		CD1E71652A0BA86100BF871F /* NotifSound.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotifSound.swift; sourceTree = "<group>"; };
-		CD1E71662A0BA86100BF871F /* Nexilis.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Nexilis.swift; sourceTree = "<group>"; };
+		CD1E71662A0BA86100BF871F /* DigiX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DigiX.swift; sourceTree = "<group>"; };
 		CD1E71692A0BA86100BF871F /* ContactCallViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactCallViewController.swift; sourceTree = "<group>"; };
 		CD1E716B2A0BA86100BF871F /* WorkingAreaPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WorkingAreaPicker.swift; sourceTree = "<group>"; };
 		CD1E716C2A0BA86100BF871F /* BNIBookingWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BNIBookingWebView.swift; sourceTree = "<group>"; };
@@ -586,7 +586,7 @@
 				CD1E715E2A0BA86100BF871F /* Model */,
 				CD46A0C42A0D0D5D009E4C87 /* MyArchive.swift */,
 				CD1E71582A0BA86100BF871F /* Network.swift */,
-				CD1E71662A0BA86100BF871F /* Nexilis.swift */,
+				CD1E71662A0BA86100BF871F /* DigiX.swift */,
 				CD1E714F2A0BA86100BF871F /* OutgoingThread.swift */,
 				CD1E71B02A0BA86100BF871F /* TMessage.swift */,
 				CD1E71512A0BA86100BF871F /* Units.swift */,
@@ -1240,7 +1240,7 @@
 				CD1E72132A0BA86100BF871F /* Database.swift in Sources */,
 				CD1E720F2A0BA86100BF871F /* Download.swift in Sources */,
 				CD1E725D2A0BA86100BF871F /* WhiteboardDelegate.swift in Sources */,
-				CD1E721B2A0BA86100BF871F /* Nexilis.swift in Sources */,
+				CD1E721B2A0BA86100BF871F /* DigiX.swift in Sources */,
 				CD1E72102A0BA86100BF871F /* Extension.swift in Sources */,
 				CD1E724C2A0BA86100BF871F /* NotificationSound.swift in Sources */,
 				CDDF467A2A2EF0A700049A19 /* ScreenSharingViewController.swift in Sources */,

二進制
appbuilder-ios/DigiXLite/DigiXLite.xcworkspace/xcuserdata/akhmadalqindiirsyam.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 5
appbuilder-ios/DigiXLite/DigiXLite/Source/APIS.swift

@@ -14,7 +14,7 @@ import nuSDKService
 
 public class APIS: NSObject {
     public static func connect(apiKey: String, delegate: ConnectDelegate, showButton: Bool = true) {
-        Nexilis.connect(apiKey: apiKey, delegate: delegate, showButton: showButton)
+        DigiX.connect(apiKey: apiKey, delegate: delegate, showButton: showButton)
     }
     
     public static func getTotalCounter() -> Int32 {
@@ -607,11 +607,11 @@ public class APIS: NSObject {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         self.signInAdmin(password: password, completion: { result in
             if result {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader {
+                    DigiX.hideLoader {
                         let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Successfully Sign-In Admin".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -620,7 +620,7 @@ public class APIS: NSObject {
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader {}
+                    DigiX.hideLoader {}
                 }
             }
         })
@@ -632,7 +632,7 @@ public class APIS: NSObject {
             let p_password = password
             let md5Hex = p_password
             var result: Bool = false
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
                     result = true
                 }

+ 14 - 14
appbuilder-ios/DigiXLite/DigiXLite/Source/Callback.swift

@@ -14,10 +14,10 @@ class Callback : CallBack {
     
     func connectionStateChanged(sUserID: String!, sDeviceID: String!, bConState: Bool!, nConType: Int!, nConSubType: Int!, nCLMConStat: UInt8!) {
         //print(sUserID, "/", sDeviceID, "/", bConState, "/", nConType, "/", nConSubType, "/", nCLMConStat)
-        if let dispatch = Nexilis.dispatch, bConState {
+        if let dispatch = DigiX.dispatch, bConState {
             dispatch.leave()
         }
-        if let delegate = Nexilis.shared.connectionDelegate {
+        if let delegate = DigiX.shared.connectionDelegate {
             delegate.connectionStateChanged(userId: sUserID, deviceId: sDeviceID, state: bConState)
         }
         OutgoingThread.default.set(wait: nCLMConStat == 0)
@@ -34,7 +34,7 @@ class Callback : CallBack {
     func callStateChanged(nState: Int!, sMessage: String!) -> Int {
         //print(nState,"/",sMessage)
         if nState == 21 || nState == 31 {
-            if let delegate = Nexilis.shared.callDelegate {
+            if let delegate = DigiX.shared.callDelegate {
                 delegate.onIncomingCall(state: nState, message: sMessage)
             }
         } else {
@@ -45,7 +45,7 @@ class Callback : CallBack {
 //                    return 1
 //                }
 //            }
-            if let delegate = Nexilis.shared.callDelegate {
+            if let delegate = DigiX.shared.callDelegate {
                 delegate.onStatusCall(state: nState, message: sMessage)
             }
         }
@@ -55,16 +55,16 @@ class Callback : CallBack {
     
     func bcastStateChanged(nState: Int!, sMessage: String!) -> Int {
         //print(("LS CALLBACK ",nState,"/",sMessage)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onStartLS(state: nState, message: sMessage)
         }
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: nState, message: sMessage)
         }
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onStartSeminar(state: nState, message: sMessage)
         }
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onJoinSeminar(state: nState, message: sMessage)
         }
         return 1
@@ -75,23 +75,23 @@ class Callback : CallBack {
         switch nState {
             case 0:
                 if (sMessage.starts(with: "Initiating")){
-                    if let delegate = Nexilis.shared.screenSharingDelegate {
+                    if let delegate = DigiX.shared.screenSharingDelegate {
                         delegate.onStartScreenSharing(state: nState, message: sMessage)
                     }
                 }
             case 12:
-                if let delegate = Nexilis.shared.screenSharingDelegate {
+                if let delegate = DigiX.shared.screenSharingDelegate {
                     delegate.onStartScreenSharing(state: nState, message: sMessage)
                 }
             case 22:
-                if let delegate = Nexilis.shared.screenSharingDelegate {
+                if let delegate = DigiX.shared.screenSharingDelegate {
                     delegate.onJoinScreenSharing(state: nState, message: sMessage)
                 }
             case 88:
-                if let delegate = Nexilis.shared.screenSharingDelegate {
+                if let delegate = DigiX.shared.screenSharingDelegate {
                     delegate.onStartScreenSharing(state: nState, message: sMessage)
                 }
-                if let delegate = Nexilis.shared.screenSharingDelegate {
+                if let delegate = DigiX.shared.screenSharingDelegate {
                     delegate.onJoinScreenSharing(state: nState, message: sMessage)
                 }
             default:
@@ -101,7 +101,7 @@ class Callback : CallBack {
     }
     
     func incomingData(sPacketID: String!, oData: AnyObject!) throws {
-        Nexilis.incomingData(packetId: sPacketID!, data: oData!)
+        DigiX.incomingData(packetId: sPacketID!, data: oData!)
     }
     
     func lateResponse(sPacketID: String!, sResponse: String!) throws {

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/DigiX.swift

@@ -114,7 +114,7 @@ public class DigiX: NSObject {
             DigiX.dispatch?.wait()
             DigiX.dispatch = nil
             
-//            Nexilis.initiateAudio()
+//            DigiX.initiateAudio()
             
             if(!id.isEmpty && (UserDefaults.standard.string(forKey: "me") == nil)){
                 if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignUpApi(api: apiKey, p_pin: id), timeout: 30 * 1000){
@@ -376,7 +376,7 @@ public class DigiX: NSObject {
             DigiX.dispatch?.wait()
             DigiX.dispatch = nil
             //print(("success change user to fpin")
-//            _ = Nexilis.write(message: CoreMessage_TMessageBank.getChangeConnectionID(p_pin: f_pin))
+//            _ = DigiX.write(message: CoreMessage_TMessageBank.getChangeConnectionID(p_pin: f_pin))
         } catch{
             //print(error)
         }

+ 6 - 6
appbuilder-ios/DigiXLite/DigiXLite/Source/Download.swift

@@ -26,22 +26,22 @@ public class Download {
     
     public func start(forKey: String, delegate: DownloadDelegate){
         self.delegate = delegate
-        let download = Nexilis.getDownload(forKey: forKey)
+        let download = DigiX.getDownload(forKey: forKey)
         if download == nil {
-            Nexilis.addDownload(forKey: forKey, download: self)
+            DigiX.addDownload(forKey: forKey, download: self)
         }
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getImageDownload(p_image_id: forKey))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getImageDownload(p_image_id: forKey))
     }
     
     var onDownloadProgress: ((String, Double) -> ())?
     
     public func start(forKey: String, completion: @escaping (String, Double)->()) {
         self.onDownloadProgress = completion
-        let download = Nexilis.getDownload(forKey: forKey)
+        let download = DigiX.getDownload(forKey: forKey)
         if download == nil {
-            Nexilis.addDownload(forKey: forKey, download: self)
+            DigiX.addDownload(forKey: forKey, download: self)
         }
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getImageDownload(p_image_id: forKey))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getImageDownload(p_image_id: forKey))
     }
     
     public func startHTTP(filename: String, baseURL: String, onCompletion: ((Data) -> Void)? = nil, onError: (() -> Void)? = nil, onProgress: ((Progress) -> Void)? = nil) -> DownloadRequest {

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/Extension.swift

@@ -454,7 +454,7 @@ extension String {
             }
         }
         let lang = UserDefaults.standard.string(forKey: "i18n_language")
-        let bundle = Bundle.resourceBundle(for: Nexilis.self).path(forResource: lang, ofType: "lproj")
+        let bundle = Bundle.resourceBundle(for: DigiX.self).path(forResource: lang, ofType: "lproj")
         let bundlePath = Bundle(path: bundle!)
         let result = NSLocalizedString(
             self,

+ 8 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/FloatingButton/FloatingButton.swift

@@ -66,7 +66,7 @@ public class FloatingButton: UIView {
                 nexilis_button.image = UIImage(data: dataImage!)
             }
         } else {
-            nexilis_button.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+            nexilis_button.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         }
         
         let qmeraTap = UITapGestureRecognizer(target: self, action: #selector(qmeraTap))
@@ -134,7 +134,7 @@ public class FloatingButton: UIView {
             return
         }
         DispatchQueue.global().async { [self] in
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.pullFloatingButton(), timeout: 30 * 1000){
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.pullFloatingButton(), timeout: 30 * 1000){
                 if response.isOk() {
                     let data = response.getBody(key: CoreMessage_TMessageKey.DATA, default_value: "")
                     if !data.isEmpty {
@@ -152,7 +152,7 @@ public class FloatingButton: UIView {
                                         newButton.heightAnchor.constraint(equalToConstant: 40).isActive = true
                                         newButton.translatesAutoresizingMaskIntoConstraints = false
                                         DispatchQueue.global().async {
-                                            let data = try? Data(contentsOf: URL(string: "https://newuniverse.io/get_file?account=\(Nexilis.sAPIKey)&image=\(icon)")!) //make sure your image in this url does exist, otherwise unwrap in a if let check / try-catch
+                                            let data = try? Data(contentsOf: URL(string: "https://newuniverse.io/get_file?account=\(DigiX.sAPIKey)&image=\(icon)")!) //make sure your image in this url does exist, otherwise unwrap in a if let check / try-catch
                                             DispatchQueue.main.async {
                                                 if data != nil {
                                                     newButton.setImage(UIImage(data: data!), for: .normal)
@@ -187,14 +187,14 @@ public class FloatingButton: UIView {
         button_fb1 = UIButton()
         button_fb1.heightAnchor.constraint(equalToConstant: 40).isActive = true
         button_fb1.translatesAutoresizingMaskIntoConstraints = false
-        button_fb1.setImage(UIImage(named: "pb_button_cc", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button_fb1.setImage(UIImage(named: "pb_button_cc", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         groupView.addArrangedSubview(button_fb1)
         button_fb1.addTarget(self, action: #selector(fb1Tap), for: .touchUpOutside)
         
         button_fb2 = UIButton()
         button_fb2.heightAnchor.constraint(equalToConstant: 40).isActive = true
         button_fb2.translatesAutoresizingMaskIntoConstraints = false
-        button_fb2.setImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button_fb2.setImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         groupView.addArrangedSubview(button_fb2)
         button_fb2.addTarget(self, action: #selector(fb2Tap), for: .touchUpOutside)
         checkCounter()
@@ -202,14 +202,14 @@ public class FloatingButton: UIView {
         button_fb3 = UIButton()
         button_fb3.heightAnchor.constraint(equalToConstant: 40).isActive = true
         button_fb3.translatesAutoresizingMaskIntoConstraints = false
-        button_fb3.setImage(UIImage(named: "pb_button_call", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button_fb3.setImage(UIImage(named: "pb_button_call", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         groupView.addArrangedSubview(button_fb3)
         button_fb3.addTarget(self, action: #selector(fb3Tap), for: .touchUpOutside)
         
         button_fb4 = UIButton()
         button_fb4.heightAnchor.constraint(equalToConstant: 40).isActive = true
         button_fb4.translatesAutoresizingMaskIntoConstraints = false
-        button_fb4.setImage(UIImage(named: "pb_button_stream", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button_fb4.setImage(UIImage(named: "pb_button_stream", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         groupView.addArrangedSubview(button_fb4)
         button_fb4.addTarget(self, action: #selector(fb4Tap), for: .touchUpOutside)
     }
@@ -322,7 +322,7 @@ public class FloatingButton: UIView {
         if indexTap == 2 {
             app_id = package_id.components(separatedBy: "_")[2]
         }
-        Nexilis.buttonClicked(index: indexTap, id: app_id)
+        DigiX.buttonClicked(index: indexTap, id: app_id)
         hideButton()
     }
     

+ 74 - 74
appbuilder-ios/DigiXLite/DigiXLite/Source/IncomingThread.swift

@@ -145,7 +145,7 @@ class IncomingThread {
         } else if message.getCode() == CoreMessage_TMessageCode.PUSH_CALL_CENTER || message.getCode() == CoreMessage_TMessageCode.ACCEPT_CALL_CENTER || message.getCode() == CoreMessage_TMessageCode.END_CALL_CENTER || message.getCode() == CoreMessage_TMessageCode.TIMEOUT_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.INVITE_TO_ROOM_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.ACCEPT_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.PUSH_MEMBER_ROOM_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.INVITE_END_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.INVITE_EXIT_CONTACT_CENTER || message.getCode() == CoreMessage_TMessageCode.PUSH_SECOND_CONTACT_CENTER {
             handleCallCenter(message: message)
         } else if message.getCode() == CoreMessage_TMessageCode.PUSH_DISCUSSION_COMMENT {
-            if let delegate = Nexilis.shared.messageDelegate {
+            if let delegate = DigiX.shared.messageDelegate {
                 delegate.onReceiveComment(message: message)
             }
             ack(message: message)
@@ -185,7 +185,7 @@ class IncomingThread {
      */
     private func askingForEndCall(message: TMessage) -> Void {
         if let packetId = message.mBodies[CoreMessage_TMessageKey.PACKET_ID] {
-            _ = Nexilis.responseString(packetId: packetId, message: "00")
+            _ = DigiX.responseString(packetId: packetId, message: "00")
         }
         ack(message: message)
     }
@@ -220,7 +220,7 @@ class IncomingThread {
     
     private func incomingCallCC(message: TMessage) {
         if let packetId = message.mBodies[CoreMessage_TMessageKey.PACKET_ID] {
-            _ = Nexilis.responseString(packetId: packetId, message: "01")
+            _ = DigiX.responseString(packetId: packetId, message: "01")
         }
         ack(message: message)
         DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
@@ -393,12 +393,12 @@ class IncomingThread {
                         title.textColor = .white
                         title.numberOfLines = 0
                         
-                        if Nexilis.shared.floating != nil {
-                            Nexilis.shared.floating.dismiss()
+                        if DigiX.shared.floating != nil {
+                            DigiX.shared.floating.dismiss()
                         }
-                        Nexilis.shared.floating = FloatingNotificationBanner(customView: container)
-                        Nexilis.shared.floating.bannerHeight = 100.0
-                        Nexilis.shared.floating.transparency = 0.9
+                        DigiX.shared.floating = FloatingNotificationBanner(customView: container)
+                        DigiX.shared.floating.bannerHeight = 100.0
+                        DigiX.shared.floating.transparency = 0.9
                         
                         let profile = CoreMessage_TMessageUtil.getString(json: json, key: CoreMessage_TMessageKey.THUMB_ID)
                         if profile != "" {
@@ -418,7 +418,7 @@ class IncomingThread {
                                         DispatchQueue.main.async {
                                             profileImage.image = UIImage(contentsOfFile: file.path)
                                             profileImage.backgroundColor = .clear
-                                            Nexilis.shared.floating.show(queuePosition: .front, bannerPosition: .top, queue: NotificationBannerQueue(maxBannersOnScreenSimultaneously: 1), on: nil, edgeInsets: UIEdgeInsets(top: 8.0, left: 8.0, bottom: 0, right: 8.0), cornerRadius: 8.0, shadowColor: .clear, shadowOpacity: .zero, shadowBlurRadius: .zero, shadowCornerRadius: .zero, shadowOffset: .zero, shadowEdgeInsets: nil)
+                                            DigiX.shared.floating.show(queuePosition: .front, bannerPosition: .top, queue: NotificationBannerQueue(maxBannersOnScreenSimultaneously: 1), on: nil, edgeInsets: UIEdgeInsets(top: 8.0, left: 8.0, bottom: 0, right: 8.0), cornerRadius: 8.0, shadowColor: .clear, shadowOpacity: .zero, shadowBlurRadius: .zero, shadowCornerRadius: .zero, shadowOffset: .zero, shadowEdgeInsets: nil)
                                             return
                                         }
                                     }
@@ -432,7 +432,7 @@ class IncomingThread {
                             profileImage.backgroundColor = .lightGray
                             profileImage.tintColor = .white
                         }
-                        Nexilis.shared.floating.show(queuePosition: .front, bannerPosition: .top, queue: NotificationBannerQueue(maxBannersOnScreenSimultaneously: 1), on: nil, edgeInsets: UIEdgeInsets(top: 8.0, left: 8.0, bottom: 0, right: 8.0), cornerRadius: 8.0, shadowColor: .clear, shadowOpacity: .zero, shadowBlurRadius: .zero, shadowCornerRadius: .zero, shadowOffset: .zero, shadowEdgeInsets: nil)
+                        DigiX.shared.floating.show(queuePosition: .front, bannerPosition: .top, queue: NotificationBannerQueue(maxBannersOnScreenSimultaneously: 1), on: nil, edgeInsets: UIEdgeInsets(top: 8.0, left: 8.0, bottom: 0, right: 8.0), cornerRadius: 8.0, shadowColor: .clear, shadowOpacity: .zero, shadowBlurRadius: .zero, shadowCornerRadius: .zero, shadowOffset: .zero, shadowEdgeInsets: nil)
                     })
                 }
             }
@@ -448,7 +448,7 @@ class IncomingThread {
                     if cursor.next() {
                         err_code = "00"
                     }
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.getInquiry(message_id: message_id, error_code: err_code, data: message_id))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.getInquiry(message_id: message_id, error_code: err_code, data: message_id))
                     cursor.close()
                 }
             })
@@ -493,10 +493,10 @@ class IncomingThread {
     }
     
     private func endCall(message: TMessage) {
-        if let call = Nexilis.shared.callManager.call(with: message.mPIN) {
+        if let call = DigiX.shared.callManager.call(with: message.mPIN) {
             call.isReceiveEnd = true
             DispatchQueue.main.async {
-                Nexilis.shared.callManager.end(call: call)
+                DigiX.shared.callManager.end(call: call)
             }
         }
         ack(message: message)
@@ -504,17 +504,17 @@ class IncomingThread {
     
     private func onApproveForm(message: TMessage) {
         if let me = UserDefaults.standard.string(forKey: "me") {
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: me))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: me))
         }
         ack(message: message)
     }
     
     private func handleCallCenter(message: TMessage) -> Void {
-        if let delegate = Nexilis.shared.messageDelegate {
+        if let delegate = DigiX.shared.messageDelegate {
             delegate.onReceive(message: message)
         }
         if let packetId = message.mBodies[CoreMessage_TMessageKey.PACKET_ID], (message.getCode() == CoreMessage_TMessageCode.PUSH_CALL_CENTER || message.getCode() == CoreMessage_TMessageCode.PUSH_SECOND_CONTACT_CENTER) {
-            _ = Nexilis.responseString(packetId: packetId, message: "00")
+            _ = DigiX.responseString(packetId: packetId, message: "00")
         }
         ack(message: message)
         // TODO: notif call center
@@ -529,7 +529,7 @@ class IncomingThread {
                 "ex_block" : block
             ], _where: "f_pin = '\(l_pin)'")
         })
-        if let delegate = Nexilis.shared.personInfoDelegate {
+        if let delegate = DigiX.shared.personInfoDelegate {
             var object = [String:String]()
             let encoder = JSONEncoder()
             object["l_pin"] = l_pin
@@ -541,14 +541,14 @@ class IncomingThread {
     }
     
     private func deleteComment(message: TMessage) -> Void {
-        if let delegate = Nexilis.shared.commentDelegate {
+        if let delegate = DigiX.shared.commentDelegate {
             delegate.onDeleteComment(message: message)
         }
         ack(message: message)
     }
     
     private func receiveComment(message: TMessage) -> Void {
-        if let delegate = Nexilis.shared.commentDelegate {
+        if let delegate = DigiX.shared.commentDelegate {
             delegate.onReceiveComment(message: message)
         }
         ack(message: message)
@@ -556,7 +556,7 @@ class IncomingThread {
     
     private func sendUpdateTyping(message: TMessage) -> Void {
         //print(("update typing \(message)")
-        if let delegate = Nexilis.shared.messageDelegate {
+        if let delegate = DigiX.shared.messageDelegate {
             delegate.onTyping(message: message)
         }
         ack(message: message)
@@ -589,7 +589,7 @@ class IncomingThread {
                     "read_receipts" : "4"
                 ], _where: "message_id = \(messageId)")
             }
-            if let delegate = Nexilis.shared.messageDelegate {
+            if let delegate = DigiX.shared.messageDelegate {
                 delegate.onMessage(message: message)
             }
         })
@@ -605,7 +605,7 @@ class IncomingThread {
         
         var data = Data(media)
         
-        if !key_filename.isEmpty, data.count == 0, let download = Nexilis.getDownload(forKey: key_filename) {
+        if !key_filename.isEmpty, data.count == 0, let download = DigiX.getDownload(forKey: key_filename) {
             //print(("corrupted...", key_filename)
             if let delegate = download.delegate {
                 delegate.onDownloadProgress(fileName: key_filename, progress: -1)
@@ -616,7 +616,7 @@ class IncomingThread {
         }
         
         if media.count > 0 {
-            if key_part_size > 0, let download = Nexilis.getDownload(forKey: key_filename) {
+            if key_part_size > 0, let download = DigiX.getDownload(forKey: key_filename) {
                 download.put(part: key_part_of, buffer: Data(media))
                 if download.size() == key_file_size {
                     data = download.remove()
@@ -637,7 +637,7 @@ class IncomingThread {
             let url = documentDir.appendingPathComponent(key_filename)
             //print(("write file \(url.path)")
             try data.write(to: url, options: .atomic)
-            if let download = Nexilis.getDownload(forKey: key_filename) {
+            if let download = DigiX.getDownload(forKey: key_filename) {
                 if let delegate = download.delegate {
                     delegate.onDownloadProgress(fileName: key_filename, progress: 100)
                 } else if let completion = download.onDownloadProgress {
@@ -646,7 +646,7 @@ class IncomingThread {
             }
         } catch {
             //print(error)
-            if let download = Nexilis.getDownload(forKey: key_filename) {
+            if let download = DigiX.getDownload(forKey: key_filename) {
                 if let delegate = download.delegate {
                     delegate.onDownloadProgress(fileName: key_filename, progress: -1)
                 } else if let completion = download.onDownloadProgress {
@@ -662,7 +662,7 @@ class IncomingThread {
         Database.shared.database?.inTransaction({ (fmdb, rollback) in
             _ = Database.shared.deleteRecord(fmdb: fmdb, table: "DISCUSSION_FORUM", _where: "chat_id = '\(chat_id)'")
         })
-        if let delegate = Nexilis.shared.groupDelegate {
+        if let delegate = DigiX.shared.groupDelegate {
             delegate.onTopic(code: message.getCode(), f_pin: message.getPIN(), topicId: chat_id)
         }
         ack(message: message)
@@ -675,7 +675,7 @@ class IncomingThread {
                 "title" : message.getBody(key: CoreMessage_TMessageKey.TITLE)
             ], _where: "chat_id = '\(chat_id)'")
         })
-        if let delegate = Nexilis.shared.groupDelegate {
+        if let delegate = DigiX.shared.groupDelegate {
             delegate.onTopic(code: message.getCode(), f_pin: message.getPIN(), topicId: chat_id)
         }
         ack(message: message)
@@ -738,7 +738,7 @@ class IncomingThread {
         Database.shared.database?.inTransaction({ (fmdb, rollback) in
             _ = Database.shared.updateRecord(fmdb: fmdb, table: "GROUPZ", cvalues: cvalues, _where: "group_id = '\(group_id)'")
         })
-        if let delegate = Nexilis.shared.groupDelegate {
+        if let delegate = DigiX.shared.groupDelegate {
             delegate.onGroup(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id)
         }
         ack(message: message)
@@ -802,7 +802,7 @@ class IncomingThread {
                 _ = Database.shared.deleteRecord(fmdb: fmdb, table: "GROUPZ_MEMBER", _where: "group_id = '\(group_id)' and f_pin = '\(f_pin)'")
             })
         }
-        if let delegate = Nexilis.shared.groupDelegate {
+        if let delegate = DigiX.shared.groupDelegate {
             delegate.onMember(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id, member: f_pin)
         }
         ack(message: message)
@@ -817,7 +817,7 @@ class IncomingThread {
                 "position" : position
             ], _where: "group_id = '\(group_id)' and f_pin = '\(f_pin)'")
         })
-        if let delegate = Nexilis.shared.groupDelegate {
+        if let delegate = DigiX.shared.groupDelegate {
             delegate.onMember(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id, member: f_pin)
         }
         ack(message: message)
@@ -849,7 +849,7 @@ class IncomingThread {
                                     "created_date" : CoreMessage_TMessageUtil.getString(json: json, key: CoreMessage_TMessageKey.CREATED_DATE)
                                 ], replace: true)
                             }
-                            if let delegate = Nexilis.shared.groupDelegate {
+                            if let delegate = DigiX.shared.groupDelegate {
                                 delegate.onMember(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id, member: "")
                             }
                             ack(message: message)
@@ -881,7 +881,7 @@ class IncomingThread {
                             "created_date" : message.getBody(key: CoreMessage_TMessageKey.CREATED_DATE)
                         ], replace: true)
                         if result > 0 {
-                            if let delegate = Nexilis.shared.groupDelegate {
+                            if let delegate = DigiX.shared.groupDelegate {
                                 delegate.onMember(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id, member: f_pin)
                             }
                             self.listPushGroupMember.remove(at: 0)
@@ -930,7 +930,7 @@ class IncomingThread {
                                 "materi_edu" : CoreMessage_TMessageUtil.getString(json: json, key: CoreMessage_TMessageKey.MATERI_EDU),
                                 "is_education" : CoreMessage_TMessageUtil.getString(json: json, key: CoreMessage_TMessageKey.IS_EDUCATION)
                             ], replace: true)
-                            if let delegate = Nexilis.shared.groupDelegate {
+                            if let delegate = DigiX.shared.groupDelegate {
                                 delegate.onGroup(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id)
                             }
                         }
@@ -967,7 +967,7 @@ class IncomingThread {
                         "is_education" : message.getBody(key: CoreMessage_TMessageKey.IS_EDUCATION)
                     ], replace: true)
                     if result > 0 {
-                        if let delegate = Nexilis.shared.groupDelegate {
+                        if let delegate = DigiX.shared.groupDelegate {
                             delegate.onGroup(code: message.getCode(), f_pin: message.getPIN(), groupId: group_id)
                         }
                         ack(message: message)
@@ -1090,14 +1090,14 @@ class IncomingThread {
             Download().start(forKey: thumb_id) { (file, progress) in
                 print ("masuk download \(progress)")
                 if(progress == 100) {
-                    Nexilis.saveMessage(message: message, withStatus: false)
+                    DigiX.saveMessage(message: message, withStatus: false)
                     //print(("save message incoming")
                 }
             }
             ack(message: message)
             return
         }
-        Nexilis.saveMessage(message: message, withStatus: false)
+        DigiX.saveMessage(message: message, withStatus: false)
         //print(("save message incoming")
         ack(message: message)
     }
@@ -1108,8 +1108,8 @@ class IncomingThread {
             //print(("App not ready!!! skip receive message \(message_id)")
             return
         }
-        Nexilis.updateMessageStatus(message: message)
-        if let delegate = Nexilis.shared.messageDelegate {
+        DigiX.updateMessageStatus(message: message)
+        if let delegate = DigiX.shared.messageDelegate {
             delegate.onMessage(message: message)
         }
         ack(message: message)
@@ -1120,7 +1120,7 @@ class IncomingThread {
         guard !fileName.isEmpty else {
             return
         }
-        guard let upload = Nexilis.getUploadFile(forKey: fileName) else {
+        guard let upload = DigiX.getUploadFile(forKey: fileName) else {
             return
         }
         upload.uploadGroup.leave()
@@ -1211,7 +1211,7 @@ class IncomingThread {
                         UserDefaults.standard.setValue(cursorUser.string(forColumnIndex: 0), forKey: "me")
                         cursorUser.close()
                     }
-                    if let delegate = Nexilis.shared.personInfoDelegate {
+                    if let delegate = DigiX.shared.personInfoDelegate {
                         delegate.onUpdatePersonInfo(state: 99, message: "update_buddy")
                     }
                     ack(message: message)
@@ -1235,7 +1235,7 @@ class IncomingThread {
                     _ = Database.shared.deleteRecord(fmdb: fmdb, table: "POST", _where: "author_f_pin='\(l_pin)'")
                     cursor.close()
                     //print(("Buddy deleted: \(l_pin)")
-                    if let delegate = Nexilis.shared.personInfoDelegate {
+                    if let delegate = DigiX.shared.personInfoDelegate {
                         delegate.onUpdatePersonInfo(state: 99, message: "delete_buddy,\(l_pin)")
                     }
                 }
@@ -1326,12 +1326,12 @@ class IncomingThread {
                         let startTimeCC = UserDefaults.standard.string(forKey: "startTimeCC") ?? ""
                         let date = "\(Date().currentTimeMillis())"
                         if officer == idMe {
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
                         } else {
                             if requester == idMe {
-                                _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
+                                _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
                             } else {
-                                _ = Nexilis.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
+                                _ = DigiX.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
                             }
                         }
                         _ = try Database.shared.insertRecord(fmdb: fmdb, table: "CALL_CENTER_HISTORY", cvalues: [
@@ -1504,7 +1504,7 @@ class IncomingThread {
                             "client_thumb":CoreMessage_TMessageUtil.getString(json: json, key: CoreMessage_TMessageKey.THUMBNAIL_CLIENT)
                         ], replace: true)
                         if isDelegate {
-                            if let delegate = Nexilis.shared.groupDelegate {
+                            if let delegate = DigiX.shared.groupDelegate {
                                 delegate.onTopic(code: message.getCode(), f_pin: message.getPIN(), topicId: chat_id)
                             }
                         }
@@ -1534,7 +1534,7 @@ class IncomingThread {
                     line_processed = line_processed + 1
                     process(message: message)
                     let progress = line_processed * 100 / line_count
-                    if let delegate = Nexilis.shared.loginDelegate {
+                    if let delegate = DigiX.shared.loginDelegate {
                         delegate.onProgress(code: message.getCode(), progress: progress)
                     }
                 }
@@ -1544,7 +1544,7 @@ class IncomingThread {
             }
             if isSuccess {
                 response.mBodies[CoreMessage_TMessageKey.ERRCOD] = "00"
-                if let delegate = Nexilis.shared.loginDelegate {
+                if let delegate = DigiX.shared.loginDelegate {
                     delegate.onProgress(code: message.getCode(), progress: 100)
                 }
                 UserDefaults.standard.set("READY", forKey: "status")
@@ -1554,10 +1554,10 @@ class IncomingThread {
             response.mBodies[CoreMessage_TMessageKey.ERRCOD] = "Media not found"
         }
         if let packetId = message.mBodies[CoreMessage_TMessageKey.PACKET_ID] {
-            _ = Nexilis.response(packetId: packetId, message: response)
+            _ = DigiX.response(packetId: packetId, message: response)
             if isSuccess {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.getVersionCheck())
-                Nexilis.initFollowing()
+                _ = DigiX.write(message: CoreMessage_TMessageBank.getVersionCheck())
+                DigiX.initFollowing()
             }
         }
         ack(message: message)
@@ -1566,7 +1566,7 @@ class IncomingThread {
     private func getLiveVideoList(message: TMessage) -> Void {
         let data  = message.getBody(key: CoreMessage_TMessageKey.DATA)
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onStartLS(state: 99, message: data)
         }
         ack(message: message)
@@ -1574,7 +1574,7 @@ class IncomingThread {
     private func getLSTitle(message: TMessage) -> Void {
         let title  = message.getBody(key: CoreMessage_TMessageKey.TITLE)
         //print(title)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 999, message: title)
         }
         ack(message: message)
@@ -1594,7 +1594,7 @@ class IncomingThread {
         let latitude = message.getBody(key: CoreMessage_TMessageKey.LATITUDE)
         let last_loc_update = message.getBody(key: CoreMessage_TMessageKey.LAST_LOC_UPDATE)
         let user_type = message.getBody(key: CoreMessage_TMessageKey.USER_TYPE)
-        if let delegate = Nexilis.shared.personInfoDelegate {
+        if let delegate = DigiX.shared.personInfoDelegate {
             //print(("INcoming \(connected)")
             delegate.onUpdatePersonInfo(state: 00, message: connected)
         }
@@ -1615,7 +1615,7 @@ class IncomingThread {
     }
     
     private func ack(message: TMessage) -> Void {
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getAcknowledgment(p_id: message.mStatus))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getAcknowledgment(p_id: message.mStatus))
     }
     
     private func joinLivevideo(message: TMessage) -> Void {
@@ -1626,7 +1626,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = broadcaster+","+f_pin+","+thumb_id+","+name+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 98, message: data)
         }
         ack(message: message)
@@ -1640,7 +1640,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = broadcaster+","+f_pin+","+thumb_id+","+name+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 97, message: data)
         }
         ack(message: message)
@@ -1651,7 +1651,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = l_pin+","+likes+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 96, message: data)
         }
         ack(message: message)
@@ -1665,7 +1665,7 @@ class IncomingThread {
         let messages = message.getBody(key: CoreMessage_TMessageKey.MESSAGE_TEXT,default_value: "")
         let data = l_pin+","+f_pin+","+thumb_id+","+name+","+messages
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 95, message: data)
         }
         ack(message: message)
@@ -1676,7 +1676,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = l_pin+","+likes+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.streamingDelagate {
+        if let delegate = DigiX.shared.streamingDelagate {
             delegate.onJoinLS(state: 94, message: data)
         }
         ack(message: message)
@@ -1689,7 +1689,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = broadcaster+","+f_pin+","+thumb_id+","+name+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onJoinSeminar(state: 98, message: data)
         }
         ack(message: message)
@@ -1702,7 +1702,7 @@ class IncomingThread {
         let quantity = message.getBody(key: CoreMessage_TMessageKey.QUANTITY,default_value: "")
         let data = broadcaster+","+f_pin+","+thumb_id+","+name+","+quantity
         //print(data)
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onJoinSeminar(state: 97, message: data)
         }
         ack(message: message)
@@ -1713,7 +1713,7 @@ class IncomingThread {
         let status = message.getBody(key: CoreMessage_TMessageKey.STATUS,default_value: "")
         let data = f_pin+","+l_pin+","+status
         //print(data)
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onJoinSeminar(state: 96, message: data)
         }
         ack(message: message)
@@ -1727,7 +1727,7 @@ class IncomingThread {
         let messages = message.getBody(key: CoreMessage_TMessageKey.MESSAGE_TEXT,default_value: "")
         let data = l_pin+","+f_pin+","+thumb_id+","+name+","+messages
         //print(data)
-        if let delegate = Nexilis.shared.seminarDelegate {
+        if let delegate = DigiX.shared.seminarDelegate {
             delegate.onJoinSeminar(state: 95, message: data)
         }
         ack(message: message)
@@ -1740,7 +1740,7 @@ class IncomingThread {
         //print(data)
         //print(l_pin)
         //print(state)
-        if let delegate = Nexilis.shared.screenSharingDelegate {
+        if let delegate = DigiX.shared.screenSharingDelegate {
             delegate.onJoinScreenSharing(state: state, message: data)
         }
         ack(message: message)
@@ -1751,11 +1751,11 @@ class IncomingThread {
         let data = errcod
         //print(data)
         if (errcod == "00"){
-            if let delegate = Nexilis.shared.loginDelegate {
+            if let delegate = DigiX.shared.loginDelegate {
                 delegate.onProcess(message: "Success", status: "1")
             }
         } else {
-            if let delegate = Nexilis.shared.loginDelegate {
+            if let delegate = DigiX.shared.loginDelegate {
                 delegate.onProcess(message: "Failed", status: "0")
             }
         }
@@ -1774,16 +1774,16 @@ class IncomingThread {
                 let thumb_id = message.getBody(key: CoreMessage_TMessageKey.THUMB_ID, default_value: "")
                 let data = f_pin+"|"+f_name+"|"+l_name+"|"+thumb_id
                 //print(data)
-                if let delegate = Nexilis.shared.loginDelegate {
+                if let delegate = DigiX.shared.loginDelegate {
                     delegate.onProcess(message: data, status: reg_status)
                 }
             } else {
-                if let delegate = Nexilis.shared.loginDelegate {
+                if let delegate = DigiX.shared.loginDelegate {
                     delegate.onProcess(message: "Signup", status: reg_status)
                 }
             }
         } else {
-            if let delegate = Nexilis.shared.loginDelegate {
+            if let delegate = DigiX.shared.loginDelegate {
                 delegate.onProcess(message: "Wrong OTP", status: errcod)
             }
         }
@@ -1794,11 +1794,11 @@ class IncomingThread {
         if (message.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "00") == "00") {
             let f_pin = message.getBody(key: CoreMessage_TMessageKey.F_PIN, default_value: "00")
             UserDefaults.standard.set(f_pin, forKey: "me")
-            if let delegate = Nexilis.shared.loginDelegate {
+            if let delegate = DigiX.shared.loginDelegate {
                 delegate.onProcess(message: f_pin, status: message.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "00"))
             }
         } else {
-            if let delegate = Nexilis.shared.loginDelegate {
+            if let delegate = DigiX.shared.loginDelegate {
                 delegate.onProcess(message: "Failed", status: message.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "00"))
             }
         }
@@ -1983,7 +1983,7 @@ class IncomingThread {
                     if let me = UserDefaults.standard.string(forKey: "me"), me == message.mPIN, !cvalues.isEmpty {
                         let update = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: cvalues, _where: "f_pin = '\(message.mPIN)'")
                         if(update > 0){
-                            if let delegate = Nexilis.shared.personInfoDelegate {
+                            if let delegate = DigiX.shared.personInfoDelegate {
                                 if (!thumb_id.isEmpty){
                                     delegate.onUpdatePersonInfo(state: 6, message: thumb_id)
                                 }
@@ -1992,7 +1992,7 @@ class IncomingThread {
                     } else if !cvalues.isEmpty {
                         let update = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: cvalues, _where: "f_pin = '\(message.mPIN)'")
                         if(update > 0){
-                            if let delegate = Nexilis.shared.personInfoDelegate {
+                            if let delegate = DigiX.shared.personInfoDelegate {
                                 if (!thumb_id.isEmpty){
                                     delegate.onUpdatePersonInfo(state: 5, message: thumb_id)
                                 }
@@ -2003,7 +2003,7 @@ class IncomingThread {
             })
             ack(message: message)
         }
-        if let delegate = Nexilis.shared.personInfoDelegate {
+        if let delegate = DigiX.shared.personInfoDelegate {
             if(!connected.isEmpty){
                 delegate.onUpdatePersonInfo(state: 55, message:connected)
             }else{

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/InquiryThread.swift

@@ -122,8 +122,8 @@ class InquiryThread {
      */
     
     private func mobileInquiry(message: TMessage) {
-        Nexilis.saveMessage(message: message)
+        DigiX.saveMessage(message: message)
         //print(("save message sendChat")
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getMobileInquiry(message_id: message.getBody(key: CoreMessage_TMessageKey.MESSAGE_ID)))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getMobileInquiry(message_id: message.getBody(key: CoreMessage_TMessageKey.MESSAGE_ID)))
     }
 }

+ 10 - 10
appbuilder-ios/DigiXLite/DigiXLite/Source/Network.swift

@@ -33,7 +33,7 @@ public class Network {
                     let fileName = (path as NSString).lastPathComponent
                     //print(("file exists: \(path) -> \(fileSize)")
                     if (fileSize > self.CHUNK_SIZE) {
-                        Nexilis.putUploadFile(forKey: fileName, uploader: self)
+                        DigiX.putUploadFile(forKey: fileName, uploader: self)
                         //print(("[bytes_processing] Size: " + String(fileSize))
                         var totalPart = fileSize / self.CHUNK_SIZE
                         if (fileSize % self.CHUNK_SIZE > 0) {
@@ -54,7 +54,7 @@ public class Network {
                                 
                                 let message = CoreMessage_TMessageBank.getUploadFile(p_image_id: fileName, file_size: String(fileSize), part_of: String(index), part_size: String(totalPart), p_file: [UInt8] (data))
                                 
-                                if let response = Nexilis.write(message: message), response.isEmpty {
+                                if let response = DigiX.write(message: message), response.isEmpty {
                                     completion(false, self.progress)
                                     break
                                 }
@@ -64,7 +64,7 @@ public class Network {
                                 //print(("[bytes_processing] part #" + String(index + 1) + " of " + String(totalPart) + " wait!", wait)
                                 if wait == DispatchTimeoutResult.timedOut {
                                     completion(false, self.progress)
-                                    Nexilis.removeUploadFile(forKey: fileName)
+                                    DigiX.removeUploadFile(forKey: fileName)
                                     self.uploadGroup.leave()
                                     break
                                 }
@@ -76,7 +76,7 @@ public class Network {
                                 index = index + 1
                             }
                             outputFileHandle.closeFile()
-                            _ = Nexilis.removeUploadFile(forKey: fileName)
+                            _ = DigiX.removeUploadFile(forKey: fileName)
                         } catch {
                             //print(error.localizedDescription)
                         }
@@ -86,7 +86,7 @@ public class Network {
                         
                         let message = CoreMessage_TMessageBank.getUploadFile(p_image_id: fileName, file_size: String(fileSize), part_of: "0", part_size: "0", p_file: [UInt8] (data))
                         
-                        guard let response = Nexilis.write(message: message), !response.isEmpty else {
+                        guard let response = DigiX.write(message: message), !response.isEmpty else {
                             completion(false, self.progress)
                             return
                         }
@@ -113,7 +113,7 @@ public class Network {
                     let fileName = (path as NSString).lastPathComponent
                     //print(("file exists: \(path) -> \(fileSize)")
                     if (fileSize > self.CHUNK_SIZE) {
-                        Nexilis.putUploadFile(forKey: fileName, uploader: self)
+                        DigiX.putUploadFile(forKey: fileName, uploader: self)
                         //print(("[bytes_processing] Size: " + String(fileSize))
                         var totalPart = fileSize / self.CHUNK_SIZE
                         if (fileSize % self.CHUNK_SIZE > 0) {
@@ -134,7 +134,7 @@ public class Network {
                                 
                                 let message = CoreMessage_TMessageBank.getUploadFile(p_image_id: fileName, file_size: String(fileSize), part_of: String(index), part_size: String(totalPart), p_file: [UInt8] (data))
                                 
-                                if let response = Nexilis.write(message: message), response.isEmpty {
+                                if let response = DigiX.write(message: message), response.isEmpty {
                                     completion(false, self.progress)
                                     break
                                 }
@@ -144,7 +144,7 @@ public class Network {
                                 //print(("[bytes_processing] part #" + String(index + 1) + " of " + String(totalPart) + " wait!", wait)
                                 if wait == DispatchTimeoutResult.timedOut {
                                     completion(false, self.progress)
-                                    Nexilis.removeUploadFile(forKey: fileName)
+                                    DigiX.removeUploadFile(forKey: fileName)
                                     self.uploadGroup.leave()
                                     break
                                 }
@@ -156,7 +156,7 @@ public class Network {
                                 index = index + 1
                             }
                             outputFileHandle.closeFile()
-                            _ = Nexilis.removeUploadFile(forKey: fileName)
+                            _ = DigiX.removeUploadFile(forKey: fileName)
                         } catch {
                             //print(error.localizedDescription)
                         }
@@ -166,7 +166,7 @@ public class Network {
                         
                         let message = CoreMessage_TMessageBank.getUploadFile(p_image_id: fileName, file_size: String(fileSize), part_of: "0", part_size: "0", p_file: [UInt8] (data))
                         
-                        guard let response = Nexilis.write(message: message), !response.isEmpty else {
+                        guard let response = DigiX.write(message: message), !response.isEmpty else {
                             completion(false, self.progress)
                             return
                         }

+ 7 - 7
appbuilder-ios/DigiXLite/DigiXLite/Source/OutgoingThread.swift

@@ -150,11 +150,11 @@ class OutgoingThread {
                         } catch {}
                         Network().upload(name: fileName) { (result, progress) in
                             if result {
-                                if let delegate = Nexilis.shared.messageDelegate {
+                                if let delegate = DigiX.shared.messageDelegate {
                                     delegate.onUpload(name: fileName, progress: progress)
                                 }
                                 if progress == 100 {
-                                    if let response = Nexilis.writeSync(message: message) {
+                                    if let response = DigiX.writeSync(message: message) {
                                         //print(("sendChat", response.toLogString())
                                         let messageId = response.getBody(key: CoreMessage_TMessageKey.MESSAGE_ID)
                                         Database.shared.database?.inTransaction({ (fmdb, rollback) in
@@ -176,11 +176,11 @@ class OutgoingThread {
             } else {
                 Network().upload(name: fileName) { (result, progress) in
                     if result {
-                        if let delegate = Nexilis.shared.messageDelegate {
+                        if let delegate = DigiX.shared.messageDelegate {
                             delegate.onUpload(name: fileName, progress: progress)
                         }
                         if progress == 100 {
-                            if let response = Nexilis.writeSync(message: message) {
+                            if let response = DigiX.writeSync(message: message) {
                                 //print(("sendChat", response.toLogString())
                                 let messageId = response.getBody(key: CoreMessage_TMessageKey.MESSAGE_ID)
                                 Database.shared.database?.inTransaction({ (fmdb, rollback) in
@@ -199,7 +199,7 @@ class OutgoingThread {
                 }
             }
         } else {
-            if let response = Nexilis.writeSync(message: message) {
+            if let response = DigiX.writeSync(message: message) {
                 //print(("sendChat", response.toLogString())
                 let messageId = response.getBody(key: CoreMessage_TMessageKey.MESSAGE_ID)
                 Database.shared.database?.inTransaction({ (fmdb, rollback) in
@@ -234,12 +234,12 @@ class OutgoingThread {
                     "credential" : "0",
                     "read_receipts" : "4"
                 ], _where: "message_id = '\(messageId)'")
-                if let package = Nexilis.write(message: message) {
+                if let package = DigiX.write(message: message) {
                     _ = Database.shared.updateRecord(fmdb: fmdb, table: "OUTGOING", cvalues: [
                         "package" : package
                     ], _where: "id = '\(messageId)'")
                 }
-                if let delegate = Nexilis.shared.messageDelegate {
+                if let delegate = DigiX.shared.messageDelegate {
                     delegate.onMessage(message: message)
                 }
             } else {

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/TMessage.swift

@@ -35,7 +35,7 @@ public class TMessage {
     
     public init() {
         mVersion = "1.0.107"
-        mBodies[CoreMessage_TMessageKey.IMEI] = Nexilis.getCLMUserId()
+        mBodies[CoreMessage_TMessageKey.IMEI] = DigiX.getCLMUserId()
 //        mBodies[CoreMessage_TMessageKey.VERCOD] = UIApplication.appVersion
         mBodies[CoreMessage_TMessageKey.VERCOD] = "1.0.220216"
     }
@@ -53,7 +53,7 @@ public class TMessage {
         mL_PIN = l_pin
         mBodies = bodies
         mMedia = media
-        mBodies[CoreMessage_TMessageKey.IMEI] = Nexilis.getCLMUserId()
+        mBodies[CoreMessage_TMessageKey.IMEI] = DigiX.getCLMUserId()
 //        mBodies[CoreMessage_TMessageKey.VERCOD] = UIApplication.appVersion
         mBodies[CoreMessage_TMessageKey.VERCOD] = "1.0.220216"
     }

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/BNIView/BNIBookingWebView.swift

@@ -79,7 +79,7 @@ class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScrollViewDel
                 return
             }
             DispatchQueue.global().async {
-                let _ = Nexilis.writeSync(message: CoreMessage_TMessageBank.queueBNI(service_id: param1), timeout: 30 * 1000)
+                let _ = DigiX.writeSync(message: CoreMessage_TMessageBank.queueBNI(service_id: param1), timeout: 30 * 1000)
             }
         }
     }

+ 3 - 3
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/AudioViewController.swift

@@ -75,7 +75,7 @@ class AudioViewController: UIViewController {
             })
             
             if isOutgoing {
-                Nexilis.shared.callManager.startCall(handle: pin)
+                DigiX.shared.callManager.startCall(handle: pin)
             }
         }
     }
@@ -103,8 +103,8 @@ class AudioViewController: UIViewController {
     
     @objc func didEnd(sender: AnyObject?) {
         //print(("didEnd:\(pin)")
-        if let pin = self.pin, let call = Nexilis.shared.callManager.call(with: pin) {
-            Nexilis.shared.callManager.end(call: call)
+        if let pin = self.pin, let call = DigiX.shared.callManager.call(with: pin) {
+            DigiX.shared.callManager.end(call: call)
             if isOutgoing {
                 navigationController?.popViewController(animated: true)
             } else {

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/CallProviderDelegate.swift

@@ -85,7 +85,7 @@ extension CallProviderDelegate: CXProviderDelegate {
         //print(("JUMLAH START CALL \(self.callManager.calls.count)")
         self.callManager.addCall(call)
         if self.callManager.calls.count > 1 {
-            Nexilis.shared.callManager.startGroupCall(uuid1: call.uuid)
+            DigiX.shared.callManager.startGroupCall(uuid1: call.uuid)
             API.initiateCCall(sParty: call.handle)
         }
     }
@@ -141,7 +141,7 @@ extension CallProviderDelegate: CXProviderDelegate {
             API.terminateCall(sParty: nil)
             DispatchQueue.global().async {
                 if let pin = call.handle {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.endCall(pin: pin))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.endCall(pin: pin))
                 }
             }
         }

+ 10 - 10
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraAudioConference.swift

@@ -293,7 +293,7 @@ class QmeraAudioConference: UIViewController {
             let onGoingCC = UserDefaults.standard.string(forKey: "onGoingCC") ?? ""
             if !onGoingCC.isEmpty {
                 DispatchQueue.global().async {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "1"))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "1"))
                 }
                 DispatchQueue.main.async {
                     self.isAddCall = user.pin
@@ -301,7 +301,7 @@ class QmeraAudioConference: UIViewController {
             } else {
                 self.users.append(user)
                 // Start Calling
-                Nexilis.shared.callManager.startCall(handle: user.pin)
+                DigiX.shared.callManager.startCall(handle: user.pin)
             }
         }
         controller.selectedUser.append(contentsOf: users)
@@ -374,23 +374,23 @@ class QmeraAudioConference: UIViewController {
                         }
                     })
                     if requester == idMe {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
                     } else {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
                     }
                     UserDefaults.standard.removeObject(forKey: "onGoingCC")
                     UserDefaults.standard.removeObject(forKey: "membersCC")
                     UserDefaults.standard.removeObject(forKey: "startTimeCC")
                     UserDefaults.standard.removeObject(forKey: "waitingRequestCC")
                 }
-//                if let user = self.user, let call = Nexilis.shared.callManager.call(with: user.pin) {
-//                    Nexilis.shared.callManager.end(call: call)
+//                if let user = self.user, let call = DigiX.shared.callManager.call(with: user.pin) {
+//                    DigiX.shared.callManager.end(call: call)
 //                }
             }))
             self.present(alert, animated: true, completion: nil)
         } else {
-//            if let user = self.user, let call = Nexilis.shared.callManager.call(with: user.pin) {
-//                Nexilis.shared.callManager.end(call: call)
+//            if let user = self.user, let call = DigiX.shared.callManager.call(with: user.pin) {
+//                DigiX.shared.callManager.end(call: call)
 //            }
             dismiss(animated: false, completion: nil)
         }
@@ -486,14 +486,14 @@ class QmeraAudioConference: UIViewController {
                     checkParticipant(fPin: String(arrayMessage[1]))
                 } else {
                     if isOutgoing {
-                        Nexilis.addFriend(fpin: String(arrayMessage[1])) { result in
+                        DigiX.addFriend(fpin: String(arrayMessage[1])) { result in
                             if result {
                                 self.checkParticipant(fPin: String(arrayMessage[1]))
                             }
                         }
                     } else {
                         DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1, execute: {
-                            Nexilis.addFriend(fpin: String(arrayMessage[1])) { result in
+                            DigiX.addFriend(fpin: String(arrayMessage[1])) { result in
                                 if result {
                                     self.checkParticipant(fPin: String(arrayMessage[1]))
                                 }

+ 16 - 16
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraAudioViewController.swift

@@ -203,7 +203,7 @@ class QmeraAudioViewController: UIViewController {
     }()
     
     let qmeraLogo: UIButton = {
-        let image = UIImage(named: "Q-Button-PNG", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        let image = UIImage(named: "Q-Button-PNG", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         let button = UIButton()
         button.setImage(image, for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
@@ -216,7 +216,7 @@ class QmeraAudioViewController: UIViewController {
     }()
     
     let nexilisLogo: UIButton = {
-        let image = UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        let image = UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         let button = UIButton()
         button.setImage(image, for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
@@ -276,14 +276,14 @@ class QmeraAudioViewController: UIViewController {
             if isOutgoing && ticketId.isEmpty {
 //                let onGoingCC = UserDefaults.standard.string(forKey: "onGoingCC") ?? ""
 //                if onGoingCC.isEmpty {
-//                    Nexilis.shared.callManager.startCall(handle: u.pin)
+//                    DigiX.shared.callManager.startCall(handle: u.pin)
 //                } else {
                     API.initiateCCall(sParty: u.pin)
 //                }
             } else if !ticketId.isEmpty {
                 if isOutgoing {
                     API.ccs(sTicketID: ticketId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView, bCameraOn: false)
-                    if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getIncomingCallCS(f_pin_opposite: u.pin), timeout: 30 * 1000){
+                    if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getIncomingCallCS(f_pin_opposite: u.pin), timeout: 30 * 1000){
                         if response.mBodies[CoreMessage_TMessageKey.ERRCOD] != "01" {
                             self.didEnd(sender: true)
                         }
@@ -535,7 +535,7 @@ class QmeraAudioViewController: UIViewController {
         } else {
             UIDevice.current.isProximityMonitoringEnabled = true
         }
-        Nexilis.setSpeaker(isSpeaker)
+        DigiX.setSpeaker(isSpeaker)
     }
     
     @objc func didInvite(sender: Any?) {
@@ -544,7 +544,7 @@ class QmeraAudioViewController: UIViewController {
             let onGoingCC = UserDefaults.standard.string(forKey: "onGoingCC") ?? ""
             if !onGoingCC.isEmpty {
                 DispatchQueue.global().async {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "1"))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "1"))
                 }
                 DispatchQueue.main.async {
                     self.isAddCall = user.pin
@@ -552,7 +552,7 @@ class QmeraAudioViewController: UIViewController {
             } else {
                 self.users.append(user)
                 // Start Calling
-//                Nexilis.shared.callManager.startCall(handle: user.pin)
+//                DigiX.shared.callManager.startCall(handle: user.pin)
                 API.initiateCCall(sParty: user.pin)
             }
         }
@@ -663,12 +663,12 @@ class QmeraAudioViewController: UIViewController {
                         }
                     })
                     if officer == idMe {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
                     } else {
                         if requester == idMe {
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
                         } else {
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
                         }
                     }
                     UserDefaults.standard.removeObject(forKey: "onGoingCC")
@@ -676,8 +676,8 @@ class QmeraAudioViewController: UIViewController {
                     UserDefaults.standard.removeObject(forKey: "startTimeCC")
                     UserDefaults.standard.removeObject(forKey: "waitingRequestCC")
                 }
-//                if let user = self.user, let call = Nexilis.shared.callManager.call(with: user.pin) {
-//                    Nexilis.shared.callManager.end(call: call)
+//                if let user = self.user, let call = DigiX.shared.callManager.call(with: user.pin) {
+//                    DigiX.shared.callManager.end(call: call)
 //                } else {
                     API.terminateCall(sParty: nil)
 //                }
@@ -689,16 +689,16 @@ class QmeraAudioViewController: UIViewController {
                 controller!.dismiss(animated: true)
             }
             if isEndByMe {
-//                for i in 0..<Nexilis.shared.callManager.calls.count {
-//                    Nexilis.shared.callManager.end(call: Nexilis.shared.callManager.calls[i])
+//                for i in 0..<DigiX.shared.callManager.calls.count {
+//                    DigiX.shared.callManager.end(call: DigiX.shared.callManager.calls[i])
 //                }
                 API.terminateCall(sParty: nil)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
                     self.dismiss(animated: false, completion: nil)
                 }
             } else {
-//                if let user = self.user, let call = Nexilis.shared.callManager.call(with: user.pin) {
-//                    Nexilis.shared.callManager.end(call: call)
+//                if let user = self.user, let call = DigiX.shared.callManager.call(with: user.pin) {
+//                    DigiX.shared.callManager.end(call: call)
 //                } else {
                     API.terminateCall(sParty: nil)
 //                }

+ 6 - 6
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraCallContactViewController.swift

@@ -195,23 +195,23 @@ class QmeraCallContactViewController: UITableViewController {
             user = users[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 44, height: 44)
-        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
             content.image = image
         }
         if User.isOfficial(official_account: user.official ?? "") || User.isOfficialRegular(official_account: user.official ?? "") {
-            content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
+            content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
             
         } else if User.isVerified(official_account: user.official ?? "") {
-            content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+            content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
         }
         else if User.isInternal(userType: user.userType ?? "") {
-            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
+            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
         } else if User.isCallCenter(userType: user.userType ?? "") {
             let dataCategory = CategoryCC.getDataFromServiceId(service_id: user.ex_offmp!)
             if dataCategory != nil {
-                content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(user.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+                content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(user.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
             } else {
-                content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
+                content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(user.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
             }
         } else {
             content.text = user.fullName

+ 18 - 18
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/QmeraVideoViewController.swift

@@ -85,7 +85,7 @@ class QmeraVideoViewController: UIViewController {
     }()
     
     let qmeraLogo: UIButton = {
-        let image = UIImage(named: "Q-Button-PNG", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        let image = UIImage(named: "Q-Button-PNG", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         let button = UIButton()
         button.setImage(image, for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
@@ -98,7 +98,7 @@ class QmeraVideoViewController: UIViewController {
     }()
     
     let nexilisLogo: UIButton = {
-        let image = UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        let image = UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         let button = UIButton()
         button.setImage(image, for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
@@ -138,7 +138,7 @@ class QmeraVideoViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        Nexilis.setWhiteboardReceiver(receiver: self)
+        DigiX.setWhiteboardReceiver(receiver: self)
         self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black]
         let navBarAppearance = UINavigationBarAppearance()
         navBarAppearance.configureWithTransparentBackground()
@@ -216,10 +216,10 @@ class QmeraVideoViewController: UIViewController {
                 row["isOffline"] = ""
                 row["user_type"] = ""
                 dataPerson.append(row)
-//                if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddFriendQRCode(fpin: fPin)), response.isOk() {
+//                if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getAddFriendQRCode(fpin: fPin)), response.isOk() {
 //                    self.getDataProfile(fPin: fPin)
 //                }
-//                Nexilis.addFriend (fpin: "\(fPin)") { result in
+//                DigiX.addFriend (fpin: "\(fPin)") { result in
 //                    if result {
 //                        self.getDataProfile(fPin: fPin)
 //                    } else {
@@ -370,12 +370,12 @@ class QmeraVideoViewController: UIViewController {
         ])
         if isInisiator {
             labelIncomingOutgoing.text = "Outgoing video call".localized() + "..."
-//            Nexilis.startAudio()
+//            DigiX.startAudio()
             if ticketId.isEmpty {
                 API.initiateCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
             } else {
                 API.ccs(sTicketID: ticketId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView, bCameraOn: true)
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getIncomingCallCS(f_pin_opposite: users[0].pin), timeout: 30 * 1000){
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getIncomingCallCS(f_pin_opposite: users[0].pin), timeout: 30 * 1000){
                     if response.mBodies[CoreMessage_TMessageKey.ERRCOD] != "01" {
                         endAllCall()
                     }
@@ -469,7 +469,7 @@ class QmeraVideoViewController: UIViewController {
                 if(!self.wbRoomId.isEmpty){
                     DispatchQueue.main.async {
                         self.wbTimer.invalidate()
-                        _ = Nexilis.getWhiteboardDelegate()?.terminate()
+                        _ = DigiX.getWhiteboardDelegate()?.terminate()
                     }
                 }
                 self.endAllCall()
@@ -525,8 +525,8 @@ class QmeraVideoViewController: UIViewController {
     
     @objc func didTapAcceptCallButton() {
         if !isInisiator{
-            let goAudioCall = Nexilis.checkMicPermission()
-            let goVideoCall = Nexilis.checkCameraPermission()
+            let goAudioCall = DigiX.checkMicPermission()
+            let goVideoCall = DigiX.checkCameraPermission()
             if goVideoCall == 0 {
                 let alert = LibAlertController(title: "Attention!".localized(), message: !goAudioCall && goVideoCall == 0 ? "Please allow microphone & camera permission in your settings".localized() : !goAudioCall ? "Please allow microphone permission in your settings".localized() : "Please allow camera permission in your settings", preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -539,7 +539,7 @@ class QmeraVideoViewController: UIViewController {
             } else if goVideoCall == -1 {
                 return
             }
-//            Nexilis.startAudio()
+//            DigiX.startAudio()
             if ticketId.isEmpty {
                 API.receiveCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView,ivRemoteZ: zoomView)
             } else {
@@ -832,12 +832,12 @@ class QmeraVideoViewController: UIViewController {
                     }
                 })
                 if officer == idMe {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
                 } else {
                     if requester == idMe {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
                     } else {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
                     }
                 }
                 UserDefaults.standard.removeObject(forKey: "onGoingCC")
@@ -866,7 +866,7 @@ class QmeraVideoViewController: UIViewController {
             }
             self.isSpeaker = isSpeaker
         }
-        Nexilis.setSpeaker(isSpeaker)
+        DigiX.setSpeaker(isSpeaker)
     }
     
     @objc func didTapSpeakerButton(sender: AnyObject){
@@ -881,7 +881,7 @@ class QmeraVideoViewController: UIViewController {
                 let onGoingCC = UserDefaults.standard.string(forKey: "onGoingCC") ?? ""
                 if !onGoingCC.isEmpty {
                     DispatchQueue.global().async {
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: data["f_pin"]!!, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "2"))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: data["f_pin"]!!, ticket_id: onGoingCC.isEmpty ? "" : onGoingCC.components(separatedBy: ",")[2], channel: "2"))
                     }
                     DispatchQueue.main.async {
                         self.isAddCall = data["f_pin"]!!
@@ -1114,7 +1114,7 @@ class QmeraVideoViewController: UIViewController {
                             self.wbVC!.close?()
                         }
                         self.wbTimer.invalidate()
-                        _ = Nexilis.getWhiteboardDelegate()?.terminate()
+                        _ = DigiX.getWhiteboardDelegate()?.terminate()
                     }
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
                         self.endAllCall()
@@ -1155,7 +1155,7 @@ class QmeraVideoViewController: UIViewController {
                     self.wbTimer.invalidate()
                     self.vcTimer.invalidate()
                     self.labelTimerVC.text = "Video call is over".localized()
-                    _ = Nexilis.getWhiteboardDelegate()?.terminate()
+                    _ = DigiX.getWhiteboardDelegate()?.terminate()
                     let controller = self.presentedViewController
                     if controller != nil {
                         controller!.dismiss(animated: true)

+ 5 - 5
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/ScreenSharingViewController.swift

@@ -105,7 +105,7 @@ class ScreenSharingViewController: UIViewController {
         ])
         if fromContact == 0 {
             labelIncomingOutgoing.text = "Waiting for answer".localized() + "..."
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.ssCreate(l_pin: user!.pin))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.ssCreate(l_pin: user!.pin))
         } else {
             labelIncomingOutgoing.text = "Incoming Screen Sharing".localized() + "..."
         }
@@ -161,9 +161,9 @@ class ScreenSharingViewController: UIViewController {
         alert.addAction(UIAlertAction(title: "No".localized(), style: UIAlertAction.Style.default, handler: nil))
         alert.addAction(UIAlertAction(title: "Yes".localized(), style: UIAlertAction.Style.default, handler: {(_) in
             if self.fromContact == 0 {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.ssEnded(l_pin: self.user!.pin))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.ssEnded(l_pin: self.user!.pin))
             } else {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.ssReject(l_pin: self.user!.pin))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.ssReject(l_pin: self.user!.pin))
             }
             self.dismiss(animated: true, completion: nil)
         }))
@@ -171,7 +171,7 @@ class ScreenSharingViewController: UIViewController {
     }
     
     @objc func didTapAcceptCallButton() {
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.ssAccept(l_pin: user!.pin))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.ssAccept(l_pin: user!.pin))
         DispatchQueue.main.async {
             self.myImage.removeFromSuperview()
             self.name.removeFromSuperview()
@@ -198,7 +198,7 @@ class ScreenSharingViewController: UIViewController {
                 case CoreMessage_TMessageCode.SS_ACCEPT_INCOMING:
                     //print(("SS_ACCEPT_INCOMING")
                     let f_pin = message.getBody(key: CoreMessage_TMessageKey.F_USER_ID, default_value: "")
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.ssOffhook(l_pin: f_pin))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.ssOffhook(l_pin: f_pin))
                     DispatchQueue.main.async {
                         self.myImage.removeFromSuperview()
                         self.name.removeFromSuperview()

+ 7 - 7
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Call/WhiteboardViewController.swift

@@ -133,7 +133,7 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
         ])
         if fromContact == 0 {
             labelIncomingOutgoing.text = "Waiting for answer".localized() + "..."
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.wbCreate(l_pin: user!.pin))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.wbCreate(l_pin: user!.pin))
         } else {
             labelIncomingOutgoing.text = "Incoming Whiteboard".localized() + "..."
         }
@@ -189,9 +189,9 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
         alert.addAction(UIAlertAction(title: "No".localized(), style: UIAlertAction.Style.default, handler: nil))
         alert.addAction(UIAlertAction(title: "Yes".localized(), style: UIAlertAction.Style.default, handler: {(_) in
             if self.fromContact == 0 {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.wbEnded(l_pin: self.user!.pin))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.wbEnded(l_pin: self.user!.pin))
             } else {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.wbReject(l_pin: self.user!.pin))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.wbReject(l_pin: self.user!.pin))
             }
             self.dismiss(animated: true, completion: nil)
         }))
@@ -199,7 +199,7 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
     }
     
     @objc func didTapAcceptCallButton() {
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.wbAccept(l_pin: user!.pin))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.wbAccept(l_pin: user!.pin))
         self.myImage.removeFromSuperview()
         self.name.removeFromSuperview()
         self.profileImage.removeFromSuperview()
@@ -223,7 +223,7 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
                 case CoreMessage_TMessageCode.WB_ACCEPT_INCOMING:
                     ////print(("WB_ACCEPT_INCOMING")
                     let f_pin = message.getBody(key: CoreMessage_TMessageKey.F_USER_ID, default_value: "")
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.wbOffhook(l_pin: f_pin))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.wbOffhook(l_pin: f_pin))
                     DispatchQueue.main.async {
                         self.myImage.removeFromSuperview()
                         self.name.removeFromSuperview()
@@ -294,7 +294,7 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
 //        NSLayoutConstraint.activate([wbcConstraintTop, wbcConstraintBottom, wbcConstraintLeft, wbcConstraintRight])
         wb?.canvas = wbc
         self.view.addSubview(wbc!)
-        Nexilis.setWhiteboardDelegate(delegate: self)
+        DigiX.setWhiteboardDelegate(delegate: self)
         
     }
     
@@ -316,7 +316,7 @@ class WhiteboardViewController: UIViewController, WhiteboardDelegate {
     
     func terminate(){
         wb?.sendTerminate()
-        Nexilis.setWhiteboardDelegate(delegate: nil)
+        DigiX.setWhiteboardDelegate(delegate: nil)
         close?()
     }
     

+ 33 - 33
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorGroup.swift

@@ -133,13 +133,13 @@ public class EditorGroup: UIViewController {
         viewButton.layer.shadowOffset = .zero
         viewButton.layer.shadowRadius = 3
         
-//        buttonVoice.setImage(resizeImage(image: UIImage(named: "Voice-Record", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)), for: .normal)
-        buttonSendImage.setImage(resizeImage(image: UIImage(named: "Send-Image", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendPhoto.setImage(resizeImage(image: UIImage(named: "Camera", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendSticker.setImage(resizeImage(image: UIImage(named: "Sticker---Emoji", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendFile.setImage(resizeImage(image: UIImage(named: "File---Documents", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+//        buttonVoice.setImage(resizeImage(image: UIImage(named: "Voice-Record", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)), for: .normal)
+        buttonSendImage.setImage(resizeImage(image: UIImage(named: "Send-Image", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendPhoto.setImage(resizeImage(image: UIImage(named: "Camera", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendSticker.setImage(resizeImage(image: UIImage(named: "Sticker---Emoji", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendFile.setImage(resizeImage(image: UIImage(named: "File---Documents", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
         
-        buttonSendChat.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
+        buttonSendChat.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
         
         buttonSendChat.circle()
         buttonSendChat.addTarget(self, action: #selector(sendTapped), for: .touchUpInside)
@@ -162,7 +162,7 @@ public class EditorGroup: UIViewController {
         documentPicker = DocumentPicker(presentationController: self, delegate: self)
         
         let fm = FileManager.default
-        let path = Bundle.resourceBundle(for: Nexilis.self).resourcePath! //resourcesMediaBundle
+        let path = Bundle.resourceBundle(for: DigiX.self).resourcePath! //resourcesMediaBundle
         let items = try! fm.contentsOfDirectory(atPath: path)
         
         for item in items {
@@ -209,7 +209,7 @@ public class EditorGroup: UIViewController {
         let idMe = UserDefaults.standard.string(forKey: "me") as String?
         DispatchQueue.global().async {
             let message = CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: idMe!, last_update: 0)
-            let _ = Nexilis.write(message: message)
+            let _ = DigiX.write(message: message)
         }
     }
     
@@ -563,7 +563,7 @@ public class EditorGroup: UIViewController {
             viewAppBar.addSubview(titleNavigation)
             if (dataGroup["official"] as! String == "1") {
                 if !isHistoryCC {
-                    titleNavigation.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataGroup["f_name"]!!) (\(dataTopic["title"]!!))", size: 15, y: -4)
+                    titleNavigation.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataGroup["f_name"]!!) (\(dataTopic["title"]!!))", size: 15, y: -4)
                 } else {
                     titleNavigation.text = (dataGroup["f_name"] as? String)! + " " + "Contact Center".localized()
                 }
@@ -1197,7 +1197,7 @@ public class EditorGroup: UIViewController {
     
     @objc func showChooserACKConfidential() {
         let alertController = LibAlertController(title: "Message Mode".localized(), message: "Select".localized() + " " + "Message Mode".localized(), preferredStyle: .actionSheet)
-        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
         let ackAction = UIAlertAction(title: "Confirmation Message".localized(), style: .default, handler: { (UIAlertAction) in
             if !self.isAck {
                 self.isAck = true
@@ -1215,7 +1215,7 @@ public class EditorGroup: UIViewController {
     
     public func setAckConfidential(isAck: Bool, isConfidential: Bool) {
         self.isAck = isAck
-        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
         if isAck {
             buttonAckConfidential.setImage(imageAck, for: .normal)
         } else {
@@ -1269,7 +1269,7 @@ public class EditorGroup: UIViewController {
             }
         }
         let message = CoreMessage_TMessageBank.sendMessage(l_pin: dataGroup["group_id"] as! String, message_scope_id: message_scope_id, status: status, message_text: message_text, credential: credential, attachment_flag: attachment_flag, ex_blog_id: ex_blog_id, message_large_text: message_large_text, ex_format: ex_format, image_id: image_id, audio_id: audio_id, video_id: video_id, file_id: file_id, thumb_id: thumb_id, reff_id: reff_id, read_receipts: read_receipts, chat_id: dataTopic["chat_id"] as! String, is_call_center: is_call_center, call_center_id: call_center_id, opposite_pin: opposite_pin)
-        Nexilis.addQueueMessage(message: message)
+        DigiX.addQueueMessage(message: message)
         let messageId = String(message.mBodies[CoreMessage_TMessageKey.MESSAGE_ID]!)
         var row: [String: Any?] = [:]
         row["message_id"] = messageId
@@ -1462,7 +1462,7 @@ public class EditorGroup: UIViewController {
             message.mStatus = CoreMessage_TMessageUtil.getTID()
             message.mBodies[CoreMessage_TMessageKey.L_PIN] = f_pin
             message.mBodies[CoreMessage_TMessageKey.MESSAGE_ID] = "-2,\(message_id)"
-            _ = Nexilis.write(message: message)
+            _ = DigiX.write(message: message)
         }
         if let index = dataMessages.firstIndex(where: {$0["message_id"] as? String == message_id}) {
             dataMessages[index]["status"] = "4"
@@ -1518,7 +1518,7 @@ public class EditorGroup: UIViewController {
     private func sendTyping(l_pin: String, isTyping: Bool = false) {
         DispatchQueue.global().async {
             let tmessage = CoreMessage_TMessageBank.getUpdateTypingStatus(p_opposite: l_pin, p_scope: "4", p_status: isTyping ? "3": "4")
-            _ = Nexilis.write(message: tmessage)
+            _ = DigiX.write(message: tmessage)
         }
     }
     
@@ -1591,7 +1591,7 @@ extension EditorGroup: ImageVideoPickerDelegate, PreviewAttachmentImageVideoDele
     public func didSelect(imagevideo: Any?) {
         if (imagevideo != nil) {
             let imageVideoData = imagevideo as! [UIImagePickerController.InfoKey: Any]
-            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
             previewImageVC.imageVideoData = imageVideoData
             if (textFieldSend.textColor != .lightGray) {
                 previewImageVC.currentTextTextField = textFieldSend.text
@@ -2034,7 +2034,7 @@ extension EditorGroup: UITextViewDelegate {
     
     public override func paste(_ sender: Any?) {
         if UIPasteboard.general.image != nil {
-            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
             previewImageVC.image = UIPasteboard.general.image
             previewImageVC.fromCopy = true
             previewImageVC.currentTextTextField = textFieldSend.text
@@ -2522,7 +2522,7 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
     
     private func deleteMessage(l_pin: String, message_id: String, scope: String, type: String, chat: String) {
         let tmessage = CoreMessage_TMessageBank.deleteMessage(l_pin: l_pin, messageId: message_id, scope: scope, type: type, chat: chat)
-        Nexilis.addQueueMessage(message: tmessage)
+        DigiX.addQueueMessage(message: tmessage)
     }
     
     private func queryMessageReply(message_id: String) -> [String: Any?] {
@@ -2707,7 +2707,7 @@ extension EditorGroup: UICollectionViewDelegate, UICollectionViewDataSource {
             imageSticker.leadingAnchor.constraint(equalTo: cell.contentView.leadingAnchor),
             imageSticker.trailingAnchor.constraint(equalTo: cell.contentView.trailingAnchor)
         ])
-        imageSticker.image = UIImage(named: stickers[indexPath.row], in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+        imageSticker.image = UIImage(named: stickers[indexPath.row], in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
         return cell
     }
     
@@ -3070,13 +3070,13 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 statusMessage.heightAnchor.constraint(equalToConstant: 15).isActive = true
                 let status = getRealStatus(messageId: dataMessages[indexPath.row]["message_id"] as! String)
                 if (status == "1" || status == "2" ) {
-                    statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                    statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                 } else if (status == "3") {
-                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                 } else if (status == "8") {
-                    statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 } else {
-                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                 }
             }
             
@@ -3120,7 +3120,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                         profileMessage.image = UIImage(data: dataImage!)
                     }
                 } else {
-                    profileMessage.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    profileMessage.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 }
                 profileMessage.contentMode = .scaleAspectFill
             }
@@ -3222,7 +3222,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
         
         if dataMessages[indexPath.row]["read_receipts"] as? String == "8" {
             let imageAckView = UIImageView()
-            var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+            var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
             cellMessage.contentView.addSubview(imageAckView)
             imageAckView.translatesAutoresizingMaskIntoConstraints = false
             imageAckView.widthAnchor.constraint(equalToConstant: 30).isActive = true
@@ -3230,14 +3230,14 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
             if (dataMessages[indexPath.row]["f_pin"] as? String == idMe) {
                 let status = getRealStatus(messageId: dataMessages[indexPath.row]["message_id"] as! String)
                 if status == "8" {
-                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 }
                 imageAckView.topAnchor.constraint(equalTo: containerMessage.bottomAnchor, constant: 5).isActive = true
                 imageAckView.trailingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 30).isActive = true
             } else {
                 let status = dataMessages[indexPath.row]["status"] as? String
                 if status == "8" {
-                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 }
                 imageAckView.topAnchor.constraint(equalTo: containerMessage.bottomAnchor, constant: 5).isActive = true
                 imageAckView.leadingAnchor.constraint(equalTo: containerMessage.trailingAnchor, constant: -30).isActive = true
@@ -3265,9 +3265,9 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 imageLS.heightAnchor.constraint(equalToConstant: 60.0)
             ])
             if dataMessages[indexPath.row]["attachment_flag"] as! String == "26" {
-                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             } else if dataMessages[indexPath.row]["attachment_flag"] as! String == "27" {
-                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             }
         } else {
             messageText.leadingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 15).isActive = true
@@ -3326,7 +3326,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 imageSticker.leadingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 15).isActive = true
                 imageSticker.bottomAnchor.constraint(equalTo: messageText.topAnchor, constant: -5).isActive = true
                 imageSticker.trailingAnchor.constraint(equalTo: containerMessage.trailingAnchor, constant: -15).isActive = true
-                imageSticker.image = UIImage(named: (textChat?.components(separatedBy: "/")[1])!, in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+                imageSticker.image = UIImage(named: (textChat?.components(separatedBy: "/")[1])!, in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
                 imageSticker.contentMode = .scaleAspectFit
             }
             else {
@@ -3856,7 +3856,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 if (attachment_flag == "11") {
-                    let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil))
+                    let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil))
                     containerReply.addSubview(imageSticker)
                     imageSticker.layer.cornerRadius = 2.0
                     imageSticker.clipsToBounds = true
@@ -3899,7 +3899,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
             if (self.dataTopic["chat_id"] as! String != "") {
                 opposite_pin = self.dataTopic["chat_id"] as! String
             }
-            let result = Nexilis.write(message: CoreMessage_TMessageBank.getAckLocationMessage(f_pin: dataMessages[indexPath.row]["f_pin"] as! String, message_id: dataMessages[indexPath.row]["message_id"] as! String, l_pin: opposite_pin, server_date: "\(Date().currentTimeMillis())", message_scope_id: dataMessages[indexPath.row]["message_scope_id"] as! String, longitude: "", latitude: "", description: ""))
+            let result = DigiX.write(message: CoreMessage_TMessageBank.getAckLocationMessage(f_pin: dataMessages[indexPath.row]["f_pin"] as! String, message_id: dataMessages[indexPath.row]["message_id"] as! String, l_pin: opposite_pin, server_date: "\(Date().currentTimeMillis())", message_scope_id: dataMessages[indexPath.row]["message_scope_id"] as! String, longitude: "", latitude: "", description: ""))
             if result != nil {
                 Database.shared.database?.inTransaction({ (fmdb, rollback) in
                     _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -3930,7 +3930,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 let imageURL = URL(fileURLWithPath: dirPath).appendingPathComponent(sender.image_id)
                 if FileManager.default.fileExists(atPath: imageURL.path) {
                     let image    = UIImage(contentsOfFile: imageURL.path)
-                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
                     previewImageVC.image = image
                     previewImageVC.isHiddenTextField = true
                     previewImageVC.modalPresentationStyle = .custom
@@ -4428,7 +4428,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
             }
         }
         if (attachment_flag == "11") {
-            let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil))
+            let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil))
             self.containerPreviewReply.addSubview(imageSticker)
             imageSticker.layer.cornerRadius = 2.0
             imageSticker.clipsToBounds = true

+ 55 - 55
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorPersonal.swift

@@ -151,13 +151,13 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         viewButton.layer.shadowOffset = .zero
         viewButton.layer.shadowRadius = 3
         
-//        buttonVoice.setImage(resizeImage(image: UIImage(named: "Voice-Record", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)), for: .normal)
-        buttonSendImage.setImage(resizeImage(image: UIImage(named: "Send-Image", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendPhoto.setImage(resizeImage(image: UIImage(named: "Camera", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendSticker.setImage(resizeImage(image: UIImage(named: "Sticker---Emoji", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
-        buttonSendFile.setImage(resizeImage(image: UIImage(named: "File---Documents", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+//        buttonVoice.setImage(resizeImage(image: UIImage(named: "Voice-Record", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)), for: .normal)
+        buttonSendImage.setImage(resizeImage(image: UIImage(named: "Send-Image", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendPhoto.setImage(resizeImage(image: UIImage(named: "Camera", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendSticker.setImage(resizeImage(image: UIImage(named: "Sticker---Emoji", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
+        buttonSendFile.setImage(resizeImage(image: UIImage(named: "File---Documents", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(.mainColor), for: .normal)
         
-        buttonSendChat.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
+        buttonSendChat.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
         
         buttonSendChat.circle()
         buttonSendChat.addTarget(self, action: #selector(sendTapped), for: .touchUpInside)
@@ -186,7 +186,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         documentPicker = DocumentPicker(presentationController: self, delegate: self)
         
         let fm = FileManager.default
-        let path = Bundle.resourceBundle(for: Nexilis.self).resourcePath! //resourcesMediaBundle
+        let path = Bundle.resourceBundle(for: DigiX.self).resourcePath! //resourcesMediaBundle
         let items = try! fm.contentsOfDirectory(atPath: path)
         
         for item in items {
@@ -337,7 +337,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 UIAction(title: "Unblock".localized(), handler: {(_) in
                     if !self.isContactCenter {
                         DispatchQueue.global().async {
-                            if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getUnBlock(l_pin: self.dataPerson["f_pin"]!!)) {
+                            if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getUnBlock(l_pin: self.dataPerson["f_pin"]!!)) {
                                 if !response.isOk() {
                                     DispatchQueue.main.async {
                                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
@@ -413,7 +413,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                     UIAction(title: "Block".localized(), handler: {(_) in
                         if !self.isContactCenter {
                             DispatchQueue.global().async {
-                                if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getBlock(l_pin: self.dataPerson["f_pin"]!!)) {
+                                if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getBlock(l_pin: self.dataPerson["f_pin"]!!)) {
                                     if !response.isOk() {
                                         DispatchQueue.main.async {
                                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
@@ -744,7 +744,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                         imageProfile.image = UIImage(data: dataImage!)
                     }
                 } else {
-                    imageProfile.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    imageProfile.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 }
                 imageProfile.contentMode = .scaleAspectFit
             }
@@ -775,14 +775,14 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                     name = name + " " + "Contact Center".localized()
                     titleNavigation.text = name
                 } else {
-                    titleNavigation.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
+                    titleNavigation.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
                 }
             } else if User.isVerified(official_account: (dataPerson["isOfficial"] ?? "")!) && !isContactCenter {
                 let name = dataPerson["name"]!!
-                titleNavigation.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
+                titleNavigation.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
             } else if User.isInternal(userType: (dataPerson["user_type"] ?? "")!) && !isContactCenter {
                 let name = dataPerson["name"]!!
-                titleNavigation.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
+                titleNavigation.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(name)", size: 15, y: -4)
             } else {
                 if !isContactCenter {
                     titleNavigation.text = dataPerson["name"] as? String
@@ -1274,7 +1274,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                                     if let userData = User.getData(pin: "\(json)") {
                                         user.append(userData)
                                     } else {
-                                        Nexilis.addFriend (fpin: "\(json)") { result in
+                                        DigiX.addFriend (fpin: "\(json)") { result in
                                             DispatchQueue.main.async {
                                                 if result {
                                                     let userData = User.getData(pin: "\(json)")!
@@ -1953,8 +1953,8 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     
     @objc func showChooserACKConfidential() {
         let alertController = LibAlertController(title: "Message Mode".localized(), message: "Select".localized() + " " + "Message Mode".localized(), preferredStyle: .actionSheet)
-        let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
-        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
         let confidentialAction = UIAlertAction(title: "Confidential Message".localized(), style: .default, handler: { (UIAlertAction) in
             if !self.isConfidential {
                 self.isConfidential = true
@@ -1988,8 +1988,8 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     public func setAckConfidential(isAck: Bool, isConfidential: Bool) {
         self.isConfidential = isConfidential
         self.isAck = isAck
-        let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
-        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
         if isAck {
             buttonAckConfidential.setImage(imageAck, for: .normal)
         } else if isConfidential {
@@ -2003,7 +2003,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         let controller = QmeraCallContactViewController()
         controller.isDismiss = { user in
             DispatchQueue.global().async {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: self.complaintId, channel: self.channelContactCenter))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.getCCRoomInvite(l_pin: user.pin, ticket_id: self.complaintId, channel: self.channelContactCenter))
             }
         }
         controller.selectedUser.append(contentsOf: users)
@@ -2013,7 +2013,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     
     @objc func audioVideoCall(sender: UIBarButtonItem) {
         if sender.tag == 0 {
-            let goAudioCall = Nexilis.checkMicPermission()
+            let goAudioCall = DigiX.checkMicPermission()
             if !goAudioCall{
                 let alert = LibAlertController(title: "Attention!".localized(), message: "Please allow microphone permission in your settings".localized(), preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2039,8 +2039,8 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 present(controller, animated: true, completion: nil)
             }
         } else {
-            let goAudioCall = Nexilis.checkMicPermission()
-            let goVideoCall = Nexilis.checkCameraPermission()
+            let goAudioCall = DigiX.checkMicPermission()
+            let goVideoCall = DigiX.checkCameraPermission()
             if goVideoCall == 0 {
                 let alert = LibAlertController(title: "Attention!".localized(), message: !goAudioCall && goVideoCall == 0 ? "Please allow microphone & camera permission in your settings".localized() : !goAudioCall ? "Please allow microphone permission in your settings".localized() : "Please allow camera permission in your settings", preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2127,12 +2127,12 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 }
             })
             if officer == idMe {
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: requester))
             } else {
                 if requester == idMe {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.endCallCenter(complaint_id: complaintId, l_pin: officer))
                 } else {
-                    _ = Nexilis.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
+                    _ = DigiX.write(message: CoreMessage_TMessageBank.leaveCCRoomInvite(ticket_id: complaintId))
                 }
             }
             UserDefaults.standard.removeObject(forKey: "onGoingCC")
@@ -2261,7 +2261,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         }
         sendTyping(l_pin: l_pin, isTyping: true)
         let message = CoreMessage_TMessageBank.sendMessage(l_pin: l_pin, message_scope_id: message_scope_id, status: status, message_text: message_text, credential: credential, attachment_flag: attachment_flag, ex_blog_id: ex_blog_id, message_large_text: message_large_text, ex_format: ex_format, image_id: image_id, audio_id: audio_id, video_id: video_id, file_id: file_id, thumb_id: thumb_id, reff_id: reff_id, read_receipts: read_receipts, chat_id: chat_id, is_call_center: is_call_center, call_center_id: call_center_id, opposite_pin: opposite_pin)
-        Nexilis.addQueueMessage(message: message)
+        DigiX.addQueueMessage(message: message)
         let messageId = String(message.mBodies[CoreMessage_TMessageKey.MESSAGE_ID]!)
         if credential == "1" {
             self.listTimerCredential[messageId] = 60
@@ -2414,8 +2414,8 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 }
                 if channel == 1 || channel == 2 {
                     if channel == 2 {
-                        let goAudioCall = Nexilis.checkMicPermission()
-                        let goVideoCall = Nexilis.checkCameraPermission()
+                        let goAudioCall = DigiX.checkMicPermission()
+                        let goVideoCall = DigiX.checkCameraPermission()
                         if goVideoCall == 0 {
                             let alert = LibAlertController(title: "Attention!".localized(), message: !goAudioCall && goVideoCall == 0 && channel == 2 ? "Please allow microphone & camera permission in your settings".localized() : !goAudioCall ? "Please allow microphone permission in your settings".localized() : "Please allow camera permission in your settings", preferredStyle: .alert)
                             alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2429,7 +2429,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                             return
                         }
                     } else if channel == 1 {
-                        let goAudioCall = Nexilis.checkMicPermission()
+                        let goAudioCall = DigiX.checkMicPermission()
                         if !goAudioCall{
                             let alert = LibAlertController(title: "Attention!".localized(), message: "Please allow microphone permission in your settings".localized(), preferredStyle: .alert)
                             alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2502,8 +2502,8 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     private func directCC() {
         if channelContactCenter == "1" || channelContactCenter == "2" {
             if channelContactCenter == "2" {
-                let goAudioCall = Nexilis.checkMicPermission()
-                let goVideoCall = Nexilis.checkCameraPermission()
+                let goAudioCall = DigiX.checkMicPermission()
+                let goVideoCall = DigiX.checkCameraPermission()
                 if goVideoCall == 0 {
                     let alert = LibAlertController(title: "Attention!".localized(), message: !goAudioCall && goVideoCall == 0 && channelContactCenter == "2" ? "Please allow microphone & camera permission in your settings".localized() : !goAudioCall ? "Please allow microphone permission in your settings".localized() : "Please allow camera permission in your settings", preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2517,7 +2517,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                     return
                 }
             } else if channelContactCenter == "1" {
-                let goAudioCall = Nexilis.checkMicPermission()
+                let goAudioCall = DigiX.checkMicPermission()
                 if !goAudioCall{
                     let alert = LibAlertController(title: "Attention!".localized(), message: "Please allow microphone permission in your settings".localized(), preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {_ in
@@ -2550,7 +2550,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
             DispatchQueue.global().async {
                 let message = CoreMessage_TMessageBank.getQueuingCallCenter(p_channel: Int(self.channelContactCenter)!)
                 message.mBodies[CoreMessage_TMessageKey.CATEGORY_ID] = "\(service_id!)"
-                _ = Nexilis.writeSync(message: message, timeout: 30 * 1000)
+                _ = DigiX.writeSync(message: message, timeout: 30 * 1000)
             }
             row["category_cc"] = "Thank you for contacting us,\none of our officers will contact you soon".localized()
         } else {
@@ -2577,7 +2577,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         }
         DispatchQueue.global().async {
             let message = CoreMessage_TMessageBank.getRequestCallCenter(p_channel: channel, category_id: service_id)
-            if let response = Nexilis.writeSync(message: message) {
+            if let response = DigiX.writeSync(message: message) {
                 if !self.isDirectCC {
                     DispatchQueue.main.async {
                         self.dataMessages.append(row)
@@ -2650,7 +2650,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
             message.mStatus = CoreMessage_TMessageUtil.getTID()
             message.mBodies[CoreMessage_TMessageKey.L_PIN] = f_pin
             message.mBodies[CoreMessage_TMessageKey.MESSAGE_ID] = "-2,\(message_id)"
-            _ = Nexilis.write(message: message)
+            _ = DigiX.write(message: message)
         }
         if let index = dataMessages.firstIndex(where: {$0["message_id"] as? String == message_id}) {
             dataMessages[index]["status"] = "4"
@@ -2706,7 +2706,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     private func sendTyping(l_pin: String, isTyping: Bool = false) {
         DispatchQueue.global().async {
             let tmessage = CoreMessage_TMessageBank.getUpdateTypingStatus(p_opposite: l_pin, p_scope: "3", p_status: isTyping ? "3": "4")
-            _ = Nexilis.write(message: tmessage)
+            _ = DigiX.write(message: tmessage)
         }
     }
     
@@ -2870,7 +2870,7 @@ extension EditorPersonal: PreviewAttachmentImageVideoDelegate {
     public func didSelect(imagevideo: Any?) {
         if (imagevideo != nil) {
             let imageVideoData = imagevideo as! [UIImagePickerController.InfoKey: Any]
-            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
             previewImageVC.imageVideoData = imageVideoData
             if (textFieldSend.textColor != .lightGray) {
                 previewImageVC.currentTextTextField = textFieldSend.text
@@ -3198,7 +3198,7 @@ extension EditorPersonal: UITextViewDelegate {
     
     public override func paste(_ sender: Any?) {
         if UIPasteboard.general.image != nil {
-            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+            let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
             previewImageVC.image = UIPasteboard.general.image
             previewImageVC.fromCopy = true
             previewImageVC.currentTextTextField = textFieldSend.text
@@ -3697,7 +3697,7 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
     
     private func deleteMessage(l_pin: String, message_id: String, scope: String, type: String, chat: String) {
         let tmessage = CoreMessage_TMessageBank.deleteMessage(l_pin: l_pin, messageId: message_id, scope: scope, type: type, chat: chat)
-        Nexilis.deleteQueueMessage(message: tmessage)
+        DigiX.deleteQueueMessage(message: tmessage)
     }
     
     private func queryMessageReply(message_id: String) -> [String: Any?] {
@@ -3829,7 +3829,7 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
         let idMe = UserDefaults.standard.string(forKey: "me") as String?
         DispatchQueue.global().async {
             let message = CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: idMe!, last_update: 0)
-            let _ = Nexilis.write(message: message)
+            let _ = DigiX.write(message: message)
         }
     }
     
@@ -3905,7 +3905,7 @@ extension EditorPersonal: UICollectionViewDelegate, UICollectionViewDataSource {
             imageSticker.leadingAnchor.constraint(equalTo: cell.contentView.leadingAnchor),
             imageSticker.trailingAnchor.constraint(equalTo: cell.contentView.trailingAnchor)
         ])
-        imageSticker.image = UIImage(named: stickers[indexPath.row], in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+        imageSticker.image = UIImage(named: stickers[indexPath.row], in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
         return cell
     }
     
@@ -4390,13 +4390,13 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                 statusMessage.widthAnchor.constraint(equalToConstant: 15).isActive = true
                 statusMessage.heightAnchor.constraint(equalToConstant: 15).isActive = true
                 if (dataMessages[indexPath.row]["status"]! as! String == "1" || dataMessages[indexPath.row]["status"]! as! String == "2" ) {
-                    statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                    statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                 } else if (dataMessages[indexPath.row]["status"]! as! String == "3") {
-                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                 } else if (dataMessages[indexPath.row]["status"]! as! String == "8") {
-                    statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 } else {
-                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                    statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                 }
             }
             
@@ -4491,9 +4491,9 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
         
         if dataMessages[indexPath.row]["read_receipts"] as? String == "8" {
             let imageAckView = UIImageView()
-            var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+            var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
             if dataMessages[indexPath.row]["status"] as? String == "8" {
-                imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
             }
             imageAckView.image = imageAck
             cell.contentView.addSubview(imageAckView)
@@ -4515,7 +4515,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
         
         if (dataMessages[indexPath.row]["credential"] as? String) == "1" && (dataMessages[indexPath.row]["lock"] as? String) != "2" {
             let imageCredentialView = UIImageView()
-            let imageCredential = UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+            let imageCredential = UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
             imageCredentialView.image = imageCredential
             cell.contentView.addSubview(imageCredentialView)
             imageCredentialView.translatesAutoresizingMaskIntoConstraints = false
@@ -4550,9 +4550,9 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                 imageLS.heightAnchor.constraint(equalToConstant: 60.0)
             ])
             if dataMessages[indexPath.row]["attachment_flag"] as! String == "26" {
-                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             } else if dataMessages[indexPath.row]["attachment_flag"] as! String == "27" {
-                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             } else if dataMessages[indexPath.row]["message_scope_id"] as? String == "18" {
                 imageLS.image = UIImage(systemName: "doc.richtext.fill")
                 imageLS.tintColor = .mainColor
@@ -4629,7 +4629,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                 imageSticker.leadingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 15).isActive = true
                 imageSticker.bottomAnchor.constraint(equalTo: messageText.topAnchor, constant: -5).isActive = true
                 imageSticker.trailingAnchor.constraint(equalTo: containerMessage.trailingAnchor, constant: -15).isActive = true
-                imageSticker.image = UIImage(named: (textChat.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+                imageSticker.image = UIImage(named: (textChat.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
                 imageSticker.contentMode = .scaleAspectFit
             } else if dataMessages[indexPath.row]["message_scope_id"] as! String == "18" {
                 let data = textChat
@@ -5171,7 +5171,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 if (attachment_flag == "11" && message_text.components(separatedBy: "/").count > 1) {
-                    let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil))
+                    let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil))
                     containerReply.addSubview(imageSticker)
                     imageSticker.layer.cornerRadius = 2.0
                     imageSticker.clipsToBounds = true
@@ -5219,7 +5219,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
             return
         }
         DispatchQueue.global().async {
-            let result = Nexilis.write(message: CoreMessage_TMessageBank.getAckLocationMessage(f_pin: dataMessages[indexPath.row]["f_pin"] as! String, message_id: dataMessages[indexPath.row]["message_id"] as! String, l_pin: dataMessages[indexPath.row]["l_pin"] as! String, server_date: "\(Date().currentTimeMillis())", message_scope_id: dataMessages[indexPath.row]["message_scope_id"] as! String, longitude: "", latitude: "", description: ""))
+            let result = DigiX.write(message: CoreMessage_TMessageBank.getAckLocationMessage(f_pin: dataMessages[indexPath.row]["f_pin"] as! String, message_id: dataMessages[indexPath.row]["message_id"] as! String, l_pin: dataMessages[indexPath.row]["l_pin"] as! String, server_date: "\(Date().currentTimeMillis())", message_scope_id: dataMessages[indexPath.row]["message_scope_id"] as! String, longitude: "", latitude: "", description: ""))
             if result != nil {
                 Database.shared.database?.inTransaction({ (fmdb, rollback) in
                     _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -5312,7 +5312,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                 let imageURL = URL(fileURLWithPath: dirPath).appendingPathComponent(sender.image_id)
                 if FileManager.default.fileExists(atPath: imageURL.path) {
                     let image    = UIImage(contentsOfFile: imageURL.path)
-                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
                     previewImageVC.image = image
                     previewImageVC.isHiddenTextField = true
                     previewImageVC.modalPresentationStyle = .custom
@@ -5802,7 +5802,7 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
             }
         }
         if (attachment_flag == "11") {
-            let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil))
+            let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil))
             self.containerPreviewReply.addSubview(imageSticker)
             imageSticker.layer.cornerRadius = 2.0
             imageSticker.clipsToBounds = true

+ 8 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorStarMessages.swift

@@ -245,11 +245,11 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
             statusMessage.widthAnchor.constraint(equalToConstant: 15).isActive = true
             statusMessage.heightAnchor.constraint(equalToConstant: 15).isActive = true
             if (dataMessages[indexPath.row]["status"]! as! String == "1" || dataMessages[indexPath.row]["status"]! as! String == "2" ) {
-                statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
             } else if (dataMessages[indexPath.row]["status"]! as! String == "3") {
-                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
             } else {
-                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
             }
             
             let nameSender = UILabel()
@@ -289,7 +289,7 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                         profileMessage.image = UIImage(data: dataImage!)
                     }
                 } else {
-                    profileMessage.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    profileMessage.image = UIImage(named: "pb_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 }
                 profileMessage.contentMode = .scaleAspectFit
             }
@@ -360,9 +360,9 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                 imageLS.heightAnchor.constraint(equalToConstant: 60.0)
             ])
             if dataMessages[indexPath.row]["attachment_flag"] as! String == "26" {
-                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             } else if dataMessages[indexPath.row]["attachment_flag"] as! String == "27" {
-                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             }
         } else {
             messageText.leadingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 15).isActive = true
@@ -410,7 +410,7 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                 imageSticker.bottomAnchor.constraint(equalTo: messageText.topAnchor, constant: -5).isActive = true
                 imageSticker.trailingAnchor.constraint(equalTo: containerMessage.trailingAnchor).isActive = true
                 imageSticker.widthAnchor.constraint(equalToConstant: 80).isActive = true
-                imageSticker.image = UIImage(named: (textChat?.components(separatedBy: "/")[1])!, in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+                imageSticker.image = UIImage(named: (textChat?.components(separatedBy: "/")[1])!, in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
                 imageSticker.contentMode = .scaleAspectFit
             }
             else {
@@ -743,7 +743,7 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                 let imageURL = URL(fileURLWithPath: dirPath).appendingPathComponent(sender.image_id)
                 if FileManager.default.fileExists(atPath: imageURL.path) {
                     let image    = UIImage(contentsOfFile: imageURL.path)
-                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: Nexilis.self))
+                    let previewImageVC = PreviewAttachmentImageVideo(nibName: "PreviewAttachmentImageVideo", bundle: Bundle.resourceBundle(for: DigiX.self))
                     previewImageVC.image = image
                     previewImageVC.isHiddenTextField = true
                     previewImageVC.modalPresentationStyle = .custom

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/FormEditor.swift

@@ -305,7 +305,7 @@ class FormEditor: UIViewController {
         }
         DispatchQueue.global().async { [self] in
             let idMe = UserDefaults.standard.string(forKey: "me")!
-            let resp = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getFormApproval(p_f_pin: idMe, p_ref_id: refId ?? "", p_approve: "\(isApprove)", p_note: "", p_sign: ""))
+            let resp = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getFormApproval(p_f_pin: idMe, p_ref_id: refId ?? "", p_approve: "\(isApprove)", p_note: "", p_sign: ""))
             if resp != nil {
 //                Database.shared.database?.inTransaction({ (fmdb, rollback) in
 //                    do {

+ 5 - 5
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/PreviewAttachmentImageVideo.swift

@@ -77,7 +77,7 @@ class PreviewAttachmentImageVideo: UIViewController, UIScrollViewDelegate, UITex
             buttonSend.removeFromSuperview()
             buttonAckConfidential.removeFromSuperview()
         } else {
-            buttonSend.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
+            buttonSend.setImage(resizeImage(image: UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal), for: .normal)
             
             buttonSend.circle()
             buttonSend.addTarget(self, action: #selector(sendTapped), for: .touchUpInside)
@@ -87,8 +87,8 @@ class PreviewAttachmentImageVideo: UIViewController, UIScrollViewDelegate, UITex
             } else {
                 buttonAckConfidential.circle()
                 buttonAckConfidential.addTarget(self, action: #selector(showChooserACKConfidential), for: .touchUpInside)
-                let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
-                let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+                let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+                let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
                 if isAck {
                     buttonAckConfidential.setImage(imageAck, for: .normal)
                 } else if isConfidential {
@@ -126,7 +126,7 @@ class PreviewAttachmentImageVideo: UIViewController, UIScrollViewDelegate, UITex
     @objc func showChooserACKConfidential() {
         let alertController = LibAlertController(title: "Message Mode".localized(), message: "Select".localized() + " " + "Message Mode".localized(), preferredStyle: .actionSheet)
         if !self.isGroup {
-            let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+            let imageConfidential = resizeImage(image: UIImage(named: "confidential_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
             let confidentialAction = UIAlertAction(title: "Confidential Message".localized(), style: .default, handler: { (UIAlertAction) in
                 if !self.isConfidential {
                     self.isConfidential = true
@@ -140,7 +140,7 @@ class PreviewAttachmentImageVideo: UIViewController, UIScrollViewDelegate, UITex
             confidentialAction.setValue(imageConfidential, forKey: "image")
             alertController.addAction(confidentialAction)
         }
-        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
+        let imageAck = resizeImage(image: UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withRenderingMode(.alwaysOriginal)
         let ackAction = UIAlertAction(title: "Confirmation Message".localized(), style: .default, handler: { (UIAlertAction) in
             if !self.isAck {
                 self.isAck = true

+ 8 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Contact/ContactCallViewController.swift

@@ -234,7 +234,7 @@ extension ContactCallViewController: UITableViewDataSource {
         cell.imagePerson.layer.masksToBounds = false
         cell.imagePerson.circle()
         cell.imagePerson.clipsToBounds = true
-        cell.imagePerson.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        cell.imagePerson.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         cell.imagePerson.contentMode = .scaleAspectFit
         if isFilltering {
             dataPerson = fillteredData
@@ -249,19 +249,19 @@ extension ContactCallViewController: UITableViewDataSource {
             }
             cell.selectionStyle = UITableViewCell.SelectionStyle.none
             if User.isOfficial(official_account: (dataPerson[indexPath.row]["isOfficial"] ?? "")!) || User.isOfficialRegular(official_account: (dataPerson[indexPath.row]["isOfficial"] ?? "")!) {
-                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.officialColor)
+                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.officialColor)
                 
             } else if User.isVerified(official_account: (dataPerson[indexPath.row]["isOfficial"] ?? "")!) {
-                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.verifiedColor)
             }
             else if User.isInternal(userType: (dataPerson[indexPath.row]["user_type"] ?? "")!) {
-                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.internalColor)
+                cell.namePerson.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.internalColor)
             } else if User.isCallCenter(userType: (dataPerson[indexPath.row]["user_type"] ?? "")!) {
                 let dataCategory = CategoryCC.getDataFromServiceId(service_id: (dataPerson[indexPath.row]["ex_offmp"] ?? "")!)
                 if dataCategory != nil {
-                    cell.namePerson.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+                    cell.namePerson.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
                 } else {
-                    cell.namePerson.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.ccColor)
+                    cell.namePerson.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(dataPerson[indexPath.row]["name"]!!)", size: 15, y: -4, colorText: UIColor.ccColor)
                 }
             } else {
                 cell.namePerson.text = dataPerson[indexPath.row]["name"] as? String
@@ -270,8 +270,8 @@ extension ContactCallViewController: UITableViewDataSource {
                 cell.audioCallButton.tag = indexPath.row
                 cell.videoCallButton.tag = indexPath.row
                 
-                cell.audioCallButton.setImage(UIImage(named: "pb_screen_share", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(.mainColor).resize(target: CGSize(width: 35, height: 35)), for: .normal)
-                cell.videoCallButton.setImage(UIImage(named: "pb_whiteboard", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(.mainColor).resize(target: CGSize(width: 25, height: 25)), for: .normal)
+                cell.audioCallButton.setImage(UIImage(named: "pb_screen_share", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(.mainColor).resize(target: CGSize(width: 35, height: 35)), for: .normal)
+                cell.videoCallButton.setImage(UIImage(named: "pb_whiteboard", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(.mainColor).resize(target: CGSize(width: 25, height: 25)), for: .normal)
                 
                 cell.audioCallButton.addTarget(self, action: #selector(SS(sender:)), for: .touchUpInside)
                 cell.videoCallButton.addTarget(self, action: #selector(WB(sender:)), for: .touchUpInside)

+ 3 - 3
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/AddFriendTableViewController.swift

@@ -95,7 +95,7 @@ class AddFriendTableViewController: UITableViewController {
     
     func getData(completion: @escaping ([User])->()) {
         DispatchQueue.global().async {
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getPersonSuggestion(p_last_seq: "0")),
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getPersonSuggestion(p_last_seq: "0")),
                response.isOk() {
                 let data = response.getBody(key: CoreMessage_TMessageKey.DATA)
                 guard !data.isEmpty else {
@@ -117,7 +117,7 @@ class AddFriendTableViewController: UITableViewController {
     
     func getDataSearch(searchText: String, completion: @escaping ([User]) -> ()) {
         DispatchQueue.global().async {
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSearchFriend(search_keyword: searchText, limit: "10")), response.isOk() {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSearchFriend(search_keyword: searchText, limit: "10")), response.isOk() {
                 let data = response.getBody(key: CoreMessage_TMessageKey.DATA)
                 guard !data.isEmpty else {
                     return
@@ -197,7 +197,7 @@ class AddFriendTableViewController: UITableViewController {
             user = data[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
             content.image = image
         })
         content.text = user.fullName

+ 4 - 4
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BackupRestoreView.swift

@@ -125,7 +125,7 @@ public class BackupRestoreView: UIViewController, UITableViewDataSource, UITable
     
     private func requestBackupAvailability() {
         DispatchQueue.global().async {
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.getBackupAvailability())
+            _ = DigiX.write(message: CoreMessage_TMessageBank.getBackupAvailability())
         }
     }
     
@@ -631,7 +631,7 @@ public class BackupRestoreView: UIViewController, UITableViewDataSource, UITable
                 labelRestoring.text = "Successfully Restored Data".localized()
             }
             DispatchQueue.global().async { [self] in
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.getBackupRestored(option: optionBackup, fileid: fileIdBackup))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.getBackupRestored(option: optionBackup, fileid: fileIdBackup))
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: { [self] in
                 isRestoreStart = false
@@ -646,7 +646,7 @@ public class BackupRestoreView: UIViewController, UITableViewDataSource, UITable
             //print(error)
             self.view.makeToast("Backup files are corrupted".localized(), duration: 0.5)
             DispatchQueue.global().async { [self] in
-                _ = Nexilis.write(message: CoreMessage_TMessageBank.getBackupRestored(option: optionBackup, fileid: fileIdBackup))
+                _ = DigiX.write(message: CoreMessage_TMessageBank.getBackupRestored(option: optionBackup, fileid: fileIdBackup))
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: { [self] in
                 isRestoreStart = false
@@ -893,7 +893,7 @@ public class BackupRestoreView: UIViewController, UITableViewDataSource, UITable
                                     let attrib = try FileManager.default.attributesOfItem(atPath: path)
                                     let fileSize = attrib[.size] as! Int64
                                     DispatchQueue.global().async { [self] in
-                                        _ = Nexilis.write(message: CoreMessage_TMessageBank.getBackupUploaded(option: choosenOption, fileid: fileIdBackup, filesize: String(fileSize), recordSize: String(recordSize)))
+                                        _ = DigiX.write(message: CoreMessage_TMessageBank.getBackupUploaded(option: choosenOption, fileid: fileIdBackup, filesize: String(fileSize), recordSize: String(recordSize)))
                                     }
                                     let date = Date()
                                     let calendar = Calendar.current

+ 8 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BroadcastMembersTableViewController.swift

@@ -249,7 +249,7 @@ class BroadcastMembersTableViewController: UITableViewController, UISearchContro
     private func pullBuddy() {
         if let me = UserDefaults.standard.string(forKey: "me") {
             DispatchQueue.global().async {
-                let _ = Nexilis.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
+                let _ = DigiX.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
             }
         }
     }
@@ -289,7 +289,7 @@ class BroadcastMembersTableViewController: UITableViewController, UISearchContro
             }
             content.text = group.name
             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-            getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+            getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                 content.image = image
             }
             cell.contentConfiguration = content
@@ -305,23 +305,23 @@ class BroadcastMembersTableViewController: UITableViewController, UISearchContro
                 data = contacts[indexPath.row]
             }
             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-            getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+            getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                 content.image = image
             })
             if User.isOfficial(official_account: data.official ?? "") || User.isOfficialRegular(official_account: data.official ?? "") {
-                content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
+                content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
                 
             } else if User.isVerified(official_account: data.official ?? "") {
-                content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+                content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
             }
             else if User.isInternal(userType: data.userType ?? "") {
-                content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
+                content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
             } else if User.isCallCenter(userType: data.userType ?? "") {
 //                let dataCategory = CategoryCC.getDataFromServiceId(service_id: data.ex_offmp!)
 //                if dataCategory != nil {
-//                    content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+//                    content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
 //                } else {
-                    content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
+                    content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
 //                }
             } else {
                 content.text = data.fullName

+ 9 - 9
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/BroadcastViewController.swift

@@ -103,7 +103,7 @@ class BroadcastViewController: UITableViewController, UITextFieldDelegate, UITex
         
         DispatchQueue.global().async {
             let me = UserDefaults.standard.string(forKey: "me")!
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.getFormList(p_pin: me, p_last_id: "0"))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.getFormList(p_pin: me, p_last_id: "0"))
         }
         
         navigationController?.navigationBar.backgroundColor = .mainColor
@@ -576,7 +576,7 @@ class BroadcastViewController: UITableViewController, UITextFieldDelegate, UITex
             message.mBodies[CoreMessage_TMessageKey.FILE_ID] = form
             message.mBodies[CoreMessage_TMessageKey.MESSAGE_SCOPE_ID] = "18"
         }
-        if let response = Nexilis.writeSync(message: message) {
+        if let response = DigiX.writeSync(message: message) {
             if (response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "00") {
                 DispatchQueue.main.async {
                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -617,23 +617,23 @@ class BroadcastViewController: UITableViewController, UITextFieldDelegate, UITex
                 let data: User
                 data = contacts[indexPath.row]
                 content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                     content.image = image
                 })
                 if User.isOfficial(official_account: data.official ?? "") || User.isOfficialRegular(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
                     
                 } else if User.isVerified(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
                 }
                 else if User.isInternal(userType: data.userType ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
                 } else if User.isCallCenter(userType: data.userType ?? "") {
 //                    let dataCategory = CategoryCC.getDataFromServiceId(service_id: data.ex_offmp!)
 //                    if dataCategory != nil {
-//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    } else {
-                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
+                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    }
                 } else {
                     content.text = data.fullName
@@ -646,7 +646,7 @@ class BroadcastViewController: UITableViewController, UITextFieldDelegate, UITex
                 let group: Group
                 group = groups[indexPath.row]
                 content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
 //                    tableView.reloadRows(at: [indexPath], with: .none)
                 }

+ 20 - 20
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeDeviceViewController.swift

@@ -83,12 +83,12 @@ public class ChangeDeviceViewController: UIViewController {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         DispatchQueue.global().async {
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSendOTPLogin(p_email: email), timeout: 30 * 1000) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSendOTPLogin(p_email: email), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") != "00" {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unregistered email account".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -97,14 +97,14 @@ public class ChangeDeviceViewController: UIViewController {
                     }
                 } else {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             self.showPageOTP(email: email)
                         })
                     }
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader(completion: {
+                    DigiX.hideLoader(completion: {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -120,12 +120,12 @@ public class ChangeDeviceViewController: UIViewController {
         showOTPVC.email = email
         showOTPVC.showWrongOTP = errCode
         showOTPVC.isDismiss = { code in
-            Nexilis.showLoader()
+            DigiX.showLoader()
             DispatchQueue.global().async {
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSendVerifyChangeDevice(p_email: email, p_vercode: code), timeout: 30 * 1000) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSendVerifyChangeDevice(p_email: email, p_vercode: code), timeout: 30 * 1000) {
                     if !response.isOk() {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 self.showPageOTP(email: email, errCode: response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99"))
                             })
                         }
@@ -134,13 +134,13 @@ public class ChangeDeviceViewController: UIViewController {
                         let id = response.getBody(key: CoreMessage_TMessageKey.F_PIN, default_value: "")
                         let thumb = response.getBody(key: CoreMessage_TMessageKey.THUMB_ID, default_value: "")
                         if(!id.isEmpty) {
-                            Nexilis.changeUser(f_pin: id)
+                            DigiX.changeUser(f_pin: id)
                             Utils.setProfile(value: true)
                             UserDefaults.standard.synchronize()
                             // pos registration
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader(completion: {
+                                DigiX.hideLoader(completion: {
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                     imageView.tintColor = .white
                                     let banner = FloatingNotificationBanner(title: "Successfully Sign-In".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -164,7 +164,7 @@ public class ChangeDeviceViewController: UIViewController {
                     }
                 } else {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -219,13 +219,13 @@ public class ChangeDeviceViewController: UIViewController {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         DispatchQueue.global().async {
             let md5Hex = password
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignIn(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignIn(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "11" {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Invalid user / Username and password does not match".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -234,7 +234,7 @@ public class ChangeDeviceViewController: UIViewController {
                     }
                 } else if !response.isOk() {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -247,14 +247,14 @@ public class ChangeDeviceViewController: UIViewController {
                     let thumb = response.getBody(key: CoreMessage_TMessageKey.THUMB_ID, default_value: "")
                     let device_id = response.getBody(key: CoreMessage_TMessageKey.IMEI, default_value: id)
                     if(!id.isEmpty) {
-                        Nexilis.changeUser(f_pin: device_id)
+                        DigiX.changeUser(f_pin: device_id)
                         UserDefaults.standard.setValue(device_id, forKey: "device_id")
                         Utils.setProfile(value: true)
                         UserDefaults.standard.synchronize()
                         // pos registration
-                        _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                        _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Successfully Sign-In".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -279,7 +279,7 @@ public class ChangeDeviceViewController: UIViewController {
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader(completion: {
+                    DigiX.hideLoader(completion: {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)

+ 7 - 7
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeNamePassswordViewController.swift

@@ -134,12 +134,12 @@ public class ChangeNamePassswordViewController: UIViewController {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         DispatchQueue.global().async {
-            if let resp = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSendOTPChangeProfile(name: first + " " + last, type: "2")) {
+            if let resp = DigiX.writeSync(message: CoreMessage_TMessageBank.getSendOTPChangeProfile(name: first + " " + last, type: "2")) {
                 if resp.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "1a" {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Username has already been registered. Please use another username".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -153,7 +153,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                     tMessage.mBodies[CoreMessage_TMessageKey.LAST_NAME] = last
                     tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = md5Hex
                     tMessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = ""
-                    if let resp2 = Nexilis.writeAndWait(message: tMessage){
+                    if let resp2 = DigiX.writeAndWait(message: tMessage){
                         if resp2.isOk() {
                             Database.shared.database?.inTransaction({ fmdb, rollback in
                                 _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["first_name": first , "last_name": last], _where: "f_pin = '\(idMe)'")
@@ -162,7 +162,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                             UserDefaults.standard.synchronize()
         //                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "updateFifthTab"), object: nil, userInfo: nil)
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader(completion: {
+                                DigiX.hideLoader(completion: {
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                     imageView.tintColor = .white
                                     let banner = FloatingNotificationBanner(title: "Successfully changed".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -173,7 +173,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                         }
                     } else {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -184,7 +184,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader(completion: {
+                    DigiX.hideLoader(completion: {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangeNameTableViewController.swift

@@ -42,7 +42,7 @@ class ChangeNameTableViewController: UITableViewController {
         let first = String(a[0])
         let last = a.count == 2 ? String(a[1]) : ""
         DispatchQueue.global().async {
-            if let resp = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonInfoName(firstname: first, lastname: last)) {
+            if let resp = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonInfoName(firstname: first, lastname: last)) {
                 if resp.isOk() {
                     Database.shared.database?.inTransaction({ fmdb, rollback in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["first_name": first , "last_name": last], _where: "f_pin = '\(self.data)'")

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ChangePasswordViewController.swift

@@ -88,7 +88,7 @@ class ChangePasswordViewController: UIViewController {
             let md5HexNew = newPassword
             tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = md5HexNew
             tMessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = md5HexOld
-            if let resp = Nexilis.writeAndWait(message: tMessage){
+            if let resp = DigiX.writeAndWait(message: tMessage){
                 if resp.isOk() {
                     DispatchQueue.main.async {
                         let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))

+ 26 - 26
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ContactChatViewController.swift

@@ -468,7 +468,7 @@ class ContactChatViewController: UITableViewController {
     }
     
     private func getOpenGroups(listGroups: [Group], completion: @escaping ([Group]) -> ()) {
-        if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getOpenGroups(p_account: "1,2,3,5,6,7", offset: "0", search: "")) {
+        if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getOpenGroups(p_account: "1,2,3,5,6,7", offset: "0", search: "")) {
             var dataGroups: [Group] = []
             if (response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "00") {
                 let data = response.getBody(key: CoreMessage_TMessageKey.DATA)
@@ -512,7 +512,7 @@ class ContactChatViewController: UITableViewController {
     private func pullBuddy() {
         if let me = UserDefaults.standard.string(forKey: "me") {
             DispatchQueue.global().async {
-                let _ = Nexilis.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
+                let _ = DigiX.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
             }
         }
     }
@@ -521,7 +521,7 @@ class ContactChatViewController: UITableViewController {
         DispatchQueue.global().async {
             var result: Bool = false
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
-            if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddGroupMember(p_group_id: groupId, p_member_pin: idMe!, p_position: "0")), response.isOk() {
+            if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getAddGroupMember(p_group_id: groupId, p_member_pin: idMe!, p_position: "0")), response.isOk() {
                 result = true
             }
             completion(result)
@@ -873,23 +873,23 @@ extension ContactChatViewController {
                     data = contacts[indexPath.row]
                 }
                 content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                     content.image = image
                 })
                 if User.isOfficial(official_account: data.official ?? "") || User.isOfficialRegular(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
                     
                 } else if User.isVerified(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
                 }
                 else if User.isInternal(userType: data.userType ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
                 } else if User.isCallCenter(userType: data.userType ?? "") {
 //                    let dataCategory = CategoryCC.getDataFromServiceId(service_id: data.ex_offmp!)
 //                    if dataCategory != nil {
-//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    } else {
-                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
+                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    }
                 } else {
                     content.text = data.fullName
@@ -942,9 +942,9 @@ extension ContactChatViewController {
                 ])
                 if data.profile.isEmpty && data.pin != "-999" {
                     if data.messageScope == "3" {
-                        imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                        imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                     } else {
-                        imageView.image = UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                        imageView.image = UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                     }
                 } else {
                     if Utils.getIconDock() != nil {
@@ -955,7 +955,7 @@ extension ContactChatViewController {
                             })
                         }
                     } else {
-                        getImage(name: data.profile, placeholderImage: UIImage(named: data.pin == "-999" ? "pb_button" : data.messageScope == "3" ? "Profile---Purple" : "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                        getImage(name: data.profile, placeholderImage: UIImage(named: data.pin == "-999" ? "pb_button" : data.messageScope == "3" ? "Profile---Purple" : "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                             imageView.image = image
                         })
                     }
@@ -991,13 +991,13 @@ extension ContactChatViewController {
                             let imageStatus = NSTextAttachment()
                             let status = getRealStatus(messageId: data.messageId)
                             if (status == "1" || status == "2" ) {
-                                imageStatus.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                                imageStatus.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                             } else if (status == "3") {
-                                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                             } else if (status == "8") {
-                                imageStatus.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                                imageStatus.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                             } else {
-                                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                             }
                             imageStatus.bounds = CGRect(x: 0, y: 0, width: 15, height: 15)
                             let imageStatusString = NSAttributedString(attachment: imageStatus)
@@ -1119,7 +1119,7 @@ extension ContactChatViewController {
                     }
                 }
                 if group.official == "1" && group.parent == "" {
-                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(group.name)", size: 15, y: -4)
+                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(group.name)", size: 15, y: -4)
                 }
                 else if group.isOpen == "1" && group.parent == "" {
                     if self.traitCollection.userInterfaceStyle == .dark {
@@ -1147,7 +1147,7 @@ extension ContactChatViewController {
                     cell.accessoryType = .none
                 }
                 content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
                 }
                 cell.contentConfiguration = content
@@ -1171,23 +1171,23 @@ extension ContactChatViewController {
                     data = contacts[indexPath.row]
                 }
                 content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                     content.image = image
                 })
                 if User.isOfficial(official_account: data.official ?? "") || User.isOfficialRegular(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.officialColor)
                     
                 } else if User.isVerified(official_account: data.official ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.verifiedColor)
                 }
                 else if User.isInternal(userType: data.userType ?? "") {
-                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
+                    content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.internalColor)
                 } else if User.isCallCenter(userType: data.userType ?? "") {
 //                    let dataCategory = CategoryCC.getDataFromServiceId(service_id: data.ex_offmp!)
 //                    if dataCategory != nil {
-//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
+//                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName) (\(dataCategory!.service_name))", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    } else {
-                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
+                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(data.fullName)", size: 15, y: -4, colorText: UIColor.ccColor)
 //                    }
                 } else {
                     content.text = data.fullName
@@ -1221,7 +1221,7 @@ extension ContactChatViewController {
                 }
             }
             if group.official == "1" && group.parent == "" {
-                content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "  \(group.name)", size: 15, y: -4)
+                content.attributedText = self.set(image: UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "  \(group.name)", size: 15, y: -4)
             }
             else if group.isOpen == "1" && group.parent == "" {
                 if self.traitCollection.userInterfaceStyle == .dark {
@@ -1249,7 +1249,7 @@ extension ContactChatViewController {
                 cell.accessoryType = .none
             }
             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-            getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+            getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                 content.image = image
             }
             cell.contentConfiguration = content

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupCreateViewController.swift

@@ -39,7 +39,7 @@ class GroupCreateViewController: UITableViewController {
     func submit(completion: @escaping (Bool) -> ()) {
         let groupName = self.name.text!
         DispatchQueue.global().async {
-            if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getCreateGroup(p_group_id: self.id, p_group_name: groupName)), response.isOk() {
+            if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getCreateGroup(p_group_id: self.id, p_group_name: groupName)), response.isOk() {
                 completion(true)
             } else {
                 completion(false)

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupDescViewController.swift

@@ -42,7 +42,7 @@ class GroupDescViewController: UITableViewController {
     @objc func save(sender: Any) {
         if let text = descText.text {
             DispatchQueue.global().async {
-                if let resp = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: self.data, p_quote: text)) {
+                if let resp = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: self.data, p_quote: text)) {
                     if resp.isOk() {
                         Database.shared.database?.inTransaction({ fmdb, rollback in
                             _ = Database.shared.updateRecord(fmdb: fmdb, table: "GROUPZ", cvalues: ["quote": text], _where: "group_id = '\(self.data)'")

+ 18 - 18
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupDetailViewController.swift

@@ -171,7 +171,7 @@ class GroupDetailViewController: UITableViewController {
             }
             //print(("level: \(level)")
             DispatchQueue.main.async {
-                if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getCreateSubGroup(group_id: self.idSubGroup, group_name: textField!.text!, parent_id: self.group!.id, level: level)) {
+                if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getCreateSubGroup(group_id: self.idSubGroup, group_name: textField!.text!, parent_id: self.group!.id, level: level)) {
                     if response.isOk() {
                         let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "groupDetailView") as! GroupDetailViewController
                         controller.data = self.idSubGroup
@@ -316,18 +316,18 @@ class GroupDetailViewController: UITableViewController {
                 } else {
                     currentAccess = "0"
                 }
-                Nexilis.showLoader()
+                DigiX.showLoader()
                 self.changeOpenGroup(open: currentAccess) { result in
                     if result {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 g.isOpen = currentAccess
                                 tableView.reloadRows(at: [indexPath], with: .none)
                             })
                         }
                     } else {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Check your connection".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -420,7 +420,7 @@ class GroupDetailViewController: UITableViewController {
                             return
                         }
                         DispatchQueue.main.async {
-                            if let g = self.group, let _ = Nexilis.write(message: CoreMessage_TMessageBank.getUpdateChat(p_chat_id: topic.chatId, p_f_pin: g.id, p_title: textField!.text!, p_anonym: "", p_image: topic.thumb)) {
+                            if let g = self.group, let _ = DigiX.write(message: CoreMessage_TMessageBank.getUpdateChat(p_chat_id: topic.chatId, p_f_pin: g.id, p_title: textField!.text!, p_anonym: "", p_image: topic.thumb)) {
                                 let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Successfully changed".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -664,7 +664,7 @@ class GroupDetailViewController: UITableViewController {
     private func removeTopic(chatId: String, completion: @escaping (Bool) -> ()) {
         DispatchQueue.global().async {
             var result: Bool = false
-            if let g = self.group, let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getDeleteChat(chat_id: chatId, f_pin: g.id)), response.isOk() {
+            if let g = self.group, let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getDeleteChat(chat_id: chatId, f_pin: g.id)), response.isOk() {
                 result = true
             }
             completion(result)
@@ -674,7 +674,7 @@ class GroupDetailViewController: UITableViewController {
     private func changePosition(pin: String, isAdmin: Bool = true, completion: @escaping (Bool) -> ()) {
         DispatchQueue.global().async {
             var result: Bool = false
-            if let g = self.group, let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupMemberPosition(p_group_id: g.id, p_pin: pin, p_position: isAdmin ? "1" : "0")), response.isOk() {
+            if let g = self.group, let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupMemberPosition(p_group_id: g.id, p_pin: pin, p_position: isAdmin ? "1" : "0")), response.isOk() {
                 result = true
             }
             completion(result)
@@ -684,7 +684,7 @@ class GroupDetailViewController: UITableViewController {
     private func exitGroup(pin: String, completion: @escaping (Bool) -> ()) {
         DispatchQueue.global().async {
             var result: Bool = false
-            if let g = self.group, let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getExitGroup(p_group_id: g.id, p_pin: pin)), response.isOk() {
+            if let g = self.group, let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getExitGroup(p_group_id: g.id, p_pin: pin)), response.isOk() {
                 result = true
             }
             completion(result)
@@ -694,7 +694,7 @@ class GroupDetailViewController: UITableViewController {
     private func changeOpenGroup(open: String, completion: @escaping (Bool) -> ()) {
         DispatchQueue.global().async {
             var result: Bool = false
-            if let g = self.group, let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: g.id, p_open: open)), response.isOk() {
+            if let g = self.group, let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: g.id, p_open: open)), response.isOk() {
                     result = true
             } else {
                 result = false
@@ -756,7 +756,7 @@ class GroupDetailViewController: UITableViewController {
         switch sections[indexPath.section] {
         case .profile:
             let cell = tableView.dequeueReusableCell(withIdentifier: "profileCell", for: indexPath) as! ProfileCell
-            cell.cover.image = UIImage(named: "Sofa", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+            cell.cover.image = UIImage(named: "Sofa", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
             guard let g = group else {
                 return cell
             }
@@ -883,20 +883,20 @@ class GroupDetailViewController: UITableViewController {
                         }
                     }
                     if member.userType == "23" || member.official == "1" {
-                        content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (member.firstName + " " + member.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: 0)
+                        content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (member.firstName + " " + member.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: 0)
                     } else if member.userType == "24" {
-                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (member.firstName + " " + member.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: 0)
+                        content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (member.firstName + " " + member.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: 0)
                     } else {
                         content.text = (member.firstName + " " + member.lastName).trimmingCharacters(in: .whitespaces)
                     }
                     if !checkIsFriend(pin: member.pin) {
                         if member.position == "1" {
-                            content.secondaryAttributedText = self.set(image: UIImage(named: "pb_twsn_group_admin_11", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, image2:  UIImage(named: "pb_add_contact", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "", size: 20, y: 0, moreImage: true)
+                            content.secondaryAttributedText = self.set(image: UIImage(named: "pb_twsn_group_admin_11", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, image2:  UIImage(named: "pb_add_contact", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "", size: 20, y: 0, moreImage: true)
                         } else {
-                            content.secondaryAttributedText = self.set(image: UIImage(named: "pb_add_contact", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "", size: 20, y: 0)
+                            content.secondaryAttributedText = self.set(image: UIImage(named: "pb_add_contact", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "", size: 20, y: 0)
                         }
                     } else {
-                        content.secondaryAttributedText = member.position == "1" ? self.set(image: UIImage(named: "pb_twsn_group_admin_11", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: "", size: 20, y: 0) : NSAttributedString(string: "")
+                        content.secondaryAttributedText = member.position == "1" ? self.set(image: UIImage(named: "pb_twsn_group_admin_11", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: "", size: 20, y: 0) : NSAttributedString(string: "")
                     }
                     cell.accessoryType = .none
                 }
@@ -979,17 +979,17 @@ extension GroupDetailViewController: ImageVideoPickerDelegate {
                 if !FileManager.default.fileExists(atPath: fileDir.path), let data = resize.jpegData(compressionQuality: 0.8) {
                     try! data.write(to: fileDir)
                     DispatchQueue.main.async {
-                        Nexilis.showLoader()
+                        DigiX.showLoader()
                     }
                     Network().upload(name: fileDir.lastPathComponent) { result, progress in
                         guard result, progress == 100 else {
                             return
                         }
-                        if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: g.id, p_thumb_id: fileDir.lastPathComponent)), response.isOk() {
+                        if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: g.id, p_thumb_id: fileDir.lastPathComponent)), response.isOk() {
                             Database.shared.database?.inTransaction({ fmdb, rollback in
                                 _ = Database.shared.updateRecord(fmdb: fmdb, table: "GROUPZ", cvalues: ["image_id": fileDir.lastPathComponent], _where: "group_id = '\(g.id)'")
                                 DispatchQueue.main.async {
-                                    Nexilis.hideLoader(completion: {
+                                    DigiX.hideLoader(completion: {
                                         self.tempImage = image
                                         cell.profile.image = self.tempImage
                                     })

+ 5 - 5
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupMemberViewController.swift

@@ -70,13 +70,13 @@ class GroupMemberViewController: UITableViewController {
             Database.shared.database?.inTransaction({ fmdb, rollback in
                 var result: Int = 0
                 for u in self.userSelected {
-                    if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddGroupMember(p_group_id: self.group.id, p_member_pin: u.pin, p_position: "0")), response.isOk() {
+                    if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getAddGroupMember(p_group_id: self.group.id, p_member_pin: u.pin, p_position: "0")), response.isOk() {
                         let arrayChatId = self.group.topics.filter({ t in
                             return t.title != "Lounge".localized()
                         }).map { t in
                             return t.chatId
                         }.joined(separator: ",")
-                        if let responseTopic = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddChatMember(groupId: self.group.id, chatId: arrayChatId, pin: u.pin)), responseTopic.isOk() {
+                        if let responseTopic = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getAddChatMember(groupId: self.group.id, chatId: arrayChatId, pin: u.pin)), responseTopic.isOk() {
                             let insert = try! Database.shared.insertRecord(fmdb: fmdb, table: "GROUPZ_MEMBER", cvalues: [
                                 "group_id": self.group.id,
                                 "f_pin": u.pin,
@@ -190,16 +190,16 @@ class GroupMemberViewController: UITableViewController {
             user = availableUser[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
             content.image = image
             if !result {
                 content.imageProperties.tintColor = .mainColor
             }
         }
         if user.userType == "23" {
-            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
+            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
         } else if user.userType == "24" {
-            content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
+            content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
         } else {
             content.text = (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces)
         }

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupNameViewController.swift

@@ -43,7 +43,7 @@ class GroupNameViewController: UITableViewController {
     @objc func save(sender: Any) {
         if let text = textField.text {
             DispatchQueue.global().async {
-                if let resp = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: self.data, p_name: text)) {
+                if let resp = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangeGroupInfo(p_group_id: self.data, p_name: text)) {
                     if resp.isOk() {
                         Database.shared.database?.inTransaction({ fmdb, rollback in
                             _ = Database.shared.updateRecord(fmdb: fmdb, table: "GROUPZ", cvalues: ["f_name": text], _where: "group_id = '\(self.data)'")

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/GroupTopicViewController.swift

@@ -40,7 +40,7 @@ class GroupTopicViewController: UITableViewController {
         let id = Date().currentTimeMillis().toHex()
         if let text = topic.text {
             DispatchQueue.global().async {
-                if let resp = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getCreateChat(chat_id: id, title: text, group_id: self.data)) {
+                if let resp = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getCreateChat(chat_id: id, title: text, group_id: self.data)) {
                     if resp.isOk() {
                         Database.shared.database?.inTransaction({ fmdb, rollback in
                             _ = try! Database.shared.insertRecord(fmdb: fmdb, table: "DISCUSSION_FORUM", cvalues: ["chat_id": id, "title": text, "group_id": self.data, "scope_id": "4"], replace: true)

+ 3 - 3
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/HistoryBroadcastViewController.swift

@@ -130,9 +130,9 @@ class HistoryBroadcastViewController: UIViewController, UITableViewDelegate, UIT
             if data.profile.isEmpty && data.pin != "-999" {
                 let user = User.getDataCanNil(pin: data.pin)
                 if user != nil {
-                    imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 } else {
-                    imageView.image = UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    imageView.image = UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 }
             } else {
                 if Utils.getIconDock() != nil {
@@ -146,7 +146,7 @@ class HistoryBroadcastViewController: UIViewController, UITableViewDelegate, UIT
                         })
                     }
                 } else {
-                    getImage(name: data.profile, placeholderImage: UIImage(named: data.pin == "-999" ? "pb_button" : "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                    getImage(name: data.profile, placeholderImage: UIImage(named: data.pin == "-999" ? "pb_button" : "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                         imageView.image = image
                         if !result {
                             imageView.tintColor = .mainColor

+ 22 - 22
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/MessageInfo.swift

@@ -125,17 +125,17 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
             return containerView
         } else if section == 1 {
             if !data.isEmpty && data["read_receipts"] as? String == "8" {
-                imageStatus.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                imageStatus.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 textStatus.text = ("Confirmed".localized() + " " + "by".localized()).uppercased()
             } else {
-                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                 textStatus.text = ("Read".localized() + " " + "by".localized()).uppercased()
             }
         } else if section == 2 && !data.isEmpty && data["read_receipts"] as? String == "8" {
-            imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+            imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
             textStatus.text = ("Read".localized() + " " + "by".localized()).uppercased()
         } else {
-            imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+            imageStatus.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
             textStatus.text = ("Delivered".localized() + " " + "to".localized()).uppercased()
         }
         return containerViewStatus
@@ -215,7 +215,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                         } else {
                             let dataProfile = getDataProfile(f_pin: dataStatusAck[indexPath.row]["f_pin"] as! String, message_id: data["message_id"] as! String)
                             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                            getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                            getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                                 content.image = image
                             })
                             
@@ -246,7 +246,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                         } else {
                             let dataProfile = getDataProfile(f_pin: dataStatusRead[indexPath.row]["f_pin"] as! String, message_id: data["message_id"] as! String)
                             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                            getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                            getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                                 content.image = image
                             })
                             
@@ -278,7 +278,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     } else {
                         let dataProfile = getDataProfile(f_pin: dataStatusRead[indexPath.row]["f_pin"] as! String, message_id: data["message_id"] as! String)
                         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                        getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                        getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                             content.image = image
                         })
                         
@@ -309,7 +309,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     } else {
                         let dataProfile = getDataProfile(f_pin: dataStatusDelivered[indexPath.row]["f_pin"] as! String, message_id: data["message_id"] as! String)
                         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-                        getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
+                        getImage(name: dataProfile["image_id"]!, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath, completion: { result, isDownloaded, image in
                             content.image = image
                         })
                         
@@ -351,7 +351,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
             
             if indexPath.row == 1 {
                 if !data.isEmpty && data["read_receipts"] as? String == "8"{
-                    content.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    content.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                     content.text = "Confirmed".localized()
                     if dataStatus.count != 0 {
                         if (dataStatus[0]["time_ack"] as! String).isEmpty {
@@ -376,7 +376,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                         }
                     }
                 } else {
-                    content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                    content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                     content.text = "Read".localized()
                     if dataStatus.count != 0 {
                         if (dataStatus[0]["time_read"] as! String).isEmpty {
@@ -402,7 +402,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     }
                 }
             } else if indexPath.row == 2 && !data.isEmpty && data["read_receipts"] as? String == "8" {
-                content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
                 content.text = "Read".localized()
                 if dataStatus.count != 0 {
                     if (dataStatus[0]["time_read"] as! String).isEmpty {
@@ -427,7 +427,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     }
                 }
             } else {
-                content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                content.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
                 content.text = "Delivered".localized()
                 if (dataStatus[0]["time_delivered"] as! String).isEmpty {
                     cell.accessoryView = noStatus
@@ -502,13 +502,13 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
             statusMessage.widthAnchor.constraint(equalToConstant: 15).isActive = true
             statusMessage.heightAnchor.constraint(equalToConstant: 15).isActive = true
             if (data["status"]! as! String == "1" || data["status"]! as! String == "2" ) {
-                statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                statusMessage.image = UIImage(named: "checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
             } else if (data["status"]! as! String == "3") {
-                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.lightGray)
+                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.lightGray)
             } else if (data["status"]! as! String == "8") {
-                statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                statusMessage.image = UIImage(named: "message_status_ack", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
             } else {
-                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withTintColor(UIColor.systemBlue)
+                statusMessage.image = UIImage(named: "double-checklist", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withTintColor(UIColor.systemBlue)
             }
             
             if data["is_stared"] as? String == "1" {
@@ -526,9 +526,9 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
             
             if data["read_receipts"] as? String == "8" {
                 let imageAckView = UIImageView()
-                var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                var imageAck = UIImage(named: "ack_icon_gray", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 if data["status"] as? String == "8" {
-                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal)
+                    imageAck = UIImage(named: "ack_icon", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!.withRenderingMode(.alwaysOriginal)
                 }
                 imageAckView.image = imageAck
                 cell.contentView.addSubview(imageAckView)
@@ -559,9 +559,9 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     imageLS.heightAnchor.constraint(equalToConstant: 60.0)
                 ])
                 if data["attachment_flag"] as! String == "26" {
-                    imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    imageLS.image = UIImage(named: "pb_seminar_wpr", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 } else if data["attachment_flag"] as! String == "27" {
-                    imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                    imageLS.image = UIImage(named: "pb_live_tv", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                 } else if data["message_scope_id"] as? String == "18" {
                     imageLS.image = UIImage(systemName: "doc.richtext.fill")
                     imageLS.tintColor = .mainColor
@@ -632,7 +632,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                     imageSticker.leadingAnchor.constraint(equalTo: containerMessage.leadingAnchor, constant: 15).isActive = true
                     imageSticker.bottomAnchor.constraint(equalTo: messageText.topAnchor, constant: -5).isActive = true
                     imageSticker.trailingAnchor.constraint(equalTo: containerMessage.trailingAnchor, constant: -15).isActive = true
-                    imageSticker.image = UIImage(named: (textChat.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil) //resourcesMediaBundle
+                    imageSticker.image = UIImage(named: (textChat.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil) //resourcesMediaBundle
                     imageSticker.contentMode = .scaleAspectFit
                 } else if data["message_scope_id"] as! String == "18" {
                     let data = textChat
@@ -1000,7 +1000,7 @@ class MessageInfo: UIViewController, UITableViewDelegate, UITableViewDataSource
                         }
                     }
                     if (attachment_flag == "11" && message_text.components(separatedBy: "/").count > 1) {
-                        let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: Nexilis.self), with: nil))
+                        let imageSticker = UIImageView(image: UIImage(named: (message_text.components(separatedBy: "/")[1]), in: Bundle.resourceBundle(for: DigiX.self), with: nil))
                         containerReply.addSubview(imageSticker)
                         imageSticker.layer.cornerRadius = 2.0
                         imageSticker.clipsToBounds = true

+ 23 - 23
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ProfileViewController.swift

@@ -102,14 +102,14 @@ public class ProfileViewController: UITableViewController {
                         self.viewUserType.clipsToBounds = true
                         self.viewUserType.isHidden = false
                         if User.isOfficialRegular(official_account: user.official ?? "") || User.isOfficial(official_account: user.official ?? "") {
-                            self.imageUserType.image = UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                            self.imageUserType.image = UIImage(named: "ic_official_flag", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                             self.labelUserType.text = "Official".localized()
                         } else if User.isVerified(official_account: user.official ?? "") {
-                            self.imageUserType.image = UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                            self.imageUserType.image = UIImage(named: "ic_verified", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
                             self.labelUserType.text = "Verified".localized()
                         } else if User.isCallCenter(userType: user.userType ?? "") {
                             let dataCategory = CategoryCC.getDataFromServiceId(service_id: user.ex_offmp!)
-                            self.imageUserType.image = UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+                            self.imageUserType.image = UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
 //                            if dataCategory != nil {
 //                                self.labelUserType.text = "Call Center (\(dataCategory!.service_name))".localized()
 //                            } else {
@@ -259,7 +259,7 @@ public class ProfileViewController: UITableViewController {
         DispatchQueue.global().async {
             let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: self.data)
             tMessage.mBodies[CoreMessage_TMessageKey.OFFLINE_MODE] = value ? "0" : "1"
-            if let resp = Nexilis.writeAndWait(message: tMessage) {
+            if let resp = DigiX.writeAndWait(message: tMessage) {
                 if resp.isOk() {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: [
@@ -301,7 +301,7 @@ public class ProfileViewController: UITableViewController {
         DispatchQueue.global().async {
             let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: self.data)
             tMessage.mBodies[CoreMessage_TMessageKey.PRIVACY_FLAG] = value ? "1" : "0"
-            if let resp = Nexilis.writeAndWait(message: tMessage) {
+            if let resp = DigiX.writeAndWait(message: tMessage) {
                 if resp.isOk() {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: [
@@ -421,7 +421,7 @@ public class ProfileViewController: UITableViewController {
                 completion(false)
                 return
             }
-            if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddFriendQRCode(fpin: self.data)), response.isOk() {
+            if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getAddFriendQRCode(fpin: self.data)), response.isOk() {
                 completion(true)
             } else {
                 completion(false)
@@ -435,7 +435,7 @@ public class ProfileViewController: UITableViewController {
                 completion(false)
                 return
             }
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.removeFriend(lpin: self.user!.pin)), response.isOk() {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.removeFriend(lpin: self.user!.pin)), response.isOk() {
                 completion(true)
             } else {
                 completion(false)
@@ -461,7 +461,7 @@ public class ProfileViewController: UITableViewController {
                     self.navigationController?.present(alert, animated: true)
                 }))
                 firstAlert.addAction(UIAlertAction(title: "Remove Profile Picture".localized(), style: .default, handler: { action in
-                    if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonImage(thumb_id: "")), response.isOk() {
+                    if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonImage(thumb_id: "")), response.isOk() {
                         guard let me = UserDefaults.standard.string(forKey: "me") else {
                             return
                         }
@@ -505,11 +505,11 @@ public class ProfileViewController: UITableViewController {
         if isLoadingAddFriend {
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         isLoadingAddFriend = true
         addFriend { result in
             DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
-                Nexilis.hideLoader { [self] in
+                DigiX.hideLoader { [self] in
                     if result {
                         let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                         imageView.tintColor = .white
@@ -537,7 +537,7 @@ public class ProfileViewController: UITableViewController {
             video.isEnabled = false
             message.isEnabled = false
         }
-        Nexilis.shared.stateUnfriend = self.data
+        DigiX.shared.stateUnfriend = self.data
         let alert = LibAlertController(title: "", message: "Are you sure to unfriend".localized() + " \(self.user!.fullName)", preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "Cancel".localized(), style: UIAlertAction.Style.default, handler: {(_) in
             if self.call != nil {
@@ -545,10 +545,10 @@ public class ProfileViewController: UITableViewController {
                 self.video.isEnabled = true
                 self.message.isEnabled = true
             }
-            Nexilis.shared.stateUnfriend = ""
+            DigiX.shared.stateUnfriend = ""
         } ))
         alert.addAction(UIAlertAction(title: "Delete".localized(), style: .destructive, handler: {(_) in
-            Nexilis.showLoader()
+            DigiX.showLoader()
             self.unFriend { result in
                 DispatchQueue.main.async { [self] in
                     if result {
@@ -559,7 +559,7 @@ public class ProfileViewController: UITableViewController {
                                 _ = Database.shared.deleteRecord(fmdb: fmdb, table: "MESSAGE", _where: "(f_pin='\(self.data)' or l_pin='\(self.data)') and message_scope_id='3'")
                                 cursor.close()
                             }
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 if self.previousViewController is GroupDetailViewController || self.isBNI {
                                     self.isDismiss?()
                                     self.navigationController?.popViewController(animated: true)
@@ -571,7 +571,7 @@ public class ProfileViewController: UITableViewController {
                                     }
                                     self.navigationController?.popToRootViewController(animated: true)
                                 }
-                                Nexilis.shared.stateUnfriend = ""
+                                DigiX.shared.stateUnfriend = ""
                             })
                         })
                     } else {
@@ -580,8 +580,8 @@ public class ProfileViewController: UITableViewController {
                             self.video.isEnabled = true
                             self.message.isEnabled = true
                         }
-                        Nexilis.shared.stateUnfriend = ""
-                        Nexilis.hideLoader(completion: {})
+                        DigiX.shared.stateUnfriend = ""
+                        DigiX.hideLoader(completion: {})
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         publicBanner.dismiss()
@@ -654,7 +654,7 @@ public class ProfileViewController: UITableViewController {
     private func pullBuddy() {
         if let me = UserDefaults.standard.string(forKey: "me") {
             DispatchQueue.global().async {
-                let _ = Nexilis.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
+                let _ = DigiX.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
             }
         }
     }
@@ -668,7 +668,7 @@ extension ProfileViewController: ImageVideoPickerDelegate {
                 return
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3, execute: {
-                Nexilis.showLoader()
+                DigiX.showLoader()
                 DispatchQueue.global().async {
                     let resize = image.resize(target: CGSize(width: 800, height: 600))
                     let documentDir = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
@@ -679,14 +679,14 @@ extension ProfileViewController: ImageVideoPickerDelegate {
                             guard result, progress == 100 else {
                                 return
                             }
-                            if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonImage(thumb_id: fileDir.lastPathComponent)), response.isOk() {
+                            if let response = DigiX.writeAndWait(message: CoreMessage_TMessageBank.getChangePersonImage(thumb_id: fileDir.lastPathComponent)), response.isOk() {
                                 Database.shared.database?.inTransaction({ fmdb, rollback in
                                     _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["image_id": fileDir.lastPathComponent], _where: "f_pin = '\(me)'")
                                 })
                                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "updateFifthTab"), object: nil, userInfo: nil)
                                 
                                 DispatchQueue.main.async {
-                                    Nexilis.hideLoader(completion: { [self] in
+                                    DigiX.hideLoader(completion: { [self] in
                                         self.profile.image = image
                                         let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                         self.user?.thumb = fileDir.lastPathComponent
@@ -698,11 +698,11 @@ extension ProfileViewController: ImageVideoPickerDelegate {
                                     })
                                 }
                             } else {
-                                Nexilis.hideLoader(completion: {})
+                                DigiX.hideLoader(completion: {})
                             }
                         }
                     } else {
-                        Nexilis.hideLoader(completion: {})
+                        DigiX.hideLoader(completion: {})
                     }
                 }
             })

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ScannerViewController.swift

@@ -74,7 +74,7 @@ public class ScannerViewController: UIViewController, QRScannerViewDelegate {
             banner.show()
         } else {
             DispatchQueue.global().async {
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getWebLoginQRCode(f_qrcode: str ?? "")) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getWebLoginQRCode(f_qrcode: str ?? "")) {
                     if response.isOk() {
                         DispatchQueue.main.async {
                             let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))

+ 11 - 11
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SetInternalCSAccount.swift

@@ -109,9 +109,9 @@ public class SetInternalCSAccount: UITableViewController {
         let alert = LibAlertController(title: "", message: "Are you sure want to set".localized() + " \(user.fullName) " + (isSetCS ? "become CS Account?".localized() : "become Internal Account?".localized()), preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "No".localized(), style: .default, handler: nil))
         alert.addAction(UIAlertAction(title: "Yes".localized(), style: .default, handler: {(_) in
-            Nexilis.showLoader()
+            DigiX.showLoader()
             Database.shared.database?.inTransaction({ fmdb, rollback in
-                if let result = Nexilis.writeSync(message: CoreMessage_TMessageBank.getManagementContactCenter(user_type: (self.isSetCS ? "1" : "3"), l_pin: user.pin), timeout: 5000) {
+                if let result = DigiX.writeSync(message: CoreMessage_TMessageBank.getManagementContactCenter(user_type: (self.isSetCS ? "1" : "3"), l_pin: user.pin), timeout: 5000) {
                     if result.isOk() {
                         DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
                             let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -125,7 +125,7 @@ public class SetInternalCSAccount: UITableViewController {
                                     self.tableView.reloadData()
                                 }
                             }
-                            Nexilis.hideLoader {}
+                            DigiX.hideLoader {}
                         })
                     } else {
                         DispatchQueue.main.async {
@@ -133,7 +133,7 @@ public class SetInternalCSAccount: UITableViewController {
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .top)
                             banner.show()
-                            Nexilis.hideLoader {}
+                            DigiX.hideLoader {}
                         }
                     }
                 } else {
@@ -153,9 +153,9 @@ public class SetInternalCSAccount: UITableViewController {
         let alert = LibAlertController(title: "", message: "Are you sure want to unset".localized() + " \(user.fullName) " + (isSetCS ? "from CS Account?".localized() : "from Internal Account?".localized()), preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "No".localized(), style: UIAlertAction.Style.default, handler: nil))
         alert.addAction(UIAlertAction(title: "Yes".localized(), style: .destructive, handler: {(_) in
-            Nexilis.showLoader()
+            DigiX.showLoader()
             Database.shared.database?.inTransaction({ fmdb, rollback in
-                if let result = Nexilis.writeSync(message: CoreMessage_TMessageBank.getManagementContactCenter(user_type: (self.isSetCS ? "0" : "2"), l_pin: user.pin), timeout: 5000) {
+                if let result = DigiX.writeSync(message: CoreMessage_TMessageBank.getManagementContactCenter(user_type: (self.isSetCS ? "0" : "2"), l_pin: user.pin), timeout: 5000) {
                     if result.isOk() {
                         DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
                             let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -169,7 +169,7 @@ public class SetInternalCSAccount: UITableViewController {
                                     self.tableView.reloadData()
                                 }
                             }
-                            Nexilis.hideLoader {}
+                            DigiX.hideLoader {}
                         })
                     } else {
                         DispatchQueue.main.async {
@@ -177,7 +177,7 @@ public class SetInternalCSAccount: UITableViewController {
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .top)
                             banner.show()
-                            Nexilis.hideLoader {}
+                            DigiX.hideLoader {}
                         }
                     }
                 } else {
@@ -221,16 +221,16 @@ public class SetInternalCSAccount: UITableViewController {
             user = availableUser[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
             content.image = image
             if !result {
                 content.imageProperties.tintColor = .mainColor
             }
         }
         if user.userType == "23" {
-            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
+            content.attributedText = self.set(image: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
         } else if user.userType == "24" {
-            content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
+            content.attributedText = self.set(image: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, with: " " + (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces), size: 15, y: -4)
         } else {
             content.text = (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces)
         }

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SetOfficerBNI.swift

@@ -351,7 +351,7 @@ class SetOfficerBNI: UIViewController {
             }
             let message = CoreMessage_TMessageBank.getManagementContactCenterBNI(l_pin:  self.f_pin, type: "1", category_id: "\(self.chosenData[self.chosenData.count - 1].service_id)", area_id: self.chosenSecondLayer == "Yes".localized() ? "1" : "0", is_second_layer: self.chosenWorkingArea != nil && self.chosenSecondLayer == "Yes".localized() ? self.chosenWorkingArea!.area_id : "")
 //            message.mBodies[CoreMessage_TMessageKey.CATEGORY_ID] = "\(self.chosenData[self.chosenData.count - 1].service_id)"
-            if let response = Nexilis.writeSync(message: message) {
+            if let response = DigiX.writeSync(message: message) {
                 if response.isOk() {
                     DispatchQueue.main.async {
                         let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))

+ 23 - 23
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SettingTableViewController.swift

@@ -112,8 +112,8 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
                         Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Change Admin / Internal Password".localized()),
                         Item(icon: UIImage(systemName: "laptopcomputer.and.iphone"), title: "Sign-In to Web".localized()),
-                        Item(icon: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, title: "Set Internal Account".localized()),
-                        Item(icon: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, title: "Set CS Account".localized()),
+                        Item(icon: UIImage(named: "ic_internal", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, title: "Set Internal Account".localized()),
+                        Item(icon: UIImage(named: "pb_call_center", in: Bundle.resourceBundle(for: DigiX.self), with: nil)!, title: "Set CS Account".localized()),
                     ]
                 } else if User.isInternal(userType: cursorUser.string(forColumnIndex: 0) ?? "") || User.isCallCenter(userType: cursorUser.string(forColumnIndex: 0) ?? "") || User.isVerified(official_account: cursorUser.string(forColumnIndex: 2) ?? "") {
                     Item.menus["Personal"] = [
@@ -216,7 +216,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
         ]
         Item.menus["Version"] = [
             Item(icon: UIImage(systemName: "gear"), title: "Version".localized()),
-            Item(icon: UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), title: "Powered by Telkomsel".localized()),
+            Item(icon: UIImage(named: "pb_powered_button", in: Bundle.resourceBundle(for: DigiX.self), with: nil), title: "Powered by Telkomsel".localized()),
         ]
     }
     
@@ -353,7 +353,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
     public override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let item = Item.menuFor(section: indexPath.section)[indexPath.row]
         if item.title == "Personal Information".localized() {
-            if(Nexilis.checkIsChangePerson()){
+            if(DigiX.checkIsChangePerson()){
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                 controller.data = UserDefaults.standard.string(forKey: "me")!
                 controller.flag = .me
@@ -367,7 +367,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                 navigationController?.show(controller, sender: nil)
             }
         } else if item.title == "Access Admin / Internal Features".localized() || item.title == "Change Admin / Internal Password".localized() {
-            if(Nexilis.checkIsChangePerson()){
+            if(DigiX.checkIsChangePerson()){
                 if !CheckConnection.isConnectedToNetwork()  || API.nGetCLXConnState() == 0 {
                     let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                     imageView.tintColor = .white
@@ -455,25 +455,25 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                     banner.show()
                     return
                 }
-                Nexilis.showLoader()
+                DigiX.showLoader()
                 DispatchQueue.global().async {
-                    let apiKey = Nexilis.sAPIKey
+                    let apiKey = DigiX.sAPIKey
                     var id = UIDevice.current.identifierForVendor?.uuidString ?? "UNK-DEVICE"
-                    if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignUpApi(api: apiKey, p_pin: id), timeout: 30 * 1000) {
+                    if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignUpApi(api: apiKey, p_pin: id), timeout: 30 * 1000) {
                         id = response.getBody(key: CoreMessage_TMessageKey.F_PIN, default_value: "")
                         if(!id.isEmpty){
-                            Nexilis.changeUser(f_pin: id)
+                            DigiX.changeUser(f_pin: id)
                             UserDefaults.standard.setValue(id, forKey: "me")
                             Utils.setProfile(value: false)
                             UserDefaults.standard.synchronize()
                             if Utils.getForceAnonymous() {
                                 self.deleteAllRecordDatabase()
                                 UserDefaults.standard.removeObject(forKey: "device_id")
-                                Nexilis.destroyAll()
-                                _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                                DigiX.destroyAll()
+                                _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
                             }
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader(completion: {
+                                DigiX.hideLoader(completion: {
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                     imageView.tintColor = .white
                                     let banner = FloatingNotificationBanner(title: "Successfully Sign-Out".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -487,7 +487,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                                 })
                             }
                         } else {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -496,7 +496,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                         }
                     } else {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -615,12 +615,12 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                     banner.show()
                     return
                 }
-                Nexilis.showLoader()
+                DigiX.showLoader()
                 if type == "admin" {
                     self.signInAdmin(password: textField!.text!, completion: { result in
                         if result {
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader {
+                                DigiX.hideLoader {
                                     self.makeMenu()
                                     self.tableView.reloadData()
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -631,7 +631,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                             }
                         } else {
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader {}
+                                DigiX.hideLoader {}
                             }
                         }
                     })
@@ -639,7 +639,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                     self.signInInternal(password: textField!.text!, completion: { result in
                         if result {
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader {
+                                DigiX.hideLoader {
                                     self.makeMenu()
                                     self.tableView.reloadData()
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -650,7 +650,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                             }
                         } else {
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader {}
+                                DigiX.hideLoader {}
                             }
                         }
                     })
@@ -772,7 +772,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let p_password = password
             let md5Hex = p_password
             var result: Bool = false
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
                     result = true
                 }
@@ -807,7 +807,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let p_password = password
             let md5Hex = p_password
             var result: Bool = false
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
                     result = true
                 }
@@ -844,7 +844,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let md5Hex = p_password
             let md5HexNew = n_password
             var result: Bool = false
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
                     result = true
                 }
@@ -881,7 +881,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let md5Hex = p_password
             let md5HexNew = n_password
             var result: Bool = false
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
                     result = true
                 }

+ 22 - 22
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SignUpSignIn.swift

@@ -91,12 +91,12 @@ public class SignUpSignIn: UIViewController {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         DispatchQueue.global().async {
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSendOTPLogin(p_email: email), timeout: 30 * 1000) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSendOTPLogin(p_email: email), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") != "00" {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unregistered email account".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -105,14 +105,14 @@ public class SignUpSignIn: UIViewController {
                     }
                 } else {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             self.showPageOTP(email: email)
                         })
                     }
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader(completion: {
+                    DigiX.hideLoader(completion: {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -128,12 +128,12 @@ public class SignUpSignIn: UIViewController {
         showOTPVC.email = email
         showOTPVC.showWrongOTP = errCode
         showOTPVC.isDismiss = { code in
-            Nexilis.showLoader()
+            DigiX.showLoader()
             DispatchQueue.global().async {
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSendVerifyChangeDevice(p_email: email, p_vercode: code), timeout: 30 * 1000) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSendVerifyChangeDevice(p_email: email, p_vercode: code), timeout: 30 * 1000) {
                     if !response.isOk() {
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 self.showPageOTP(email: email, errCode: response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99"))
                             })
                         }
@@ -142,13 +142,13 @@ public class SignUpSignIn: UIViewController {
                         let id = response.getBody(key: CoreMessage_TMessageKey.F_PIN, default_value: "")
                         let thumb = response.getBody(key: CoreMessage_TMessageKey.THUMB_ID, default_value: "")
                         if(!id.isEmpty) {
-                            Nexilis.changeUser(f_pin: id)
+                            DigiX.changeUser(f_pin: id)
                             Utils.setProfile(value: true)
                             UserDefaults.standard.synchronize()
                             // pos registration
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
                             DispatchQueue.main.async {
-                                Nexilis.hideLoader(completion: {
+                                DigiX.hideLoader(completion: {
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                     imageView.tintColor = .white
                                     let banner = FloatingNotificationBanner(title: "Successfully Sign-In".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -172,7 +172,7 @@ public class SignUpSignIn: UIViewController {
                     }
                 } else {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -249,13 +249,13 @@ public class SignUpSignIn: UIViewController {
             banner.show()
             return
         }
-        Nexilis.showLoader()
+        DigiX.showLoader()
         DispatchQueue.global().async {
             let md5Hex = password
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignUpSignInAPI(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getSignUpSignInAPI(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "20" {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Invalid user / Username and password does not match".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -264,7 +264,7 @@ public class SignUpSignIn: UIViewController {
                     }
                 } else if !response.isOk() {
                     DispatchQueue.main.async {
-                        Nexilis.hideLoader(completion: {
+                        DigiX.hideLoader(completion: {
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                             imageView.tintColor = .white
                             let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -279,14 +279,14 @@ public class SignUpSignIn: UIViewController {
                         let thumb = response.getBody(key: CoreMessage_TMessageKey.THUMB_ID, default_value: "")
                         let device_id = response.getBody(key: CoreMessage_TMessageKey.IMEI, default_value: id)
                         if(!id.isEmpty) {
-                            Nexilis.changeUser(f_pin: device_id)
+                            DigiX.changeUser(f_pin: device_id)
                             UserDefaults.standard.setValue(device_id, forKey: "device_id")
                             Utils.setProfile(value: true)
                             UserDefaults.standard.synchronize()
                             // pos registration
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                            _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
                             DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
-                                Nexilis.hideLoader(completion: {
+                                DigiX.hideLoader(completion: {
                                     let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                     imageView.tintColor = .white
                                     let banner = FloatingNotificationBanner(title: "Successfully Sign-In".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -312,7 +312,7 @@ public class SignUpSignIn: UIViewController {
                         Database.shared.database?.inTransaction({ (fmdb, rollback) in
                             if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: "SELECT * FROM BUDDY where f_pin = '\(idMe)' ") {
                                 if !cursorData.next() {
-                                    _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: idMe))
+                                    _ = DigiX.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: idMe))
                                 } else {
                                     _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["first_name": first , "last_name": last], _where: "f_pin = '\(idMe)'")
                                 }
@@ -323,7 +323,7 @@ public class SignUpSignIn: UIViewController {
                         UserDefaults.standard.synchronize()
     //                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "updateFifthTab"), object: nil, userInfo: nil)
                         DispatchQueue.main.async {
-                            Nexilis.hideLoader(completion: {
+                            DigiX.hideLoader(completion: {
                                 let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
                                 imageView.tintColor = .white
                                 let banner = FloatingNotificationBanner(title: "Successfully Sign-Up".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .success, colors: nil, iconPosition: .center)
@@ -346,7 +346,7 @@ public class SignUpSignIn: UIViewController {
                 }
             } else {
                 DispatchQueue.main.async {
-                    Nexilis.hideLoader(completion: {
+                    DigiX.hideLoader(completion: {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
                         let banner = FloatingNotificationBanner(title: "Unable to access servers. Try again later".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)

+ 6 - 6
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/CreateSeminarViewController.swift

@@ -147,7 +147,7 @@ public class CreateSeminarViewController: UITableViewController {
             }
             let dataBlog = data["blog"] as? String
 //            if dataBlog != nil {
-//                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getIsInitiatorJoin(p_broadcaster: by, p_category: "3", blog_id: dataBlog!)) {
+//                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getIsInitiatorJoin(p_broadcaster: by, p_category: "3", blog_id: dataBlog!)) {
 //                    if response.getBody(key: CoreMessage_TMessageKey.ERRCOD) != "00" {
 //                        let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
 //                        imageView.tintColor = .white
@@ -166,7 +166,7 @@ public class CreateSeminarViewController: UITableViewController {
             controller.data = by
             controller.streamingData = data
         } else {
-            let goAudioCall = Nexilis.checkMicPermission()
+            let goAudioCall = DigiX.checkMicPermission()
             if !goAudioCall {
                 let alert = LibAlertController(title: "Attention!".localized(), message: "Please allow microphone permission in your settings".localized(), preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: { _ in
@@ -282,7 +282,7 @@ public class CreateSeminarViewController: UITableViewController {
                     return
                 }
                 
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.createSeminar(title: "1~\(data["title"] ?? "")", type: data["type"] as! String, category: "4", notifType: data["broadcast_type"] as! String, blogId: data["blog"] as! String, data: json)) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.createSeminar(title: "1~\(data["title"] ?? "")", type: data["type"] as! String, category: "4", notifType: data["broadcast_type"] as! String, blogId: data["blog"] as! String, data: json)) {
                     if response.getBody(key: CoreMessage_TMessageKey.ERRCOD) != "00" {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
@@ -298,7 +298,7 @@ public class CreateSeminarViewController: UITableViewController {
                     return
                 }
                 
-//                Nexilis.saveMessageBot(textMessage: json, blog_id: data["blog"] as? String ?? "", attachment_type: "26")
+//                DigiX.saveMessageBot(textMessage: json, blog_id: data["blog"] as? String ?? "", attachment_type: "26")
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "reloadTabChats"), object: nil, userInfo: nil)
             }
             controller.data = UserDefaults.standard.string(forKey: "me")!
@@ -493,7 +493,7 @@ public class CreateSeminarViewController: UITableViewController {
                 cell.selectionStyle = .default
             } else {
                 let data = users[indexPath.row - 1]
-                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
                 }
                 content.text = data.fullName
@@ -511,7 +511,7 @@ public class CreateSeminarViewController: UITableViewController {
                 cell.selectionStyle = .default
             } else {
                 let data = groups[indexPath.row - 1]
-                getImage(name: data.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: data.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
                 }
                 content.text = data.name

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/CreateViewController.swift

@@ -132,7 +132,7 @@ class CreateViewController: UITableViewController {
                 return
             }
             
-            if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.createLS(title: "1~\(streamingTitle)", type: type, category: "3", tagline: streamingTag.text ?? "", notifType: notif, blogId: id, data: json)) {
+            if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.createLS(title: "1~\(streamingTitle)", type: type, category: "3", tagline: streamingTag.text ?? "", notifType: notif, blogId: id, data: json)) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD) != "00" {
                     showToast(message: "Server Busy. Please try again.".localized(), font: UIFont.systemFont(ofSize: 12), controller: self)
                 }

+ 6 - 6
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraCreateStreamingViewController.swift

@@ -165,7 +165,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
             }
             let dataBlog = data["blog"] as? String
             if dataBlog != nil {
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getIsInitiatorJoin(p_broadcaster: by, p_category: "3", blog_id: dataBlog!)) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.getIsInitiatorJoin(p_broadcaster: by, p_category: "3", blog_id: dataBlog!)) {
                     if response.getBody(key: CoreMessage_TMessageKey.ERRCOD) != "00" {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
@@ -184,7 +184,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
             controller.data = by
             controller.streamingData = data
         } else {
-            let goAudioCall = Nexilis.checkMicPermission()
+            let goAudioCall = DigiX.checkMicPermission()
             if !goAudioCall {
                 let alert = LibAlertController(title: "Attention!".localized(), message: "Please allow microphone permission in your settings".localized(), preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: { _ in
@@ -301,7 +301,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
                     return
                 }
                 
-                if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.createLS(title: "1~\(data["title"] ?? "")", type: data["type"] as! String, category: "3", tagline: data["tagline"] as! String, notifType: data["broadcast_type"] as! String, blogId: data["blog"] as! String, data: json)) {
+                if let response = DigiX.writeSync(message: CoreMessage_TMessageBank.createLS(title: "1~\(data["title"] ?? "")", type: data["type"] as! String, category: "3", tagline: data["tagline"] as! String, notifType: data["broadcast_type"] as! String, blogId: data["blog"] as! String, data: json)) {
                     if response.getBody(key: CoreMessage_TMessageKey.ERRCOD) != "00" {
                         let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
                         imageView.tintColor = .white
@@ -317,7 +317,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
                     return
                 }
                 
-//                Nexilis.saveMessageBot(textMessage: json, blog_id: data["blog"] as? String ?? "", attachment_type: "27")
+//                DigiX.saveMessageBot(textMessage: json, blog_id: data["blog"] as? String ?? "", attachment_type: "27")
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "reloadTabChats"), object: nil, userInfo: nil)
             }
             controller.data = UserDefaults.standard.string(forKey: "me")!
@@ -515,7 +515,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
                 cell.selectionStyle = .default
             } else {
                 let data = users[indexPath.row - 1]
-                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: data.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
                 }
                 content.text = data.fullName
@@ -533,7 +533,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
                 cell.selectionStyle = .default
             } else {
                 let data = groups[indexPath.row - 1]
-                getImage(name: data.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+                getImage(name: data.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
                     content.image = image
                 }
                 content.text = data.name

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraGroupChooserViewController.swift

@@ -171,7 +171,7 @@ class QmeraGroupStreamingViewController: UITableViewController {
             group = available[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-        getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+        getImage(name: group.profile, placeholderImage: UIImage(named: "Conversation---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
             content.image = image
         }
         content.text = group.name

+ 8 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraStreamingViewController.swift

@@ -122,7 +122,7 @@ class QmeraStreamingViewController: UIViewController {
     
     lazy var send: UIButton = {
         let button = UIButton()
-        button.setImage(UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.contentVerticalAlignment = .fill
         button.contentHorizontalAlignment = .fill
@@ -221,7 +221,7 @@ class QmeraStreamingViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
         
-        Nexilis.shared.streamingDelagate = self
+        DigiX.shared.streamingDelagate = self
         if isLive {
             let buttonRotate = UIButton()
             buttonRotate.frame = CGRect(x:0, y:0, width:30, height:30)
@@ -309,10 +309,10 @@ class QmeraStreamingViewController: UIViewController {
             return
         }
         if liked {
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.getSendEmotionLP(p_pin: me.pin, l_pin: data, emotion_type: "3"))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.getSendEmotionLP(p_pin: me.pin, l_pin: data, emotion_type: "3"))
             like.setImage(UIImage(systemName: "heart")?.withTintColor(.white, renderingMode: .alwaysOriginal), for: .normal)
         } else {
-            _ = Nexilis.write(message: CoreMessage_TMessageBank.getSendEmotionLP(p_pin: me.pin, l_pin: data, emotion_type: "2"))
+            _ = DigiX.write(message: CoreMessage_TMessageBank.getSendEmotionLP(p_pin: me.pin, l_pin: data, emotion_type: "2"))
             like.setImage(UIImage(systemName: "heart.fill")?.withTintColor(.red, renderingMode: .alwaysOriginal), for: .normal)
         }
         liked = !liked
@@ -394,21 +394,21 @@ class QmeraStreamingViewController: UIViewController {
         guard let blog = streamingData["blog"] as? String else {
             return
         }
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getStartLPInvited(title: title, type: type, typeValue: "", category: "3", blog_id: blog, tagline: tagline))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getStartLPInvited(title: title, type: type, typeValue: "", category: "3", blog_id: blog, tagline: tagline))
     }
     
     private func sendJoin() {
         let id = Date().currentTimeMillis().toHex()
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.joinLiveVideo(broadcast_id: data, request_id: id))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.joinLiveVideo(broadcast_id: data, request_id: id))
     }
     
     public func sendLeft() {
         let id = Date().currentTimeMillis().toHex()
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.leftLiveVideo(broadcast_id: data, request_id: id))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.leftLiveVideo(broadcast_id: data, request_id: id))
     }
     
     private func sendChat(text: String) {
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getSendLSChat(l_pin: data, message_text: text))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getSendLSChat(l_pin: data, message_text: text))
     }
     
 }

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/QmeraUserChooserViewController.swift

@@ -92,7 +92,7 @@ class QmeraUserChooserViewController: UITableViewController {
     private func pullBuddy() {
         if let me = UserDefaults.standard.string(forKey: "me") {
             DispatchQueue.global().async {
-                let _ = Nexilis.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
+                let _ = DigiX.write(message: CoreMessage_TMessageBank.getBatchBuddiesInfos(p_f_pin: me, last_update: 0))
             }
         }
     }
@@ -171,7 +171,7 @@ class QmeraUserChooserViewController: UITableViewController {
             user = availableUser[indexPath.row]
         }
         content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
-        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
+        getImage(name: user.thumb, placeholderImage: UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil), isCircle: true, tableView: tableView, indexPath: indexPath) { result, isDownloaded, image in
             content.image = image
         }
         content.text = "\(user.firstName) \(user.lastName)"

+ 3 - 3
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/SeminarListViewController.swift

@@ -168,7 +168,7 @@ extension SeminarListViewController: UITableViewDataSource {
         cell.imagePerson.layer.masksToBounds = false
         cell.imagePerson.circle()
         cell.imagePerson.clipsToBounds = true
-        cell.imagePerson.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
+        cell.imagePerson.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: DigiX.self), with: nil)
         cell.imagePerson.contentMode = .scaleAspectFit
         let user: SeminarViewer
         if isFilltering {
@@ -184,11 +184,11 @@ extension SeminarListViewController: UITableViewDataSource {
         cell.namePerson.text = user.name
         if (user.isSpeak){
             cell.speakerButton.isHidden = false
-            cell.speakerButton.setImage(UIImage(named: "pb_seminar_speaking", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+            cell.speakerButton.setImage(UIImage(named: "pb_seminar_speaking", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         }
         else if (user.isRaise){
             cell.speakerButton.isHidden = false
-            cell.speakerButton.setImage(UIImage(named: "pb_raise_hand", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+            cell.speakerButton.setImage(UIImage(named: "pb_raise_hand", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         }
         else {
             cell.speakerButton.isHidden = true

+ 12 - 12
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/SeminarViewController.swift

@@ -147,7 +147,7 @@ class SeminarViewController: UIViewController {
     
     lazy var send: UIButton = {
         let button = UIButton()
-        button.setImage(UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "Send-(White)", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.contentVerticalAlignment = .fill
         button.contentHorizontalAlignment = .fill
@@ -159,7 +159,7 @@ class SeminarViewController: UIViewController {
     lazy var raiseHandBtn: UIButton = {
         let button = UIButton()
         button.frame = CGRect(x:0, y:0, width:40, height:40)
-        button.setImage(UIImage(named: "pb_raise_hand", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "pb_raise_hand", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.layer.cornerRadius = button.maxCornerRadius()
         button.backgroundColor = .mainColor
@@ -170,7 +170,7 @@ class SeminarViewController: UIViewController {
     lazy var screenShareBtn: UIButton = {
         let button = UIButton()
         button.frame = CGRect(x:0, y:0, width:40, height:40)
-        button.setImage(UIImage(named: "pb_screen_share", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "pb_screen_share", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.layer.cornerRadius = button.maxCornerRadius()
         button.backgroundColor = .mainColor
@@ -181,7 +181,7 @@ class SeminarViewController: UIViewController {
     lazy var whiteboardBtn: UIButton = {
         let button = UIButton()
         button.frame = CGRect(x:0, y:0, width:40, height:40)
-        button.setImage(UIImage(named: "pb_od_draw", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "pb_od_draw", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.layer.cornerRadius = button.maxCornerRadius()
         button.backgroundColor = .mainColor
@@ -192,7 +192,7 @@ class SeminarViewController: UIViewController {
     lazy var buttonRotate: UIButton = {
         let button = UIButton()
         button.frame = CGRect(x:0, y:0, width:40, height:40)
-        button.setImage(UIImage(named: "pb_ic_camera_rear", in: Bundle.resourceBundle(for: Nexilis.self), with: nil), for: .normal)
+        button.setImage(UIImage(named: "pb_ic_camera_rear", in: Bundle.resourceBundle(for: DigiX.self), with: nil), for: .normal)
         button.imageView?.contentMode = .scaleAspectFit
         button.layer.cornerRadius = button.maxCornerRadius()
         button.backgroundColor = .mainColor
@@ -313,7 +313,7 @@ class SeminarViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
         
-        Nexilis.shared.seminarDelegate = self
+        DigiX.shared.seminarDelegate = self
         if isLive {
             API.ibca(sTitle: data, nCamIdx: 1, nResIdx: 2, nVQuality: 4, tvCameraPreview: tvCameraPreviewB, ivRemoteS: ivRemoteViewS)
         } else {
@@ -444,7 +444,7 @@ class SeminarViewController: UIViewController {
     
     @objc func whiteboard(sender: Any?) {
         // TODO: implement whiteboard
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getSeminarDraw(broadcaster: data, flag: "1"))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getSeminarDraw(broadcaster: data, flag: "1"))
         
         
     }
@@ -500,21 +500,21 @@ class SeminarViewController: UIViewController {
         guard let blog = streamingData["blog"] as? String else {
             return
         }
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getStartSeminarInvited(title: "1~\(title)", type: type, typeValue: "", category: "3", blog_id: blog))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getStartSeminarInvited(title: "1~\(title)", type: type, typeValue: "", category: "3", blog_id: blog))
     }
     
     private func sendJoin() {
         let id = Date().currentTimeMillis().toHex()
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.joinSeminar(broadcast_id: data, request_id: id))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.joinSeminar(broadcast_id: data, request_id: id))
     }
     
     public func sendLeft() {
         let id = Date().currentTimeMillis().toHex()
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.leftSeminar(broadcast_id: data, request_id: id))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.leftSeminar(broadcast_id: data, request_id: id))
     }
     
     private func sendChat(text: String) {
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getSendSeminarChat(l_pin: data, message_text: text))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getSendSeminarChat(l_pin: data, message_text: text))
     }
     
     @objc func raiseHand(sender: Any?) {
@@ -523,7 +523,7 @@ class SeminarViewController: UIViewController {
         }
         let status = hasRaiseHand ? "0" : "1"
         hasRaiseHand = !hasRaiseHand
-        _ = Nexilis.write(message: CoreMessage_TMessageBank.getSeminarRaiseHand(p_pin: me.pin, l_pin: data, status: status))
+        _ = DigiX.write(message: CoreMessage_TMessageBank.getSeminarRaiseHand(p_pin: me.pin, l_pin: data, status: status))
     }
 
     @objc func showListViewer(sender: Any?){

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Streaming/StreamingViewController.swift

@@ -26,7 +26,7 @@ class StreamingViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        Nexilis.shared.streamingDelagate = self
+        DigiX.shared.streamingDelagate = self
         
         navigationController?.navigationBar.topItem?.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
         

+ 4 - 4
appbuilder-ios/DigiXLite/DigiXLite/Source/Whiteboard.swift

@@ -63,16 +63,16 @@ public class Whiteboard: WhiteboardDelegate {
         let me = UserDefaults.standard.string(forKey: "me")!
         let tid = CoreMessage_TMessageUtil.getTID()
         roomId = "\(me)wbvc\(tid)"
-        _ = Nexilis.writeDraw(data: "WB/0/\(roomId)/\(destinations)")
+        _ = DigiX.writeDraw(data: "WB/0/\(roomId)/\(destinations)")
     }
     
     public func sendJoin(){
         canvas?.setLineColor(color: UIColor(hexString: "FF00FF00"))
-        _ = Nexilis.writeDraw(data: "WB/22/\(roomId)")
+        _ = DigiX.writeDraw(data: "WB/22/\(roomId)")
     }
     
     public func sendTerminate(){
-        _ = Nexilis.writeDraw(data: "WB/88")
+        _ = DigiX.writeDraw(data: "WB/88")
     }
     
     func changePenSize(dest: String, size: Double){
@@ -94,7 +94,7 @@ public class Whiteboard: WhiteboardDelegate {
     
     public func sendClear(){
         let ms = Date().currentTimeMillis()
-        _ = Nexilis.writeDraw(data: "WB/3/\(ms)")
+        _ = DigiX.writeDraw(data: "WB/3/\(ms)")
     }
     
     public func clear() {

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/WhiteboardCanvas.swift

@@ -238,7 +238,7 @@ public class WhiteboardCanvas: UIView {
     
     func drawWhiteboard(destination: String, x: String, y: String, w: String, h: String, fc: String, sw: String, xo: String, yo: String){
         //print(("DRAW HMM \(destination)")
-        _ = Nexilis.writeDraw(data: "WB/1/\(x)/\(y)/\(w)/\(h)/\(fc)/\(sw)/\(xo)/\(yo)")
+        _ = DigiX.writeDraw(data: "WB/1/\(x)/\(y)/\(w)/\(h)/\(fc)/\(sw)/\(xo)/\(yo)")
     }
     
 }