update

appbuilder-ios/AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -63,6 +63,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         "$('#header-layout').find('.col-4').removeClass('col-4').addClass('col');"
         let script: WKUserScript = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
         contentController.addUserScript(script)
+        NotificationCenter.default.addObserver(self, selector: #selector(onShowAC(notification:)), name: NSNotification.Name(rawValue: "onShowAC"), object: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -87,6 +88,9 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         case "3":
             address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab3-commerce?f_pin=\(me ?? "")&lang=\(intLang)"
             myURL = URL(string: address)
+        case "4":
+            address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab1-video?f_pin=\(me ?? "")&lang=\(intLang)"
+            myURL = URL(string: address)
         default:
             if(!ViewController.sURL.isEmpty){
                 if(ViewController.sURL.lowercased().contains("https://") || ViewController.sURL.lowercased().contains("http://")){
@@ -114,6 +118,12 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         navigationController?.setNavigationBarHidden(!isBurger, animated: false)
     }
     
+    @objc func onShowAC(notification: NSNotification) {
+        self.webView.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
+        view.endEditing(true)
+        resignFirstResponder()
+    }
+    
     override func viewWillDisappear(_ animated: Bool) {
         self.webView.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
     }
@@ -147,6 +157,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         }
         if ViewController.middleButton.isDescendant(of: viewController!.view) {
             DispatchQueue.main.async {
+                ViewController.hideDockedButton()
                 if let viewController = viewController as? ViewController {
                     viewController.tabBar.isHidden = true
                 }
@@ -163,11 +174,11 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         if !(viewController is ViewController) {
             viewController = self.parent
         }
-        if !ViewController.middleButton.isDescendant(of: viewController!.view) {
+        if ViewController.middleButton.isHidden {
             ViewController.isExpandButton = false
             if let viewController = viewController as? ViewController {
                 viewController.tabBar.isHidden = false
-                viewController.createMidFloatingButton()
+                ViewController.middleButton.isHidden = false
             }
         }
     }
@@ -196,7 +207,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
                     self.webView.evaluateJavaScript("blockUser('\(param1)',true);")
                 } else if param2 == "follow_user" {
                     self.webView.evaluateJavaScript("followUser('\(param1.split(separator: "|")[0])',\(param1.split(separator: "|")[1]),true);")
-                } else if param2 == "homepage" {
+                } else if param2 == "homepage" || param2 == "gif" {
                     self.webView.evaluateJavaScript("window.location.href = '\(param1)';")
                 } else {
                     self.webView.evaluateJavaScript("openNewPost(true);")
@@ -388,22 +399,26 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         self.recognitionTask = speechRecognizer?.recognitionTask(with: recognitionRequest, resultHandler: { (result, error) in
 
             var isFinal = false
+            var text = ""
 
             if result != nil {
-                let text = result?.bestTranscription.formattedString
+                text = result?.bestTranscription.formattedString ?? ""
                 isFinal = (result?.isFinal)!
                 self.alertController.dismiss(animated: true)
                 self.audioEngine.stop()
                 self.recognitionRequest?.endAudio()
-                self.webView.evaluateJavaScript("toggleVoiceButton(false)")
-                self.webView.evaluateJavaScript("submitVoiceSearch('\(text ?? "")')")
             } else {
                 self.alertController.dismiss(animated: true)
             }
 
             if error != nil || isFinal {
-
-                self.audioEngine.stop()
+                if error == nil {
+                    self.webView.evaluateJavaScript("toggleVoiceButton(false)")
+                    self.webView.evaluateJavaScript("submitVoiceSearch('\(text)')")
+                } else {
+                    self.audioEngine.stop()
+                    self.recognitionRequest?.endAudio()
+                }
                 inputNode.removeTap(onBus: 0)
 
                 self.recognitionRequest = nil
@@ -443,6 +458,7 @@ extension FirstTabViewController: SFSpeechRecognizerDelegate {
 extension FirstTabViewController: WKUIDelegate, WKNavigationDelegate {
       func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
             if let urlStr = navigationAction.request.url?.absoluteString {
+                print("url: \(urlStr)")
                 collapseDocked()
                 if urlStr.contains("nexilis/pages/tab1-main-only") || urlStr.contains("nexilis/pages/tab3-main-only") || urlStr.contains("nexilis/pages/tab1-main") || urlStr.contains("nexilis/pages/tab3-commerce") {
                     ViewController.alwaysHideButton = false

appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -77,6 +77,22 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
         }
     }
     
+    public override func viewDidAppear(_ animated: Bool) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2, execute: {
+            var viewController = UIApplication.shared.windows.first!.rootViewController
+            if !(viewController is ViewController) {
+                viewController = self.parent
+            }
+            if ViewController.middleButton.isHidden {
+                ViewController.isExpandButton = false
+                if let viewController = viewController as? ViewController {
+                    viewController.tabBar.isHidden = false
+                    ViewController.middleButton.isHidden = false
+                }
+            }
+        })
+    }
+    
     @objc func vibrateModeSwitch() {
         UserDefaults.standard.set(switchVibrateMode.isOn, forKey: "vibrateMode")
     }
@@ -384,6 +400,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 let selectedIndex = pickerView.selectedRow(inComponent: 0)
                 let lang = self.language[selectedIndex].values.first
                 UserDefaults.standard.set(lang, forKey: "i18n_language")
+                self.navigationController?.navigationBar.topItem?.title = "Settings".localized();
                 self.makeMenu()
                 self.tableView.reloadData()
                 FirstTabViewController.forceRefresh = true

appbuilder-ios/AppBuilder/AppBuilder/SecondTabViewController.swift

@@ -62,7 +62,7 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
     }
     
     var isFilltering: Bool {
-        return searchController.isActive && !isSearchBarEmpty
+        return !isSearchBarEmpty
     }
     @IBOutlet var tableView: UITableView!
     
@@ -110,7 +110,7 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         
         definesPresentationContext = true
         
-        
+        NotificationCenter.default.addObserver(self, selector: #selector(onReceiveMessage(notification:)), name: NSNotification.Name(rawValue: "onMessageChat"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(onReceiveMessage(notification:)), name: NSNotification.Name(rawValue: "onReceiveChat"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(onReload(notification:)), name: NSNotification.Name(rawValue: "onMember"), object: nil)
         
@@ -224,19 +224,21 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
             var isFinal = false
 
             if result != nil {
-
-                self.searchController.searchBar.searchTextField.text = result?.bestTranscription.formattedString
-                self.updateSearchResults(for: self.searchController)
                 self.alertController.dismiss(animated: true)
                 self.audioEngine.stop()
                 self.recognitionRequest?.endAudio()
-                self.voiceItem.image = UIImage(systemName: "mic.fill")
                 isFinal = (result?.isFinal)!
             }
 
             if error != nil || isFinal {
-
-                self.audioEngine.stop()
+                if error == nil {
+                    self.searchController.searchBar.searchTextField.text = result!.bestTranscription.formattedString
+                    self.updateSearchResults(for: self.searchController)
+                } else {
+                    self.audioEngine.stop()
+                    self.recognitionRequest?.endAudio()
+                }
+                self.voiceItem.image = UIImage(systemName: "mic.fill")
                 inputNode.removeTap(onBus: 0)
 
                 self.recognitionRequest = nil
@@ -267,6 +269,22 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         }
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2, execute: {
+            var viewController = UIApplication.shared.windows.first!.rootViewController
+            if !(viewController is ViewController) {
+                viewController = self.parent
+            }
+            if ViewController.middleButton.isHidden {
+                ViewController.isExpandButton = false
+                if let viewController = viewController as? ViewController {
+                    viewController.tabBar.isHidden = false
+                    ViewController.middleButton.isHidden = false
+                }
+            }
+        })
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
 //        tabBarController?.navigationItem.leftBarButtonItem = cancelSearchButton
         self.navigationController?.navigationBar.topItem?.title = "Chats".localized() + " & " + "Groups".localized()
@@ -284,12 +302,15 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: lang ?? "en"))
         let randomInt = Int.random(in: 1..<10)
         backgroundImage.image = UIImage(named: "pb_lbackground_\(randomInt)")
-        getData()
         if segment.numberOfSegments == 2 {
             segment.setTitle("Chats".localized(), forSegmentAt: 0)
             segment.setTitle("Groups".localized(), forSegmentAt: 1)
         }
         searchController.searchBar.placeholder = "Search chats & messages".localized()
+        groupMap.removeAll()
+        groups.removeAll()
+        tableView.reloadData()
+        getData()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -361,25 +382,20 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         DispatchQueue.global().async {
             self.contacts.removeAll()
             Database.shared.database?.inTransaction({ (fmdb, rollback) in
-                do {
-                    if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: "SELECT f_pin, first_name, last_name, image_id, official_account, user_type FROM BUDDY where f_pin <> '\(UserDefaults.standard.string(forKey: "me")!)' order by 5 desc, 2 collate nocase asc") {
-                        while cursorData.next() {
-                            let user = User(pin: cursorData.string(forColumnIndex: 0) ?? "",
-                                            firstName: cursorData.string(forColumnIndex: 1) ?? "",
-                                            lastName: cursorData.string(forColumnIndex: 2) ?? "",
-                                            thumb: cursorData.string(forColumnIndex: 3) ?? "",
-                                            userType: cursorData.string(forColumnIndex: 5) ?? "")
-                            if (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces) == "USR\(user.pin)" {
-                                continue
-                            }
-                            user.official = cursorData.string(forColumnIndex: 4) ?? ""
-                            self.contacts.append(user)
+                if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: "SELECT f_pin, first_name, last_name, image_id, official_account, user_type FROM BUDDY where f_pin <> '\(UserDefaults.standard.string(forKey: "me")!)' order by 5 desc, 2 collate nocase asc") {
+                    while cursorData.next() {
+                        let user = User(pin: cursorData.string(forColumnIndex: 0) ?? "",
+                                        firstName: cursorData.string(forColumnIndex: 1) ?? "",
+                                        lastName: cursorData.string(forColumnIndex: 2) ?? "",
+                                        thumb: cursorData.string(forColumnIndex: 3) ?? "",
+                                        userType: cursorData.string(forColumnIndex: 5) ?? "")
+                        if (user.firstName + " " + user.lastName).trimmingCharacters(in: .whitespaces) == "USR\(user.pin)" {
+                            continue
                         }
-                        cursorData.close()
+                        user.official = cursorData.string(forColumnIndex: 4) ?? ""
+                        self.contacts.append(user)
                     }
-                } catch {
-                    rollback.pointee = true
-                    print(error)
+                    cursorData.close()
                 }
                 completion()
             })
@@ -752,6 +768,9 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
             if content.subviews.count > 0 {
                 content.subviews.forEach { $0.removeFromSuperview() }
             }
+            if chats.count == 0 {
+                return cell
+            }
             let data: Chat
             if isFilltering {
                 data = fillteredData[indexPath.row] as! Chat
@@ -764,7 +783,7 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
             NSLayoutConstraint.activate([
                 imageView.leadingAnchor.constraint(equalTo: content.leadingAnchor, constant: 10.0),
                 imageView.topAnchor.constraint(equalTo: content.topAnchor, constant: 10.0),
-                imageView.bottomAnchor.constraint(equalTo: content.bottomAnchor, constant: -20.0),
+                imageView.bottomAnchor.constraint(equalTo: content.bottomAnchor, constant: -25.0),
                 imageView.widthAnchor.constraint(equalToConstant: 40.0),
                 imageView.heightAnchor.constraint(equalToConstant: 40.0)
             ])
@@ -955,7 +974,7 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 70.0
+        return 75.0
     }
     
     private func getRealStatus(messageId: String) -> String {

appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -18,7 +18,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     
     var isAllowSpeech = false
     
-    let speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "id"))
+    var speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en"))
 
     var recognitionRequest : SFSpeechAudioBufferRecognitionRequest?
     var recognitionTask : SFSpeechRecognitionTask?
@@ -59,6 +59,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         "$('#header-layout').find('.col-4').removeClass('col-4').addClass('col');"
         let script: WKUserScript = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
         contentController.addUserScript(script)
+        NotificationCenter.default.addObserver(self, selector: #selector(onShowAC(notification:)), name: NSNotification.Name(rawValue: "onShowAC"), object: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -68,6 +69,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         let lang = UserDefaults.standard.string(forKey: "i18n_language")
         var intLang = 0
         if lang == "id" {
+            speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "id"))
             intLang = 1
         }
         switch(ViewController.tab3){
@@ -83,6 +85,9 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         case "3":
             address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab3-commerce?f_pin=\(me ?? "")&lang=\(intLang)"
             myURL = URL(string: address)
+        case "4":
+            address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab1-video?f_pin=\(me ?? "")&lang=\(intLang)"
+            myURL = URL(string: address)
         default:
             if(!ViewController.tab3.isEmpty){
                 if(ViewController.tab3.lowercased().contains("https://") || ViewController.sURL.lowercased().contains("http://")){
@@ -112,8 +117,16 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         navigationController?.setNavigationBarHidden(!isBurger, animated: false)
     }
     
+    @objc func onShowAC(notification: NSNotification) {
+        self.webView.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
+        view.endEditing(true)
+        resignFirstResponder()
+    }
+    
     override func viewWillDisappear(_ animated: Bool) {
         self.webView.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
+        view.endEditing(true)
+        resignFirstResponder()
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
@@ -146,6 +159,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         }
         if ViewController.middleButton.isDescendant(of: viewController!.view) {
             DispatchQueue.main.async {
+                ViewController.hideDockedButton()
                 if let viewController = viewController as? ViewController {
                     viewController.tabBar.isHidden = true
                 }
@@ -162,11 +176,11 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         if !(viewController is ViewController) {
             viewController = self.parent
         }
-        if !ViewController.middleButton.isDescendant(of: viewController!.view) {
+        if ViewController.middleButton.isHidden {
             ViewController.isExpandButton = false
             if let viewController = viewController as? ViewController {
                 viewController.tabBar.isHidden = false
-                viewController.createMidFloatingButton()
+                ViewController.middleButton.isHidden = false
             }
         }
     }
@@ -196,7 +210,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
                     self.webView.evaluateJavaScript("blockUser('\(param1)',true);")
                 } else if param2 == "follow_user" {
                     self.webView.evaluateJavaScript("followUser('\(param1.split(separator: "|")[0])',\(param1.split(separator: "|")[1]),true);")
-                } else if param2 == "homepage" {
+                } else if param2 == "homepage" || param2 == "gif" {
                     self.webView.evaluateJavaScript("window.location.href = '\(param1)';")
                 } else {
                     self.webView.evaluateJavaScript("openNewPost(true);")
@@ -388,22 +402,26 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         self.recognitionTask = speechRecognizer?.recognitionTask(with: recognitionRequest, resultHandler: { (result, error) in
 
             var isFinal = false
+            var text = ""
 
             if result != nil {
-                let text = result?.bestTranscription.formattedString
+                text = result?.bestTranscription.formattedString ?? ""
                 isFinal = (result?.isFinal)!
                 self.alertController.dismiss(animated: true)
                 self.audioEngine.stop()
                 self.recognitionRequest?.endAudio()
-                self.webView.evaluateJavaScript("toggleVoiceButton(false)")
-                self.webView.evaluateJavaScript("submitVoiceSearch('\(text ?? "")')")
             } else {
                 self.alertController.dismiss(animated: true)
             }
 
             if error != nil || isFinal {
-
-                self.audioEngine.stop()
+                if error == nil {
+                    self.webView.evaluateJavaScript("toggleVoiceButton(false)")
+                    self.webView.evaluateJavaScript("submitVoiceSearch('\(text)')")
+                } else {
+                    self.audioEngine.stop()
+                    self.recognitionRequest?.endAudio()
+                }
                 inputNode.removeTap(onBus: 0)
 
                 self.recognitionRequest = nil
@@ -444,6 +462,7 @@ extension ThirdTabViewController: WKUIDelegate {
       func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
 
             if let urlStr = navigationAction.request.url?.absoluteString {
+                print("kacau \(urlStr)")
                 collapseDocked()
                 if urlStr.contains("nexilis/pages/tab1-main-only") || urlStr.contains("nexilis/pages/tab3-main-only") || urlStr.contains("nexilis/pages/tab1-main") || urlStr.contains("nexilis/pages/tab3-commerce") {
                     ViewController.alwaysHideButton = false

appbuilder-ios/AppBuilder/AppBuilder/ViewController.swift

@@ -159,6 +159,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             tabBar.selectionIndicatorImage = UIImage.imageWithColor(color: UIColor.gray, size: tabBarItemSize).resizableImage(withCapInsets: .zero)
         }
         UIFont.overrideInitialize()
+        ViewController.pullActionButton()
     }
 
     override func viewDidLayoutSubviews() {
@@ -405,7 +406,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             show(b: false)
             ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
             ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
-            if ViewController.listPullFB.count != 0 {
+            if ViewController.listPullFB.count != 0 && ViewController.listPullFB.count > 2 {
                 let package_id = ViewController.listPullFB[2].split(separator: "|")[0]
                 var app_id = ""
                 if  ViewController.listPullFB[2].split(separator: "|").count > 1 {
@@ -414,12 +415,14 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 if package_id.contains("_fb") {
                     let indexTap = Int(String(package_id.split(separator: "_")[1]).substring(from: 2, to: 2))
                     if indexTap! < 5 {
-                        Nexilis.buttonClicked(index: 1)
+                        Nexilis.buttonClicked(index: indexTap!)
                     } else {
                         if indexTap == 5 {
                             Nexilis.buttonClicked(index: 0, id: "openQMS")
                         } else if indexTap == 6 {
                             Nexilis.buttonClicked(index: 0, id: "openHistoryCC")
+                        } else if indexTap == 7 {
+                            Nexilis.buttonClicked(index: 7, id: String(package_id.split(separator: "_")[2]))
                         }
                     }
                 } else {
@@ -443,7 +446,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             show(b: false)
             ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
             ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
-            if ViewController.listPullFB.count != 0 {
+            if ViewController.listPullFB.count != 0 && ViewController.listPullFB.count > 4 {
                 let package_id = ViewController.listPullFB[4].split(separator: "|")[0]
                 var app_id = ""
                 if  ViewController.listPullFB[4].split(separator: "|").count > 1 {
@@ -452,12 +455,14 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 if package_id.contains("_fb") {
                     let indexTap = Int(String(package_id.split(separator: "_")[1]).substring(from: 2, to: 2))
                     if indexTap! < 5 {
-                        Nexilis.buttonClicked(index: 1)
+                        Nexilis.buttonClicked(index: indexTap!)
                     } else {
                         if indexTap == 5 {
                             Nexilis.buttonClicked(index: 0, id: "openQMS")
                         } else if indexTap == 6 {
                             Nexilis.buttonClicked(index: 0, id: "openHistoryCC")
+                        } else if indexTap == 7 {
+                            Nexilis.buttonClicked(index: 7, id: String(package_id.split(separator: "_")[2]))
                         }
                     }
                 } else {
@@ -481,7 +486,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             show(b: false)
             ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
             ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
-            if ViewController.listPullFB.count != 0 {
+            if ViewController.listPullFB.count != 0 && ViewController.listPullFB.count > 1 {
                 let package_id = ViewController.listPullFB[1].split(separator: "|")[0]
                 var app_id = ""
                 if  ViewController.listPullFB[1].split(separator: "|").count > 1 {
@@ -490,12 +495,14 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 if package_id.contains("_fb") {
                     let indexTap = Int(String(package_id.split(separator: "_")[1]).substring(from: 2, to: 2))
                     if indexTap! < 5 {
-                        Nexilis.buttonClicked(index: 1)
+                        Nexilis.buttonClicked(index: indexTap!)
                     } else {
                         if indexTap == 5 {
                             Nexilis.buttonClicked(index: 0, id: "openQMS")
                         } else if indexTap == 6 {
                             Nexilis.buttonClicked(index: 0, id: "openHistoryCC")
+                        } else if indexTap == 7 {
+                            Nexilis.buttonClicked(index: 7, id: String(package_id.split(separator: "_")[2]))
                         }
                     }
                 } else {
@@ -519,7 +526,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             show(b: false)
             ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
             ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
-            if ViewController.listPullFB.count != 0 {
+            if ViewController.listPullFB.count != 0 && ViewController.listPullFB.count > 0 {
                 let package_id = ViewController.listPullFB[0].split(separator: "|")[0]
                 var app_id = ""
                 if  ViewController.listPullFB[0].split(separator: "|").count > 1 {
@@ -528,12 +535,14 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 if package_id.contains("_fb") {
                     let indexTap = Int(String(package_id.split(separator: "_")[1]).substring(from: 2, to: 2))
                     if indexTap! < 5 {
-                        Nexilis.buttonClicked(index: 1)
+                        Nexilis.buttonClicked(index: indexTap!)
                     } else {
                         if indexTap == 5 {
                             Nexilis.buttonClicked(index: 0, id: "openQMS")
                         } else if indexTap == 6 {
                             Nexilis.buttonClicked(index: 0, id: "openHistoryCC")
+                        } else if indexTap == 7 {
+                            Nexilis.buttonClicked(index: 7, id: String(package_id.split(separator: "_")[2]))
                         }
                     }
                 } else {
@@ -556,7 +565,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
             show(b: false)
             ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
             ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
-            if ViewController.listPullFB.count != 0 {
+            if ViewController.listPullFB.count != 0 && ViewController.listPullFB.count > 3 {
                 let package_id = ViewController.listPullFB[3].split(separator: "|")[0]
                 var app_id = ""
                 if  ViewController.listPullFB[3].split(separator: "|").count > 1 {
@@ -565,12 +574,14 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 if package_id.contains("_fb") {
                     let indexTap = Int(String(package_id.split(separator: "_")[1]).substring(from: 2, to: 2))
                     if indexTap! < 5 {
-                        Nexilis.buttonClicked(index: 1)
+                        Nexilis.buttonClicked(index: indexTap!)
                     } else {
                         if indexTap == 5 {
                             Nexilis.buttonClicked(index: 0, id: "openQMS")
                         } else if indexTap == 6 {
                             Nexilis.buttonClicked(index: 0, id: "openHistoryCC")
+                        } else if indexTap == 7 {
+                            Nexilis.buttonClicked(index: 7, id: String(package_id.split(separator: "_")[2]))
                         }
                     }
                 } else {
@@ -615,7 +626,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
         }
         
     }
-
+    
     static func pullActionButton() {
         if datePullFB == nil || Int(Date().timeIntervalSince(datePullFB!)) >= 60 {
             datePullFB = Date()
@@ -628,10 +639,79 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                                 DispatchQueue.main.async { [self] in
                                     listPullFB.removeAll()
                                     if jsonArray.count != 0 {
+                                        var count = 0
                                         for json in jsonArray {
                                             let package_id = json["package_id"] as! String
                                             let app_id = (json["app_id"] as? String) ?? ""
+                                            let icon = (json["icon"] as? String) ?? ""
                                             listPullFB.append("\(package_id)|\(app_id)")
+                                            if count == 0 {
+                                                if !icon.isEmpty {
+                                                    DispatchQueue.global().async {
+                                                        let data = try? Data(contentsOf: URL(string: "http://202.158.33.26/filepalio/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 {
+                                                                ViewController.chatButton.setBackgroundImage(UIImage(data: data!), for: .normal)
+                                                            }
+                                                        }
+                                                    }
+                                                } else {
+                                                    ViewController.chatButton.setBackgroundImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal), for: .normal)
+                                                }
+                                            } else if count == 1 {
+                                                if !icon.isEmpty {
+                                                    DispatchQueue.global().async {
+                                                        let data = try? Data(contentsOf: URL(string: "https://\(Nexilis.ADDRESS)/filepalio/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 {
+                                                                ViewController.callButton.setBackgroundImage(UIImage(data: data!), for: .normal)
+                                                            }
+                                                        }
+                                                    }
+                                                } else {
+                                                    ViewController.callButton.setBackgroundImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal), for: .normal)
+                                                }
+                                            } else if count == 2 {
+                                                if !icon.isEmpty {
+                                                    DispatchQueue.global().async {
+                                                        let data = try? Data(contentsOf: URL(string: "http://202.158.33.26/filepalio/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 {
+                                                                ViewController.ccButton.setBackgroundImage(UIImage(data: data!), for: .normal)
+                                                            }
+                                                        }
+                                                    }
+                                                } else {
+                                                    ViewController.ccButton.setBackgroundImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal), for: .normal)
+                                                }
+                                            } else if count == 3 {
+                                                if !icon.isEmpty {
+                                                    DispatchQueue.global().async {
+                                                        let data = try? Data(contentsOf: URL(string: "http://202.158.33.26/filepalio/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 {
+                                                                ViewController.postButton.setBackgroundImage(UIImage(data: data!), for: .normal)
+                                                            }
+                                                        }
+                                                    }
+                                                } else {
+                                                    ViewController.postButton.setBackgroundImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal), for: .normal)
+                                                }
+                                            } else if count == 4 {
+                                                if !icon.isEmpty {
+                                                    DispatchQueue.global().async {
+                                                        let data = try? Data(contentsOf: URL(string: "http://202.158.33.26/filepalio/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 {
+                                                                ViewController.streamingButton.setBackgroundImage(UIImage(data: data!), for: .normal)
+                                                            }
+                                                        }
+                                                    }
+                                                } else {
+                                                    ViewController.streamingButton.setBackgroundImage(UIImage(named: "pb_button_chat", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!.withRenderingMode(.alwaysOriginal), for: .normal)
+                                                }
+                                            }
+                                            count += 1
                                         }
                                     }
                                 }
@@ -699,7 +779,6 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
                 }
             })
         } else {
-            ViewController.pullActionButton()
             ViewController.isExpandButton = true
             ViewController.showDockedButton()
             let xChatPosition = ViewController.chatButton.frame.origin.x - 120
@@ -730,12 +809,12 @@ class ViewController: UITabBarController, UITabBarControllerDelegate {
     }
     
     public static func removeMiddleButton() {
-        ViewController.chatButton.removeFromSuperview()
-        ViewController.callButton.removeFromSuperview()
-        ViewController.ccButton.removeFromSuperview()
-        ViewController.streamingButton.removeFromSuperview()
-        ViewController.postButton.removeFromSuperview()
-        ViewController.middleButton.removeFromSuperview()
+//        ViewController.chatButton.removeFromSuperview()
+//        ViewController.callButton.removeFromSuperview()
+//        ViewController.ccButton.removeFromSuperview()
+//        ViewController.streamingButton.removeFromSuperview()
+//        ViewController.postButton.removeFromSuperview()
+        ViewController.middleButton.isHidden = true
     }
 
 }

appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/arm64-apple-ios.swiftinterface

@@ -48,8 +48,8 @@ public protocol CallBack {
   public static func sGetCurentUserID() -> Swift.String!
   public static func nGetSSRequestCode() -> Swift.Int!
   public static func sGetLocInfo() -> Swift.String!
-  public static func pauseAudio()
-  public static func resumeAudio(bSpeakerOn: Swift.Bool!)
+  public static func pauseAudio(fValue: Swift.Float!)
+  public static func resumeAudio(fValue: Swift.Float!)
   public static func turnCCallAudio(sParty: Swift.String!, bOnOff: Swift.Bool!)
   public static func adjustVolume(fValue: Swift.Float!)
   public static func adjustCQFR(nVQuality: Swift.Int!)

appbuilder-ios/NexilisLite/NexilisLite.podspec

@@ -29,6 +29,7 @@ Pod::Spec.new do |spec|
   spec.dependency 'ReadabilityKit'
   spec.dependency 'Alamofire', '~> 5.5'
   spec.dependency 'SDWebImage', '~> 5.0'
+  spec.dependency 'Toast-Swift', '~> 5.0.1'
   # spec.dependency 'iOS-WebP'
   # spec.preserve_path = 'NexilisLite.framework'
   # spec.xcconfig = { 'OTHER_LDFLAGS' => '-framework NexilisLite' }

appbuilder-ios/NexilisLite/NexilisLite/Resource/Palio.storyboard

@@ -868,6 +868,9 @@
                         <outlet property="call" destination="8T1-2m-3h5" id="i1Z-n0-cmD"/>
                         <outlet property="countFriend" destination="yNx-gJ-gXq" id="d2Q-CD-5xn"/>
                         <outlet property="imageUserType" destination="yKV-8p-D06" id="TfH-As-6uv"/>
+                        <outlet property="labelAcceptCall" destination="OlC-4h-ULU" id="1Qo-ss-UzI"/>
+                        <outlet property="labelChangePassword" destination="UZm-64-k1t" id="VZy-hO-WMj"/>
+                        <outlet property="labelPrivateAccount" destination="Nvg-uC-lAp" id="BgP-f1-eDp"/>
                         <outlet property="labelUserType" destination="evL-sf-Uad" id="RCj-po-eey"/>
                         <outlet property="message" destination="Sti-Yk-M8o" id="y6C-te-gGV"/>
                         <outlet property="myViewGroup" destination="VAe-OS-2Uz" id="kTG-Mv-YKl"/>

appbuilder-ios/NexilisLite/NexilisLite/Resource/id.lproj/Localizable.strings

@@ -39,7 +39,7 @@
 "Send" = "Kirim";
 "Delete" = "Hapus";
 "Delete Conversation" = "Hapus percakapan";
-"Are you sure to delete all message in this conversation?" = "Apakah anda yakin ingin menghapus semua pesan dalam percakapan ini?";
+"Are you sure to delete all message in this conversation?" = "Apakah kamu yakin ingin menghapus semua pesan dalam percakapan ini?";
 "Unknown" = "Tidak dikenal";
 "Lounge" = "Beranda";
 "You have left this group" = "Anda telah keluar dari grup ini";
@@ -49,6 +49,7 @@
 "Reply" = "Balas";
 "You" = "Kamu";
 "Forward" = "Teruskan";
+"Forward Messages" = "Teruskan Pesan";
 "Copy" = "Salin";
 "Selected" = "Terpilih";
 "Text coppied to clipboard" = "Teks disalin ke papan klip";
@@ -90,20 +91,20 @@
 "Successfully changed device" = "Berhasil masuk/ubah perangkat";
 "Successfully downloaded" = "Berhasil diunduh ke galeri";
 "Logout" = "Keluar";
-"Are you sure want to logout?" = "Apakah anda ingin keluar?";
+"Are you sure want to logout?" = "Apakah kamu ingin keluar?";
 "Successfully login Admin" = "Berhasil masuk sebagai Admin";
 "Successfully login Internal Team" = "Berhasil masuk sebagai Tim Internal";
 "Successfully login" = "Berhasil masuk";
 "Must check at least one category" = "Harus pilih minimal satu kategori";
 "Coming soon feature" = "Fitur akan segera hadir";
 "No call center history" = "Tidak ada riwayat pusat panggilan";
-"Username has been registered, please use another name" = "Nama yang anda masukkan sudah terdaftar, silahkan gunakan nama lain";
+"Username has been registered, please use another name" = "Nama yang kamu masukkan sudah terdaftar, silahkan gunakan nama lain";
 "Scan Gaspol QR" = "Memindai Gaspol QR";
 "Scan QR Code" = "Memindai kode QR";
-"To use Gaspol Web, go to gaspol.co.id on your computer." = "Untuk dapat menggunakan Gaspol Web, pergi ke halaman gaspol.co.id pada komputer anda.";
+"To use Gaspol Web, go to gaspol.co.id on your computer." = "Untuk dapat menggunakan Gaspol Web, pergi ke halaman gaspol.co.id pada komputer kamu.";
 "Select" = "Pilih";
 "Select Language" = "Pilih Bahasa";
-"You must change your name to use this feature" = "Anda harus mengubah nama anda agar dapat meggunakan fitur ini";
+"You must change your name to use this feature" = "Anda harus mengubah nama kamu agar dapat meggunakan fitur ini";
 "Create Group" = "Buat Grup";
 "Add Friends" = "Tambah Teman";
 "Favorite Messages" = "Pesan Favorit";
@@ -119,17 +120,55 @@
 "For Everyone" = "untuk semua orang";
 "You were deleted this message" = "Anda telah menghapus pesan ini";
 "This message was deleted" = "Pesan ini telah dihapus";
-"Are you sure to unfriend" = "Apakah Anda yakin membatalkan pertemanan dengan";
+"Are you sure to unfriend" = "Apakah kamu yakin membatalkan pertemanan dengan";
 "Back" = "Kembali";
 "Login" = "Masuk";
 "Your Nickname" = "Nama Pengguna";
 "Password" = "Kata Sandi";
 "Submit" = "Kirim";
 "Username" = "Nama Pengguna";
-"Please enter your desired Username and Password" = "Silakan masukkan Nama Pengguna dan Kata Sandi yang Anda inginkan";
+"Please enter your desired Username and Password" = "Silakan masukkan Nama Pengguna dan Kata Sandi yang kamu inginkan";
 "Access Admin / Internal Features" = "Akses Fitur Admin / Internal";
 "Access Admin Features" = "Akses Fitur Admin";
 "Access Internal Features" = "Akses Fitur Internal";
 "Message Mode" = "Modus Pesan";
 "Confidential Message" = "Pesan Rahasia";
 "Confirmation Message" = "Pesan Konfirmasi";
+"Send Comment" = "Kirim Komentar";
+"Join" = "Gabung";
+"Done" = "Selesai";
+"Start" = "Mulai";
+"Target Audience" = "Target Pemirsa";
+"Promotion Type" = "Jenis Promosi";
+"Description" = "Deskripsi";
+"Change Description" = "Ubah Deskripsi";
+"No description" = "Tidak ada Deskripsi";
+"Private" = "Pribadi";
+"Only members can be access this group" = "Hanya anggota yang dapat mengakses grup ini";
+"Topic" = "Topik";
+"Detail" = "Rincian";
+"Members" = "Anggota";
+"Member" = "Anggota";
+"Exit Group" = "Keluar Grup";
+"Created date" = "Dibuat tanggal";
+"Created by" = "Dibuat oleh";
+"Add Sub Group" = "Buat sub grup";
+"Change Name Group" = "Ubah nama grup";
+"Are you sure want to delete the group?" = "Apakah kamu yakin ingin menghapus grup?";
+"Are you sure want to exit the group?" = "Apakah kamu yakin ingin keluar dari grup?";
+"Delete Group" = "Hapus Grup";
+"Add Topic" = "Tambah Topik";
+"Add Member" = "Tambah Anggota";
+"Public" = "Publik";
+"All user can be access this group" = "Semua pengguna dapat mengakses grup ini";
+"Change Group Name" = "Ubah Nama Grup";
+"Create Sub Group" = "Buat Sub Grup";
+"Group's Name" = "Nama Grup";
+"Create" = "Buat";
+"Add New Member(s)" = "Tambah Anggota";
+"Edit" = "Ubah";
+"Private Account Mode" = "Mode Akun Privasi";
+"Change Password" = "Ubah Sandi";
+"Accept Call" = "Terima Panggilan";
+"Call Center History" = "Riwayat Pusat Panggilan";
+"User" = "Pengguna";

appbuilder-ios/NexilisLite/NexilisLite/Source/FloatingButton/FloatingButton.swift

@@ -642,7 +642,44 @@ public class FloatingButton: UIView {
             return
         }
         let controller = BNIBookingWebView()
-        controller.modalPresentationStyle = .custom
+        if UIApplication.shared.visibleViewController?.navigationController != nil {
+            UIApplication.shared.visibleViewController?.navigationController?.present(controller, animated: true, completion: nil)
+        } else {
+            UIApplication.shared.visibleViewController?.present(controller, animated: true, completion: nil)
+        }
+        hideButton()
+    }
+    
+    @objc func openCustomURL(url: String) {
+        let isChangeProfile = UserDefaults.standard.bool(forKey: "is_change_profile")
+        if !isChangeProfile {
+            let alert = UIAlertController(title: "Change Profile".localized(), message: "You must change your name to use this feature".localized(), preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK".localized(), style: UIAlertAction.Style.default, handler: {(_) in
+                let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "changeNS") as! ChangeNamePassswordViewController
+                let navigationController = UINavigationController(rootViewController: controller)
+                navigationController.modalPresentationStyle = .fullScreen
+                navigationController.navigationBar.tintColor = .white
+                navigationController.navigationBar.barTintColor = .mainColor
+                navigationController.navigationBar.isTranslucent = false
+                let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+                navigationController.navigationBar.titleTextAttributes = textAttributes
+                navigationController.view.backgroundColor = .mainColor
+                if UIApplication.shared.visibleViewController?.navigationController != nil {
+                    UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
+                } else {
+                    UIApplication.shared.visibleViewController?.present(navigationController, animated: true, completion: nil)
+                }
+            }))
+            if UIApplication.shared.visibleViewController?.navigationController != nil {
+                UIApplication.shared.visibleViewController?.navigationController?.present(alert, animated: true, completion: nil)
+            } else {
+                UIApplication.shared.visibleViewController?.present(alert, animated: true, completion: nil)
+            }
+            hideButton()
+            return
+        }
+        let controller = BNIBookingWebView()
+        controller.customUrl = url
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(controller, animated: true, completion: nil)
         } else {

appbuilder-ios/NexilisLite/NexilisLite/Source/Model/Chat.swift

@@ -72,56 +72,66 @@ public class Chat: Model {
         return ""
     }
     
+    public static func getMessageFromSearch(text: String = "") -> [String] {
+        var messages: [String] = []
+        Database.shared.database?.inTransaction({ (fmdb, rollback) in
+            let query = "select message_id FROM MESSAGE where message_text LIKE '%\(text)%'"
+            if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: query) {
+                while cursorData.next() {
+                    let data = cursorData.string(forColumnIndex: 0) ?? ""
+                    messages.append(data)
+                }
+                cursorData.close()
+            }
+        })
+        return messages
+    }
+    
     public static func getData(messageId: String = "") -> [Chat] {
         var chats: [Chat] = []
         Database.shared.database?.inTransaction({ (fmdb, rollback) in
-            do {
-                let query = """
-                            select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, b.first_name || ' ' || ifnull(b.last_name, '') name, b.image_id profile, b.official_account, m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, BUDDY b where ms.message_id = m.message_id and ms.l_pin = b.f_pin \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
-                            union
-                            select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, 'Bot' name, '' profile, '', m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m where ms.message_id = m.message_id and ms.l_pin = '-999' \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
-                            union
-                            select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, b.f_name || ' (\("Lounge".localized()))', b.image_id profile, b.official, m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, GROUPZ b where ms.message_id = m.message_id and ms.l_pin = b.group_id \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
-                            union
-                            select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, c.f_name || ' (' || b.title || ')', b.thumb profile, '', m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, DISCUSSION_FORUM b, GROUPZ c where ms.message_id = m.message_id and ms.l_pin = b.chat_id and b.group_id = c.group_id \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
-                            order by 6 desc
-                            """
-                if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: query) {
-                    while cursorData.next() {
-                        let chat = Chat(fpin: cursorData.string(forColumnIndex: 0) ?? "",
-                                        pin: cursorData.string(forColumnIndex: 1) ?? "",
-                                        messageId: cursorData.string(forColumnIndex: 2) ?? "",
-                                        counter: cursorData.string(forColumnIndex: 3) ?? "",
-                                        messageText: cursorData.string(forColumnIndex: 4) ?? "",
-                                        serverDate: cursorData.string(forColumnIndex: 5) ?? "",
-                                        image: cursorData.string(forColumnIndex: 6) ?? "",
-                                        video: cursorData.string(forColumnIndex: 7) ?? "",
-                                        file: cursorData.string(forColumnIndex: 8) ?? "",
-                                        attachmentFlag: cursorData.string(forColumnIndex: 9) ?? "",
-                                        messageScope: cursorData.string(forColumnIndex: 10) ?? "",
-                                        name: cursorData.string(forColumnIndex: 11) ?? "",
-                                        profile: cursorData.string(forColumnIndex: 12) ?? "",
-                                        official: cursorData.string(forColumnIndex: 13) ?? "",
-                                        status: cursorData.string(forColumnIndex: 14) ?? "",
-                                        credential: cursorData.string(forColumnIndex: 15) ?? "")
-                        chats.append(chat)
-                    }
-                    cursorData.close()
-                    if chats.count == 0 {
-                        if let cursorCounter = Database.shared.getRecords(fmdb: fmdb, query: "SELECT SUM(counter) FROM MESSAGE_SUMMARY"), cursorCounter.next() {
-                            if cursorCounter.int(forColumnIndex: 0) != 0 {
-                                _ = Database.shared.updateAllRecord(fmdb: fmdb, table: "MESSAGE_SUMMARY", cvalues: [
-                                    "counter" : 0
-                                ])
-                                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "reloadTabChats"), object: nil, userInfo: nil)
-                            }
-                            cursorCounter.close()
+            let query = """
+                        select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, b.first_name || ' ' || ifnull(b.last_name, '') name, b.image_id profile, b.official_account, m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, BUDDY b where ms.message_id = m.message_id and ms.l_pin = b.f_pin \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
+                        union
+                        select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, 'Bot' name, '' profile, '', m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m where ms.message_id = m.message_id and ms.l_pin = '-999' \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
+                        union
+                        select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, b.f_name || ' (\("Lounge".localized()))', b.image_id profile, b.official, m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, GROUPZ b where ms.message_id = m.message_id and ms.l_pin = b.group_id \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
+                        union
+                        select m.f_pin, ms.l_pin, ms.message_id, ms.counter, m.message_text, m.server_date, m.image_id, m.video_id, m.file_id, m.attachment_flag, m.message_scope_id, c.f_name || ' (' || b.title || ')', b.thumb profile, '', m.status, m.credential from MESSAGE_SUMMARY ms, MESSAGE m, DISCUSSION_FORUM b, GROUPZ c where ms.message_id = m.message_id and ms.l_pin = b.chat_id and b.group_id = c.group_id \(messageId.isEmpty ? "" : " and m.message_id = '\(messageId)'")
+                        order by 6 desc
+                        """
+            if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: query) {
+                while cursorData.next() {
+                    let chat = Chat(fpin: cursorData.string(forColumnIndex: 0) ?? "",
+                                    pin: cursorData.string(forColumnIndex: 1) ?? "",
+                                    messageId: cursorData.string(forColumnIndex: 2) ?? "",
+                                    counter: cursorData.string(forColumnIndex: 3) ?? "",
+                                    messageText: cursorData.string(forColumnIndex: 4) ?? "",
+                                    serverDate: cursorData.string(forColumnIndex: 5) ?? "",
+                                    image: cursorData.string(forColumnIndex: 6) ?? "",
+                                    video: cursorData.string(forColumnIndex: 7) ?? "",
+                                    file: cursorData.string(forColumnIndex: 8) ?? "",
+                                    attachmentFlag: cursorData.string(forColumnIndex: 9) ?? "",
+                                    messageScope: cursorData.string(forColumnIndex: 10) ?? "",
+                                    name: cursorData.string(forColumnIndex: 11) ?? "",
+                                    profile: cursorData.string(forColumnIndex: 12) ?? "",
+                                    official: cursorData.string(forColumnIndex: 13) ?? "",
+                                    status: cursorData.string(forColumnIndex: 14) ?? "",
+                                    credential: cursorData.string(forColumnIndex: 15) ?? "")
+                    chats.append(chat)
+                }
+                cursorData.close()
+                if chats.count == 0 {
+                    if let cursorCounter = Database.shared.getRecords(fmdb: fmdb, query: "SELECT SUM(counter) FROM MESSAGE_SUMMARY"), cursorCounter.next() {
+                        if cursorCounter.int(forColumnIndex: 0) != 0 {
+                            _ = Database.shared.updateAllRecord(fmdb: fmdb, table: "MESSAGE_SUMMARY", cvalues: [
+                                "counter" : 0
+                            ])
+                            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "reloadTabChats"), object: nil, userInfo: nil)
                         }
+                        cursorCounter.close()
                     }
                 }
-            } catch {
-                rollback.pointee = true
-                print(error)
             }
         })
         return chats

appbuilder-ios/NexilisLite/NexilisLite/Source/Model/User.swift

@@ -75,6 +75,15 @@ public class User: Model {
                             offline_mode: cursor.string(forColumnIndex: 6) ?? "",
                             ex_block: cursor.string(forColumnIndex: 7) ?? "")
                 cursor.close()
+            } else {
+                user = User(pin: pin,
+                            firstName: "User".localized(),
+                            lastName: "",
+                            thumb: "",
+                            userType: "",
+                            privacy_flag: "",
+                            offline_mode: "",
+                            ex_block: "")
             }
         })
         return user

appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -18,7 +18,7 @@ import NotificationBannerSwift
 public class Nexilis: NSObject {
     public static var sAPIKey = ""
     
-    static let ADDRESS = ADDRESS_RELEASE
+    public static let ADDRESS = ADDRESS_RELEASE
     
     static let ADDRESS_33 = "192.168.0.33"
     
@@ -396,56 +396,36 @@ public class Nexilis: NSObject {
     
     public static func startAudio(nMode: Int!, bSpeakerOn: Bool!) {
         
-        let xSessionMode = nMode == 0 ? nSessionMode : nMode
+        let nSessionMode = nMode
         do {
-            if ("iPhone 6" == UIDevice.current.modelName) {
-                try AVAudioSession.sharedInstance().setCategory(.playAndRecord, options: .duckOthers)
-                if (xSessionMode == 1) {
-                    try AVAudioSession.sharedInstance().setMode(.voiceChat)
-                } else if (xSessionMode == 2) {
-                    try AVAudioSession.sharedInstance().setMode(.voiceChat)
-                    // try avAudioSession.setMode(AVAudioSessionModeVideoChat)
-                }
-                if (bSpeakerOn) {
-                    try AVAudioSession.sharedInstance().overrideOutputAudioPort(.speaker)
-                } else {
-                    try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-                }
+            let avAudioSession = AVAudioSession.sharedInstance()
+            try avAudioSession.setInputGain(1.0)
+//            if (bSpeakerOn) {
+//                try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .videoChat), options: [.defaultToSpeaker, .duckOthers, .allowBluetooth])
+//            } else {
+//                try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .videoChat), options: [.duckOthers, .allowBluetooth])
+//            }
+            try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .default), options: [.defaultToSpeaker, .duckOthers, .allowBluetooth])
+            if (bSpeakerOn) {
+                API.adjustVolume(fValue: 10.0)
             } else {
-                if (bSpeakerOn) {
-                    try AVAudioSession.sharedInstance().setCategory(.playAndRecord, options: .defaultToSpeaker)
-                } else {
-                    try AVAudioSession.sharedInstance().setCategory(.playAndRecord, options: .duckOthers)
-                }
-                if (xSessionMode == 1) {
-                    try AVAudioSession.sharedInstance().setMode(.voiceChat)
-                } else if (xSessionMode == 2) {
-                    try AVAudioSession.sharedInstance().setMode(.voiceChat)
-                }
+                API.adjustVolume(fValue: 0.3)
             }
-            try AVAudioSession.sharedInstance().setActive(true)
-        } catch {}
-        nSessionMode = xSessionMode
+            try avAudioSession.setActive(true, options: .notifyOthersOnDeactivation)
+        } catch {
+        }
     }
     
     public static func turnSpeakerOn(bSpeakerOn: Bool!) {
-        do{
-            if ("iPhone 6" == UIDevice.current.modelName) {
-                if (bSpeakerOn) {
-                    try AVAudioSession.sharedInstance().overrideOutputAudioPort(.speaker)
-                } else {
-                    try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-                }
-                return
-            }
-        }catch{
-            print(error)
+//         API.pauseAudio()
+//         ViewController.stopAudio()
+//         ViewController.startAudio(nMode: 0, bSpeakerOn: bSpeakerOn)
+//         API.resumeAudio(bSpeakerOn: bSpeakerOn)
+        if (bSpeakerOn) {
+            API.adjustVolume(fValue: 10.0)
+        } else {
+            API.adjustVolume(fValue: 0.3)
         }
-        
-        API.pauseAudio()
-        stopAudio()
-        startAudio(nMode: 0, bSpeakerOn: bSpeakerOn)
-        API.resumeAudio(bSpeakerOn: bSpeakerOn)
     }
     public static func stopAudio() {
         do {
@@ -484,6 +464,8 @@ public class Nexilis: NSObject {
             fb.bniBookingTap()
         } else if id == "openHistoryCC" {
             fb.historyBroadcastTap()
+        } else if index == 7 {
+            fb.openCustomURL(url: id)
         } else {
             let idButton = UIButton()
             idButton.restorationIdentifier = id
@@ -2590,6 +2572,11 @@ extension Nexilis: MessageDelegate {
                                     vc.navigationController?.popViewController(animated: true)
                                     openEditor()
                                 }
+                            } else if UIApplication.shared.visibleViewController is UIAlertController {
+                                let vc = UIApplication.shared.visibleViewController as! UIAlertController
+                                vc.dismiss(animated: true, completion: {
+                                    openEditor()
+                                })
                             } else {
                                 openEditor()
                             }
@@ -2656,6 +2643,11 @@ extension Nexilis: MessageDelegate {
                                     vc.navigationController?.popViewController(animated: true)
                                     openEditor()
                                 }
+                            } else if UIApplication.shared.visibleViewController is UIAlertController {
+                                let vc = UIApplication.shared.visibleViewController as! UIAlertController
+                                vc.dismiss(animated: true, completion: {
+                                    openEditor()
+                                })
                             } else {
                                 openEditor()
                             }

appbuilder-ios/NexilisLite/NexilisLite/Source/Utils.swift

@@ -95,7 +95,7 @@ public final class Utils {
             if chat.messageScope == "18" {
                 return ("📄 Form").richText()
             }
-            return "📄 " + chat.messageText.components(separatedBy: "|")[0]
+            return ("📄 " + chat.messageText.components(separatedBy: "|")[0]).richText()
         } else if chat.attachmentFlag == "11" {
             return ("❤️ " + "Sticker".localized()).richText()
         }

appbuilder-ios/NexilisLite/NexilisLite/Source/View/BNIView/BNIBookingWebView.swift

@@ -11,6 +11,7 @@ import WebKit
 class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScrollViewDelegate, UIGestureRecognizerDelegate, WKScriptMessageHandler {
     var webView = WKWebView()
     let closeButton = UIButton()
+    var customUrl = ""
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .default
@@ -27,16 +28,6 @@ class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScrollViewDel
         webView.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
 
         webView.navigationDelegate = self
-        
-        Database().database?.inTransaction({ fmdb, rollback in
-            let idMe = UserDefaults.standard.string(forKey: "me") as String?
-            if let c = Database().getRecords(fmdb: fmdb, query: "select first_name || ' ' || last_name from BUDDY where f_pin = '\(idMe!)'"), c.next() {
-                let name = c.string(forColumnIndex: 0)!.trimmingCharacters(in: .whitespacesAndNewlines)
-                let url = URL(string: "https://sqbni.murni.id:4200/bookingonline/#/?userid=\(name)")!
-                webView.load(URLRequest(url: url))
-                c.close()
-            }
-        })
         webView.allowsBackForwardNavigationGestures = true
         webView.scrollView.delegate = self
         
@@ -48,7 +39,7 @@ class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScrollViewDel
             "var head = document.getElementsByTagName('head')[0];" +
             "head.appendChild(meta);"
         
-        let script: WKUserScript = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
+        let script: WKUserScript = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
         contentController.addUserScript(script)
         
         let refreshControl = UIRefreshControl()
@@ -59,42 +50,26 @@ class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScrollViewDel
         webView.backgroundColor = .white
         webView.scrollView.backgroundColor = .white
         
-        closeButton.setTitle("Close", for: .normal)
-        closeButton.setTitleColor(.orange, for: .normal)
-        closeButton.titleLabel?.font = UIFont.boldSystemFont(ofSize: 15)
-        view.addSubview(closeButton)
-        closeButton.translatesAutoresizingMaskIntoConstraints = false
-        closeButton.topAnchor.constraint(equalTo: view.topAnchor, constant: 30.0).isActive = true
-        closeButton.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20.0).isActive = true
-        closeButton.addTarget(self, action: #selector(close(sender:)), for: .touchUpInside)
-        
-        let swipeUp = UISwipeGestureRecognizer(target: self, action: #selector(swipUpAction))
-        swipeUp.direction = .up
-        swipeUp.cancelsTouchesInView = false
-        swipeUp.delegate = self
-        webView.scrollView.addGestureRecognizer(swipeUp)
+        Database().database?.inTransaction({ fmdb, rollback in
+            let idMe = UserDefaults.standard.string(forKey: "me") as String?
+            if let c = Database().getRecords(fmdb: fmdb, query: "select first_name || ' ' || last_name from BUDDY where f_pin = '\(idMe!)'"), c.next() {
+                let name = c.string(forColumnIndex: 0)!.trimmingCharacters(in: .whitespacesAndNewlines)
+                var stringQMS = UserDefaults.standard.string(forKey: "app_builder_url_qms") ?? "https://sqbni.murni.id:4200/bnibookingonline/#/?userid="
+                if !customUrl.isEmpty {
+                    stringQMS = customUrl
+                }
+                let url = URL(string: "\(stringQMS)\(name)")!
+                webView.load(URLRequest(url: url))
+                c.close()
+            }
+        })
     }
     
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         return true
     }
     
-    @objc func swipUpAction() {
-        if !closeButton.isHidden {
-            closeButton.isHidden = true
-        }
-    }
-    
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        if (scrollView.contentOffset.y <= 0) {
-            if closeButton.isHidden {
-                closeButton.isHidden = false
-            }
-        }
-    }
-    
-    @objc func close(sender: UIButton) {
-        self.dismiss(animated: true)
     }
     
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/CallProviderDelegate.swift

@@ -50,12 +50,7 @@ class CallProviderDelegate: NSObject {
                 call.handle = handle
                 call.hasVideo = hasVideo
                 
-                do {
-                    try AVAudioSession.sharedInstance().setCategory(.playAndRecord)
-                    try AVAudioSession.sharedInstance().setMode(call.hasVideo ? .videoChat : .voiceChat)
-                    try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-                } catch {
-                }
+                Nexilis.startAudio(nMode: 1, bSpeakerOn: false)
                 
                 self.callManager.addCall(call)
             }
@@ -86,12 +81,7 @@ extension CallProviderDelegate: CXProviderDelegate {
             self?.provider.reportOutgoingCall(with: call.uuid, connectedAt: call.connectDate)
         }
         if self.callManager.calls.count == 0 {
-            do {
-                try AVAudioSession.sharedInstance().setCategory(.playAndRecord)
-                try AVAudioSession.sharedInstance().setMode(call.hasVideo ? .videoChat : .voiceChat)
-                try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-            } catch {
-            }
+            Nexilis.startAudio(nMode: 1, bSpeakerOn: false)
         } else if self.callManager.calls.count > 0 {
             self.callManager.setOnHoldStatus(for: self.callManager.calls.last!, to: true)
         }
@@ -186,12 +176,12 @@ extension CallProviderDelegate: CXProviderDelegate {
     func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
         print("Received", #function)
         
-        do {
-            try AVAudioSession.sharedInstance().setCategory(.ambient)
-            try AVAudioSession.sharedInstance().setMode(.default)
-            try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-        } catch {
-        }
+//        do {
+//            try AVAudioSession.sharedInstance().setCategory(.ambient)
+//            try AVAudioSession.sharedInstance().setMode(.default)
+//            try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
+//        } catch {
+//        }
         /*
          Restart any non-call related audio now that the app's audio session is deactivated,
          after having its priority restored to normal.

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraAudioViewController.swift

@@ -204,12 +204,13 @@ class QmeraAudioViewController: UIViewController {
         return button
     }()
     
-    public override func viewWillDisappear(_ animated: Bool) {
-        if self.isMovingFromParent {
-            NotificationCenter.default.removeObserver(self)
-        }
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "onShowAC"), object: nil, userInfo: nil)
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -255,6 +256,7 @@ class QmeraAudioViewController: UIViewController {
         } else {
             incomingView()
         }
+        UIDevice.current.isProximityMonitoringEnabled = true
     }
     
     override func viewWillLayoutSubviews() {
@@ -351,12 +353,12 @@ class QmeraAudioViewController: UIViewController {
     @objc func didSpeaker(sender: Any?) {
         isSpeaker = !isSpeaker
         speaker.isSelected = isSpeaker
-        do {
-            if "iPhone 6" == UIDevice.current.modelName {
-                try AVAudioSession.sharedInstance().overrideOutputAudioPort(isSpeaker ? .speaker : .none)
-            }
-        } catch {
+        if isSpeaker {
+            UIDevice.current.isProximityMonitoringEnabled = false
+        } else {
+            UIDevice.current.isProximityMonitoringEnabled = true
         }
+        Nexilis.turnSpeakerOn(bSpeakerOn: isSpeaker)
     }
     
     @objc func didInvite(sender: Any?) {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraVideoViewController.swift

@@ -20,7 +20,7 @@ class QmeraVideoViewController: UIViewController {
     var fPin = ""
     var wbRoomId = ""
     var isInisiator = true
-    var isSpeaker = false
+    var isSpeaker = true
     var listRemoteViewFix: [UIImageView] = [
         UIImageView(),
         UIImageView(),
@@ -54,6 +54,7 @@ class QmeraVideoViewController: UIViewController {
     var wbVC : WhiteboardViewController?
     let buttonAddParticipant = UIButton()
     let buttonSpeaker = UIButton()
+    let buttonRotate = UIButton()
     var showStackViewToolbar = true
     let scrollRemoteView = UIScrollView()
     var isAutoAccept = false
@@ -62,6 +63,7 @@ class QmeraVideoViewController: UIViewController {
     var showNotifCCEnd = false
     var transformZoomAfterNewUserMore2 = false
     var isAddCall = ""
+    private var frontCamera = true
     var users: [User] = []
     let poweredByView: UIStackView = {
         let stackView = UIStackView()
@@ -102,6 +104,19 @@ class QmeraVideoViewController: UIViewController {
         return button
     }()
     
+    deinit {
+        self.wbTimer.invalidate()
+        navigationController?.navigationBar.setBackgroundImage(nil, for: .default)
+        navigationController?.navigationBar.shadowImage = nil
+        navigationController?.navigationBar.isTranslucent = false
+        navigationController?.view.backgroundColor = .mainColor
+        let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+        navigationController?.navigationBar.titleTextAttributes = textAttributes
+        navigationController?.navigationBar.topItem?.backBarButtonItem = nil
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+        NotificationCenter.default.removeObserver(self)
+    }
+    
     override func viewWillDisappear(_ animated: Bool) {
         if self.isMovingFromParent {
             navigationController?.navigationBar.setBackgroundImage(nil, for: .default)
@@ -164,9 +179,42 @@ class QmeraVideoViewController: UIViewController {
                     row["deviceId"] = cursorData.string(forColumnIndex: 5)
                     row["isOffline"] = cursorData.string(forColumnIndex: 6)
                     row["user_type"] = cursorData.string(forColumnIndex: 7)
+                    dataPerson.append(row)
+                } else {
+                    var row: [String: String?] = [:]
+                    row["f_pin"] = fPin
+                    row["name"] = "User".localized()
+                    row["picture"] = ""
+                    row["isOfficial"] = ""
+                    row["deviceId"] = ""
+                    row["isOffline"] = ""
+                    row["user_type"] = ""
+                    dataPerson.append(row)
                 }
-                dataPerson.append(row)
                 cursorData.close()
+            } else {
+                var row: [String: String?] = [:]
+                row["f_pin"] = fPin
+                row["name"] = "User".localized()
+                row["picture"] = ""
+                row["isOfficial"] = ""
+                row["deviceId"] = ""
+                row["isOffline"] = ""
+                row["user_type"] = ""
+                dataPerson.append(row)
+//                if let response = Nexilis.writeAndWait(message: CoreMessage_TMessageBank.getAddFriendQRCode(fpin: fPin)), response.isOk() {
+//                    self.getDataProfile(fPin: fPin)
+//                }
+//                Nexilis.addFriend (fpin: "\(fPin)") { result in
+//                    if result {
+//                        self.getDataProfile(fPin: fPin)
+//                    } else {
+//                        let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
+//                        imageView.tintColor = .white
+//                        let banner = FloatingNotificationBanner(title: "Server busy, please 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)
+//                        banner.show()
+//                    }
+//                }
             }
         })
     }
@@ -297,6 +345,7 @@ class QmeraVideoViewController: UIViewController {
         ])
         if isInisiator {
             labelIncomingOutgoing.text = "Outgoing video call".localized() + "..."
+            Nexilis.startAudio(nMode: 2, bSpeakerOn: true)
             API.initiateCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 2, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
         } else {
             let systemSoundID: SystemSoundID = 1254
@@ -380,7 +429,7 @@ class QmeraVideoViewController: UIViewController {
                         dataPerson["name"] = user.fullName
                         dataPerson["picture"] = user.thumb
                         dataPerson["isOfficial"] = user.official
-                        dataPerson["deviceId"] = ""
+                        dataPerson["deviceId"] = user.pin
                         dataPerson["isOffline"] = ""
                         dataPerson["user_type"] = user.userType
                         self.dataPerson.append(dataPerson)
@@ -419,6 +468,7 @@ class QmeraVideoViewController: UIViewController {
     }
     
     @objc func didTapAcceptCallButton(){
+        Nexilis.startAudio(nMode: 2, bSpeakerOn: true)
         API.receiveCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView,ivRemoteZ: zoomView)
         DispatchQueue.main.async {
             self.myImage.removeFromSuperview()
@@ -436,6 +486,7 @@ class QmeraVideoViewController: UIViewController {
                 self.view.layoutIfNeeded()
             })
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                self.buttonRotate.isHidden = false
                 self.buttonAddParticipant.isHidden = false
                 self.buttonSpeaker.isHidden = false
                 self.buttonWB.isHidden = false
@@ -450,16 +501,25 @@ class QmeraVideoViewController: UIViewController {
             if(wbRoomId.isEmpty){
                 let me = UserDefaults.standard.string(forKey: "me")!
                 let tid = CoreMessage_TMessageUtil.getTID()
-                wbRoomId = "\(me)\(tid)"
+                wbRoomId = "\(me)wbvc\(tid)"
                 wbVC!.roomId = wbRoomId
                 var destinations = [String]()
+                var destString = ""
                 for d in dataPerson{
-                    destinations.append(d["deviceId"]!!)
+                    destinations.append(d["f_pin"]!!)
+                    if destString.isEmpty{
+                        destString = d["f_pin"]!!
+                    } else {
+                        destString = destString + ",\(d["f_pin"]!!)"
+                    }
                 }
                 wbVC!.destinations = destinations
                 wbVC!.sendInit()
+                UserDefaults.standard.set("\(me),\(destString)", forKey: "wb_vc")
             }
             else {
+                self.wbTimer.invalidate()
+                self.buttonWB.backgroundColor = .lightGray
                 wbVC!.roomId = wbRoomId
                 wbVC!.sendJoin()
             }
@@ -472,16 +532,18 @@ class QmeraVideoViewController: UIViewController {
                 self.buttonDecline.isHidden = false
                 self.buttonSpeaker.isHidden = false
                 self.buttonAddParticipant.isHidden = false
-                if(!self.wbRoomId.isEmpty){
-                    DispatchQueue.main.async {
-                        self.wbTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(self.runTimer), userInfo: nil, repeats: true)
-                    }
-                }
+                self.buttonRotate.isHidden = false
+//                if(!self.wbRoomId.isEmpty){
+//                    DispatchQueue.main.async {
+//                        self.wbTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(self.runTimer), userInfo: nil, repeats: true)
+//                    }
+//                }
             }
         }
         self.buttonDecline.isHidden = true
         self.buttonSpeaker.isHidden = true
         self.buttonAddParticipant.isHidden = true
+        self.buttonRotate.isHidden = true
         addChild(wbVC!)
         wbVC!.view.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(wbVC!.view)
@@ -513,6 +575,22 @@ class QmeraVideoViewController: UIViewController {
         self.stackViewToolbar.alignment = .center
         self.stackViewToolbar.spacing = 30
         
+        self.view.addSubview(buttonRotate)
+        buttonRotate.translatesAutoresizingMaskIntoConstraints = false
+        buttonRotate.frame.size = CGSize(width: 70.0, height: 70.0)
+        NSLayoutConstraint.activate([
+            buttonRotate.widthAnchor.constraint(equalToConstant: 70.0),
+            buttonRotate.heightAnchor.constraint(equalToConstant: 70.0),
+            buttonRotate.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+            buttonRotate.bottomAnchor.constraint(equalTo: self.stackViewToolbar.topAnchor, constant: -10.0)
+        ])
+        buttonRotate.backgroundColor = .secondaryColor
+        buttonRotate.setImage(UIImage(systemName: "arrow.triangle.2.circlepath.camera", withConfiguration: UIImage.SymbolConfiguration(pointSize: 30, weight: .medium, scale: .default)), for: .normal)
+        buttonRotate.tintColor = .mainColor
+        buttonRotate.circle()
+        buttonRotate.isHidden = true
+        buttonRotate.addTarget(self, action: #selector(camera(sender:)), for: .touchUpInside)
+        
         view.addSubview(buttonAddParticipant)
         buttonAddParticipant.translatesAutoresizingMaskIntoConstraints = false
         buttonAddParticipant.frame.size = CGSize(width: 70.0, height: 70.0)
@@ -534,9 +612,9 @@ class QmeraVideoViewController: UIViewController {
             buttonSpeaker.widthAnchor.constraint(equalToConstant: 70.0),
             buttonSpeaker.heightAnchor.constraint(equalToConstant: 70.0)
         ])
-        buttonSpeaker.backgroundColor = .secondaryColor
         buttonSpeaker.setImage(UIImage(systemName: "speaker.wave.2", withConfiguration: UIImage.SymbolConfiguration(pointSize: 30, weight: .medium, scale: .default)), for: .normal)
-        buttonSpeaker.tintColor = .mainColor
+        self.buttonSpeaker.backgroundColor = .lightGray
+        self.buttonSpeaker.tintColor = .mainColor
         buttonSpeaker.circle()
         buttonSpeaker.isHidden = true
         buttonSpeaker.addTarget(self, action: #selector(didTapSpeakerButton(sender:)), for: .touchUpInside)
@@ -652,13 +730,7 @@ class QmeraVideoViewController: UIViewController {
             }
             self.isSpeaker = isSpeaker
         }
-//        do {
-//            try AVAudioSession.sharedInstance().setCategory(isSpeaker ? .playAndRecord : .playAndRecord, options: isSpeaker ? .defaultToSpeaker : .duckOthers)
-//            try AVAudioSession.sharedInstance().setMode(isSpeaker ? .videoChat : .videoChat)
-//            try AVAudioSession.sharedInstance().overrideOutputAudioPort(isSpeaker ? .speaker : .none)
-//        } catch {
-//
-//        }
+        Nexilis.turnSpeakerOn(bSpeakerOn: isSpeaker)
     }
     
     @objc func didTapSpeakerButton(sender: AnyObject){
@@ -689,17 +761,29 @@ class QmeraVideoViewController: UIViewController {
         }
     }
     
+    @objc func camera(sender: Any?) {
+        if frontCamera {
+            API.changeCameraParam(nCameraIdx: 0, nResolutionIndex: 2, nQuality: 4)
+            frontCamera = false
+        } else {
+            API.changeCameraParam(nCameraIdx: 1, nResolutionIndex: 2, nQuality: 4)
+            frontCamera = true
+        }
+    }
+    
     @objc func hideToolbar() {
         DispatchQueue.main.async {
             if self.showStackViewToolbar {
                 self.showStackViewToolbar = false
-                self.constraintBottomStackViewToolbar.constant = 70
+                self.constraintBottomStackViewToolbar.constant = 150
+                self.constraintLeftStackViewToolbar2.constant = -60
                 UIView.animate(withDuration: 0.35, animations: {
                     self.view.layoutIfNeeded()
                 })
             } else {
                 self.showStackViewToolbar = true
                 self.constraintBottomStackViewToolbar.constant = -60
+                self.constraintLeftStackViewToolbar2.constant = 10
                 UIView.animate(withDuration: 0.35, animations: {
                     self.view.layoutIfNeeded()
                 })
@@ -713,14 +797,7 @@ class QmeraVideoViewController: UIViewController {
         let message = (data?["message"] ?? "") as! String
         var remoteChannel = [String:String]()
         let arrayMessage = message.split(separator: ",")
-        if state == 0 {
-            if !isInisiator && self.dataPerson.count == 1 {
-                DispatchQueue.main.async {
-                    self.setSpeaker(isSpeaker: true)
-                }
-            }
-        }
-        else if(state == 35){
+        if(state == 35){
             DispatchQueue.main.async {
                 if self.dataPerson.count > 1 {
                     if !self.transformZoomAfterNewUserMore2 {
@@ -771,9 +848,9 @@ class QmeraVideoViewController: UIViewController {
                                 self.listRemoteViewFix[1].transform = CGAffineTransform.init(scaleX: 1.4, y: 1.3).rotated(by: (CGFloat.pi * 3 )/2)
                             }
                         }
-                        let pictureImage = self.dataPerson[i]["picture"]!
-                        let namePerson = self.dataPerson[i]["name"]!
-                        if (pictureImage != "" && pictureImage != nil) {
+                        let pictureImage = self.dataPerson[i]["picture"] ?? ""
+                        let namePerson = self.dataPerson[i]["name"] ?? ""
+                        if (!pictureImage!.isEmpty) {
                             self.listRemoteViewFix[i].setImage(name: pictureImage!)
                             self.listRemoteViewFix[i].contentMode = .scaleAspectFill
                         } else {
@@ -808,9 +885,9 @@ class QmeraVideoViewController: UIViewController {
                     } else {
                         self.listRemoteViewFix[i].transform = CGAffineTransform.init(scaleX: 1.4, y: 1.3).rotated(by: (CGFloat.pi * 3 )/2)
                     }
-                    let pictureImage = self.dataPerson[self.dataPerson.count - 1]["picture"]!
-                    let namePerson = self.dataPerson[self.dataPerson.count - 1]["name"]!
-                    if (pictureImage != "" && pictureImage != nil) {
+                    let pictureImage = self.dataPerson[self.dataPerson.count - 1]["picture"] ?? ""
+                    let namePerson = self.dataPerson[self.dataPerson.count - 1]["name"] ?? ""
+                    if (!pictureImage!.isEmpty) {
                         self.listRemoteViewFix[i].setImage(name: pictureImage!)
                         self.listRemoteViewFix[i].contentMode = .scaleAspectFill
                     } else {
@@ -852,7 +929,6 @@ class QmeraVideoViewController: UIViewController {
             DispatchQueue.main.async {
                 if self.isInisiator && self.name.isDescendant(of: self.view) {
                     self.didTapAcceptCallButton()
-                    self.setSpeaker(isSpeaker: true)
                 }
                 let indexPerson = self.dataPerson.firstIndex(where: {$0["f_pin"]!! == arrayMessage[1]})
                 if indexPerson != nil {
@@ -888,6 +964,9 @@ class QmeraVideoViewController: UIViewController {
                         if self.buttonAccept.isDescendant(of: self.view) {
                             self.buttonAccept.removeFromSuperview()
                         }
+                        if self.buttonRotate.isDescendant(of: self.view) {
+                            self.buttonRotate.removeFromSuperview()
+                        }
                         if self.wbVC != nil{
                             self.wbVC!.close?()
                         }
@@ -921,6 +1000,9 @@ class QmeraVideoViewController: UIViewController {
                     if self.buttonAccept.isDescendant(of: self.view) {
                         self.buttonAccept.removeFromSuperview()
                     }
+                    if self.buttonRotate.isDescendant(of: self.view) {
+                        self.buttonRotate.removeFromSuperview()
+                    }
                     if self.wbVC != nil{
                         self.wbVC!.close?()
                     }
@@ -1105,9 +1187,9 @@ class QmeraVideoViewController: UIViewController {
                             self.containerLabelName[i].frame = CGRect(x: 0, y: 170 * i, width: 120, height: 30)
                             self.containerLabelName[i].backgroundColor = .orangeBNI.withAlphaComponent(0.5)
                             self.containerLabelName[i].makeRoundedView(radius: 8.0)
-                            let pictureImage = self.dataPerson[i]["picture"]!
-                            let namePerson = self.dataPerson[i]["name"]!
-                            if (pictureImage != "" && pictureImage != nil) {
+                            let pictureImage = self.dataPerson[i]["picture"] ?? ""
+                            let namePerson = self.dataPerson[i]["name"] ?? ""
+                            if (!pictureImage!.isEmpty) {
                                 self.listRemoteViewFix[i].setImage(name: pictureImage!)
                                 self.listRemoteViewFix[i].contentMode = .scaleAspectFill
                             } else {
@@ -1133,9 +1215,9 @@ class QmeraVideoViewController: UIViewController {
                         self.containerLabelName[i].frame = CGRect(x: 0, y: 170 * i, width: 120, height: 30)
                         self.containerLabelName[i].backgroundColor = .orangeBNI.withAlphaComponent(0.5)
                         self.containerLabelName[i].makeRoundedView(radius: 8.0)
-                        let pictureImage = self.dataPerson[self.dataPerson.count - 1]["picture"]!
-                        let namePerson = self.dataPerson[self.dataPerson.count - 1]["name"]!
-                        if (pictureImage != "" && pictureImage != nil) {
+                        let pictureImage = self.dataPerson[self.dataPerson.count - 1]["picture"] ?? ""
+                        let namePerson = self.dataPerson[self.dataPerson.count - 1]["name"] ?? ""
+                        if (!pictureImage!.isEmpty) {
                             self.listRemoteViewFix[i].setImage(name: pictureImage!)
                             self.listRemoteViewFix[i].contentMode = .scaleAspectFill
                         } else {
@@ -1167,6 +1249,23 @@ extension QmeraVideoViewController : WhiteboardReceiver {
             DispatchQueue.main.async {
                 self.wbTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(self.runTimer), userInfo: nil, repeats: true)
             }
+            let me = UserDefaults.standard.string(forKey: "me")!
+            var destString = ""
+            for d in dataPerson{
+                if d["f_pin"]!! == roomId.components(separatedBy: "wbvc")[0] {
+                    continue
+                }
+                if destString.isEmpty{
+                    destString = d["f_pin"]!!
+                } else {
+                    destString = destString + ",\(d["f_pin"]!!)"
+                }
+            }
+            if destString.isEmpty {
+                UserDefaults.standard.set("\(roomId.components(separatedBy: "wbvc")[0]),\(me)", forKey: "wb_vc")
+            } else {
+                UserDefaults.standard.set("\(roomId.components(separatedBy: "wbvc")[0]),\(me),\(destString)", forKey: "wb_vc")
+            }
             wbRoomId = roomId
         }
     }

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -63,6 +63,7 @@ public class EditorGroup: UIViewController {
     var bottomAnchorPreviewReply = NSLayoutConstraint()
     let containerAction = UIView()
     var allowTyping = true
+    let contactChatNav = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "contactChatNav") as! UINavigationController
     
     public override func viewDidDisappear(_ animated: Bool) {
         if self.isMovingFromParent {
@@ -78,12 +79,11 @@ public class EditorGroup: UIViewController {
         if self.navigationController?.isNavigationBarHidden ?? false {
             self.navigationController?.setNavigationBarHidden(false, animated: false)
         }
+        updateProfile()
     }
     
     public override func viewDidLoad() {
         super.viewDidLoad()
-        
-        updateProfile()
 //        navigationController?.navigationBar.topItem?.title = ""
         
         viewButton.layer.shadowColor = UIColor.gray.cgColor
@@ -796,6 +796,10 @@ public class EditorGroup: UIViewController {
                 ])
                 labelKicked.textColor = .black
                 labelKicked.font = UIFont.systemFont(ofSize: 12).bold
+                if contactChatNav.viewIfLoaded?.window != nil {
+                    contactChatNav.dismiss(animated: true)
+                }
+                cancelAction()
             }
         }
     }
@@ -1787,6 +1791,9 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
         var star: UIAction
         if (dataMessages[indexPath!.row]["is_stared"] as! String == "0") {
             star = UIAction(title: "Star".localized(), image: UIImage(systemName: "star.fill"), handler: {(_) in
+                if self.removed {
+                    return
+                }
                 DispatchQueue.global().async {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -1802,6 +1809,9 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
             })
         } else {
             star = UIAction(title: "Unstar".localized(), image: UIImage(systemName: "star.fill"), handler: {(_) in
+                if self.removed {
+                    return
+                }
                 DispatchQueue.global().async {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -1818,9 +1828,15 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
         }
         
         let reply = UIAction(title: "Reply".localized(), image: UIImage(systemName: "arrowshape.turn.up.left.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.handleReply(indexPath: indexPath!)
         })
         let forward = UIAction(title: "Forward".localized(), image: UIImage(systemName: "arrowshape.turn.up.right.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.forwardSession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -1838,6 +1854,9 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
             }
         })
         let copy = UIAction(title: "Copy".localized(), image: UIImage(systemName: "doc.on.doc.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.copySession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -1855,6 +1874,9 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
             }
         })
         let info = UIAction(title: "Info".localized(), image: UIImage(systemName: "info.circle.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             let messageInfoVC = MessageInfo()
             messageInfoVC.data = dataMessages[indexPath!.row]
             messageInfoVC.dataGroup = self.dataGroup
@@ -1862,6 +1884,9 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
             self.navigationController?.pushViewController(messageInfoVC, animated: true)
         })
         let delete = UIAction(title: "Delete".localized(), image: UIImage(systemName: "trash.fill"), attributes: .destructive, handler: {(_) in
+            if self.removed {
+                return
+            }
             self.deleteSession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -2046,9 +2071,14 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
             if countSelected == 0 {
                 return
             }
-            let navigationController = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "contactChatNav") as! UINavigationController
-            navigationController.modalPresentationStyle = .custom
-            if let controller = navigationController.viewControllers.first as? ContactChatViewController {
+            contactChatNav.modalPresentationStyle = .custom
+            contactChatNav.navigationBar.tintColor = .white
+            contactChatNav.navigationBar.barTintColor = .mainColor
+            contactChatNav.navigationBar.isTranslucent = false
+            let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+            contactChatNav.navigationBar.titleTextAttributes = textAttributes
+            contactChatNav.view.backgroundColor = .mainColor
+            if let controller = contactChatNav.viewControllers.first as? ContactChatViewController {
                 controller.isChooser = { [weak self] scope, pin in
                     if scope == "3" {
                         let editorPersonalVC = AppStoryBoard.Palio.instance.instantiateViewController(identifier: "editorPersonalVC") as! EditorPersonal
@@ -2063,7 +2093,7 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
                     }
                 }
             }
-            self.present(navigationController, animated: true, completion: nil)
+            self.present(contactChatNav, animated: true, completion: nil)
         } else if deleteSession {
             let dataMessages = self.dataMessages.filter({ $0["isSelected"] as! Bool == true })
             let countSelected = dataMessages.count
@@ -2783,9 +2813,11 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                         let description = json["description"] as! String
                         let start = json["time"] as! Int64
                         let by = json["by"] as! String
-                        var type = "*Live Streaming*"
+                        let textLS = "Live Streaming".localized()
+                        var type = "*\(textLS)*"
                         if attachmentFlag == "26" {
-                            type = "*Seminar*"
+                            let textSeminar = "Seminar".localized()
+                            type = "*\(textSeminar)*"
                         }
                         if let c = Database().getRecords(fmdb: fmdb, query: "select first_name || ' ' || last_name from BUDDY where f_pin = '\(by)'"), c.next() {
                             let name = c.string(forColumnIndex: 0)!

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -77,6 +77,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     var hapticSwipeLeft = false
     var listTimerCredential: [String: Int] = [:]
     var timerCredential: [String: Timer] = [:]
+    let contactChatNav = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "contactChatNav") as! UINavigationController
     
     public override func viewDidDisappear(_ animated: Bool) {
         if self.isMovingFromParent {
@@ -96,12 +97,11 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         if self.navigationController?.isNavigationBarHidden ?? false {
             self.navigationController?.setNavigationBarHidden(false, animated: false)
         }
+        updateProfile()
     }
     
     public override func viewDidLoad() {
         super.viewDidLoad()
-        
-        updateProfile()
 //        navigationController?.navigationBar.topItem?.title = ""
         
         viewButton.layer.shadowColor = UIColor.gray.cgColor
@@ -1433,6 +1433,10 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 labelUnfriend.font = UIFont.systemFont(ofSize: 12).bold
                 labelUnfriend.text = "You have unfriended this user".localized()
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "reloadTabChats"), object: nil, userInfo: nil)
+                if contactChatNav.viewIfLoaded?.window != nil {
+                    contactChatNav.dismiss(animated: true)
+                }
+                cancelAction()
             } else if data["state"] as! Int == 01 {
                 if let dataMessage = try! JSONSerialization.jsonObject(with: (data["message"] as! String).data(using: .utf8)!, options: []) as? [String: String] {
                     if(dataMessage["l_pin"] == dataPerson["f_pin"]!){
@@ -1441,6 +1445,10 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                                 dismissKeyboard()
                             }
                             blockedView(blocked: block)
+                            if contactChatNav.viewIfLoaded?.window != nil {
+                                contactChatNav.dismiss(animated: true)
+                            }
+                            cancelAction()
                         }
                     }
                     setRightButtonItem()
@@ -1703,6 +1711,17 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
     
     @objc func audioVideoCall(sender: UIBarButtonItem) {
         if sender.tag == 0 {
+            let goAudioCall = Nexilis.checkMicPermission()
+            if !goAudioCall{
+                let alert = UIAlertController(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
+                    if let url = URL(string: UIApplication.openSettingsURLString), UIApplication.shared.canOpenURL(url) {
+                        UIApplication.shared.open(url, options: [:], completionHandler: nil)
+                    }
+                }))
+                self.navigationController?.present(alert, animated: true, completion: nil)
+                return
+            }
             if let pin = dataPerson["f_pin"] {
                 let controller = QmeraAudioViewController()
                 controller.user = User.getData(pin: pin)
@@ -1711,6 +1730,20 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 present(controller, animated: true, completion: nil)
             }
         } else {
+            let goAudioCall = Nexilis.checkMicPermission()
+            let goVideoCall = Nexilis.checkCameraPermission()
+            if goVideoCall == 0 {
+                let alert = UIAlertController(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
+                    if let url = URL(string: UIApplication.openSettingsURLString), UIApplication.shared.canOpenURL(url) {
+                        UIApplication.shared.open(url, options: [:], completionHandler: nil)
+                    }
+                }))
+                self.navigationController?.present(alert, animated: true, completion: nil)
+                return
+            } else if goVideoCall == -1 {
+                return
+            }
             let videoVC = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "videoVCQmera") as! QmeraVideoViewController
             videoVC.dataPerson.append(dataPerson)
             self.show(videoVC, sender: nil)
@@ -2794,6 +2827,9 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
         var star: UIAction
         if (dataMessages[indexPath!.row]["is_stared"] as! String == "0") {
             star = UIAction(title: "Star".localized(), image: UIImage(systemName: "star.fill"), handler: {(_) in
+                if self.removed {
+                    return
+                }
                 DispatchQueue.global().async {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -2809,6 +2845,9 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             })
         } else {
             star = UIAction(title: "Unstar".localized(), image: UIImage(systemName: "star.fill"), handler: {(_) in
+                if self.removed {
+                    return
+                }
                 DispatchQueue.global().async {
                     Database.shared.database?.inTransaction({ (fmdb, rollback) in
                         _ = Database.shared.updateRecord(fmdb: fmdb, table: "MESSAGE", cvalues: [
@@ -2825,9 +2864,15 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
         }
         
         let reply = UIAction(title: "Reply".localized(), image: UIImage(systemName: "arrowshape.turn.up.left.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.handleReply(indexPath: indexPath!)
         })
         let forward = UIAction(title: "Forward".localized(), image: UIImage(systemName: "arrowshape.turn.up.right.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.forwardSession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -2851,6 +2896,9 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             }
         })
         let copy = UIAction(title: "Copy".localized(), image: UIImage(systemName: "doc.on.doc.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             self.copySession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -2874,12 +2922,18 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             }
         })
         let info = UIAction(title: "Info".localized(), image: UIImage(systemName: "info.circle.fill"), handler: {(_) in
+            if self.removed {
+                return
+            }
             let messageInfoVC = MessageInfo()
             messageInfoVC.data = dataMessages[indexPath!.row]
             messageInfoVC.dataPerson = self.dataPerson
             self.navigationController?.pushViewController(messageInfoVC, animated: true)
         })
         let delete = UIAction(title: "Delete".localized(), image: UIImage(systemName: "trash.fill"), attributes: .destructive, handler: {(_) in
+            if self.removed {
+                return
+            }
             self.deleteSession = true
             if self.reffId != nil {
                 self.deleteReplyView()
@@ -3077,9 +3131,14 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             if countSelected == 0 {
                 return
             }
-            let navigationController = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "contactChatNav") as! UINavigationController
-            navigationController.modalPresentationStyle = .custom
-            if let controller = navigationController.viewControllers.first as? ContactChatViewController {
+            contactChatNav.modalPresentationStyle = .custom
+            contactChatNav.navigationBar.tintColor = .white
+            contactChatNav.navigationBar.barTintColor = .mainColor
+            contactChatNav.navigationBar.isTranslucent = false
+            let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+            contactChatNav.navigationBar.titleTextAttributes = textAttributes
+            contactChatNav.view.backgroundColor = .mainColor
+            if let controller = contactChatNav.viewControllers.first as? ContactChatViewController {
                 controller.isChooser = { [weak self] scope, pin in
                     if scope == "3" {
                         let editorPersonalVC = AppStoryBoard.Palio.instance.instantiateViewController(identifier: "editorPersonalVC") as! EditorPersonal
@@ -3094,7 +3153,7 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
                     }
                 }
             }
-            self.present(navigationController, animated: true, completion: nil)
+            self.present(contactChatNav, animated: true, completion: nil)
         } else if deleteSession {
             let dataMessages = self.dataMessages.filter({ $0["isSelected"] as! Bool == true })
             let countSelected = dataMessages.count
@@ -4015,9 +4074,11 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                         let description = json["description"] as? String ?? ""
                         let start = json["time"] as? Int64 ?? 0
                         let by = json["by"] as? String ?? ""
-                        var type = "*Live Streaming*"
+                        let textLS = "Live Streaming".localized()
+                        var type = "*\(textLS)*"
                         if attachmentFlag == "26" {
-                            type = "*Seminar*"
+                            let textSeminar = "Seminar".localized()
+                            type = "*\(textSeminar)*"
                         }
                         if let c = Database().getRecords(fmdb: fmdb, query: "select first_name || ' ' || last_name from BUDDY where f_pin = '\(by)'"), c.next() {
                             let name = c.string(forColumnIndex: 0)!

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorStarMessages.swift

@@ -1000,6 +1000,12 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
         let forward = UIAction(title: "Forward".localized(), image: UIImage(systemName: "arrowshape.turn.up.right.fill"), handler: {(_) in
             let navigationController = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "contactChatNav") as! UINavigationController
             navigationController.modalPresentationStyle = .custom
+            navigationController.navigationBar.tintColor = .white
+            navigationController.navigationBar.barTintColor = .mainColor
+            navigationController.navigationBar.isTranslucent = false
+            let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+            navigationController.navigationBar.titleTextAttributes = textAttributes
+            navigationController.view.backgroundColor = .mainColor
             if let controller = navigationController.viewControllers.first as? ContactChatViewController {
                 controller.isChooser = { [weak self] scope, pin in
                     if scope == "3" {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeNameTableViewController.swift

@@ -18,7 +18,7 @@ class ChangeNameTableViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(save(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Save".localized(), style: .plain, target: self, action: #selector(save(sender:)))
         
         Database.shared.database?.inTransaction({ fmdb, rollback in
             if let cursor = Database.shared.getRecords(fmdb: fmdb, query: "select FIRST_NAME || ' ' || ifnull(LAST_NAME, '') from BUDDY where F_PIN = '\(data)'"), cursor.next() {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ContactChatViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 import FMDB
 import NotificationBannerSwift
+import Toast_Swift
 
 class ContactChatViewController: UITableViewController {
     
@@ -39,7 +40,7 @@ class ContactChatViewController: UITableViewController {
     }
     
     var isFilltering: Bool {
-        return searchController.isActive && !isSearchBarEmpty
+        return !isSearchBarEmpty
     }
     
     func filterContentForSearchText(_ searchText: String) {
@@ -63,8 +64,11 @@ class ContactChatViewController: UITableViewController {
                 cursor.close()
             }
         })
-        
-        title = "Start Conversation".localized()
+        if isChooser != nil {
+            title = "Forward Messages".localized()
+        } else {
+            title = "Start Conversation".localized()
+        }
         let attributes = [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 16.0), NSAttributedString.Key.foregroundColor: UIColor.white]
         self.navigationController?.navigationBar.titleTextAttributes = attributes
         
@@ -162,6 +166,8 @@ class ContactChatViewController: UITableViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         groupMap.removeAll()
+        groups.removeAll()
+        tableView.reloadData()
         getData()
     }
     
@@ -172,6 +178,7 @@ class ContactChatViewController: UITableViewController {
                 self.getData()
             }
         } else if data["state"] as? Int == 99 {
+            print("MASUK 99")
             DispatchQueue.main.async {
                 self.getData()
             }
@@ -217,23 +224,23 @@ class ContactChatViewController: UITableViewController {
     // MARK: - Data source
     
     func getData() {
-        self.chats.removeAll()
-        self.contacts.removeAll()
         getChats {
             self.getContacts {
                 self.getGroups { g1 in
-                    self.getOpenGroups(listGroups: g1, completion: { g in
-                        self.groups.removeAll()
-                        self.groups.append(contentsOf: g1)
-                        for og in g {
-                            if self.groups.first(where: { $0.id == og.id }) == nil {
-                                self.groups.append(og)
+                    DispatchQueue.global().async {
+                        self.getOpenGroups(listGroups: g1, completion: { g in
+                            self.groups.removeAll()
+                            self.groups.append(contentsOf: g1)
+                            for og in g {
+                                if self.groups.first(where: { $0.id == og.id }) == nil {
+                                    self.groups.append(og)
+                                }
                             }
-                        }
-                        DispatchQueue.main.async {
-                            self.tableView.reloadData()
-                        }
-                    })
+                            DispatchQueue.main.async {
+                                self.tableView.reloadData()
+                            }
+                        })
+                    }
                 }
             }
         }
@@ -426,6 +433,16 @@ extension ContactChatViewController {
                 data = chats[indexPath.row]
             }
             if let chooser = isChooser {
+                var exblock = User.getData(pin: data.pin)?.ex_block
+                exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
+                if exblock != "0" {
+                    if exblock == "1" {
+                        self.view.makeToast("You blocked this user".localized())
+                    } else {
+                        self.view.makeToast("You have been blocked by this user".localized())
+                    }
+                    return
+                }
                 if data.pin == "-999"{
                     return
                 }
@@ -454,6 +471,16 @@ extension ContactChatViewController {
                 data = contacts[indexPath.row]
             }
             if let chooser = isChooser {
+                var exblock = User.getData(pin: data.pin)?.ex_block
+                exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
+                if exblock != "0" {
+                    if exblock == "1" {
+                        self.view.makeToast("You blocked this user".localized())
+                    } else {
+                        self.view.makeToast("You have been blocked by this user".localized())
+                    }
+                    return
+                }
                 chooser("3", data.pin)
                 dismiss(animated: true, completion: nil)
                 return
@@ -671,7 +698,7 @@ extension ContactChatViewController {
             NSLayoutConstraint.activate([
                 imageView.leadingAnchor.constraint(equalTo: content.leadingAnchor, constant: 10.0),
                 imageView.topAnchor.constraint(equalTo: content.topAnchor, constant: 10.0),
-                imageView.bottomAnchor.constraint(equalTo: content.bottomAnchor, constant: -20.0),
+                imageView.bottomAnchor.constraint(equalTo: content.bottomAnchor, constant: -25.0),
                 imageView.widthAnchor.constraint(equalToConstant: 40.0),
                 imageView.heightAnchor.constraint(equalToConstant: 40.0)
             ])
@@ -807,6 +834,9 @@ extension ContactChatViewController {
             if isFilltering {
                 data = fillteredData[indexPath.row] as! User
             } else {
+                if  indexPath.row > contacts.count - 1 {
+                    return cell
+                }
                 data = contacts[indexPath.row]
             }
             content.imageProperties.maximumSize = CGSize(width: 40, height: 40)
@@ -887,7 +917,7 @@ extension ContactChatViewController {
     }
     
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 70
+        return 75.0
     }
     
     private func getRealStatus(messageId: String) -> String {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/GroupDescViewController.swift

@@ -22,11 +22,12 @@ class GroupDescViewController: UITableViewController {
         
         title = "Change Description".localized()
 
-        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(save(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Save".localized(), style: .plain, target: self, action: #selector(save(sender:)))
         navigationItem.rightBarButtonItem?.isEnabled = false
         descText.text = quote
         
         descText.addTarget(self, action: #selector(didChanged(sender:)), for: .editingChanged)
+        descText.placeholder = "Description".localized()
     }
     
     @objc func didChanged(sender: Any) {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/GroupDetailViewController.swift

@@ -134,7 +134,7 @@ class GroupDetailViewController: UITableViewController {
         self.alert2 = UIAlertController(title: "Create Sub Group".localized(), message: nil, preferredStyle: .alert)
         self.textFields.removeAll()
         self.alert2?.addTextField{ (texfield) in
-            texfield.placeholder = "Group's Name"
+            texfield.placeholder = "Group's Name".localized()
             texfield.addTarget(self, action: #selector(self.alertTextFieldDidChange(_:)), for: UIControl.Event.editingChanged)
         }
         let submitAction = UIAlertAction(title: "Create".localized(), style: .default, handler: { (action) -> Void in
@@ -578,9 +578,11 @@ class GroupDetailViewController: UITableViewController {
                 }
                 let message: String
                 if isDeleted {
-                    message = "Are you sure want to delete the \"\(g.name)\" group?".localized()
+                    message = "Are you sure want to delete the group?".localized()
+//                    message = "Are you sure want to delete the \"\(g.name)\" group?".localized()
                 } else {
-                    message = "Are you sure want to exit the \"\(g.name)\" group?".localized()
+                    message = "Are you sure want to exit the group?".localized()
+//                    message = "Are you sure want to exit the \"\(g.name)\" group?".localized()
                 }
                 let alert = UIAlertController(title: nil, message: message, preferredStyle: .actionSheet)
                 alert.addAction(UIAlertAction(title: isDeleted ? "Delete Group".localized() : "Exit Group".localized(), style: .destructive, handler: { action in
@@ -733,10 +735,10 @@ class GroupDetailViewController: UITableViewController {
             if let g = group {
                 if g.isOpen.isEmpty || g.isOpen == "0" {
                     content.text = "Private".localized()
-                    content.secondaryText = "Only members can access this group".localized()
+                    content.secondaryText = "Only members can be access this group".localized()
                 } else if g.isOpen == "1" {
                     content.text = "Public".localized()
-                    content.secondaryText = "All user can access this group".localized()
+                    content.secondaryText = "All user can be access this group".localized()
                 }
                 if isAdmin && group?.official != "1" {
                     let changeOpen = UISwitch()
@@ -762,7 +764,7 @@ class GroupDetailViewController: UITableViewController {
                 if indexPath.row == 0, isAdmin {
                     content.image = UIImage(systemName: "plus.circle")
                     content.imageProperties.tintColor = .mainColor
-                    content.text = "Add topic".localized()
+                    content.text = "Add Topic".localized()
                     cell.accessoryType = .disclosureIndicator
                     cell.selectionStyle = .default
                 } else {
@@ -790,13 +792,13 @@ class GroupDetailViewController: UITableViewController {
             if let g = group {
                 switch indexPath.row {
                 case 1:
-                    content.text = "Crated date".localized()
+                    content.text = "Created date".localized()
                     content.secondaryText = Date(milliseconds: Int64(g.date)!).format(dateFormat: "dd, MMM yyyy")
                 case 2:
                     content.text = "Members".localized()
                     content.secondaryText = String(g.members.count)
                 default:
-                    content.text = "Crated by".localized()
+                    content.text = "Created by".localized()
                     Database.shared.database?.inTransaction({ fmdb, rollback in
                         if let cursor = Database.shared.getRecords(fmdb: fmdb, query: "select first_name || ' ' || ifnull(last_name, '') from BUDDY where f_pin = '\(g.by)'") {
                             if cursor.next() {
@@ -819,7 +821,7 @@ class GroupDetailViewController: UITableViewController {
                 if indexPath.row == 0, isAdmin {
                     content.image = UIImage(systemName: "plus.circle")
                     content.imageProperties.tintColor = .mainColor
-                    content.text = "Add member".localized()
+                    content.text = "Add Member".localized()
                     cell.accessoryType = .disclosureIndicator
                 } else {
                     let member = g.members[isAdmin ? indexPath.row - 1 : indexPath.row]

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/GroupNameViewController.swift

@@ -22,11 +22,12 @@ class GroupNameViewController: UITableViewController {
 
         title = "Change Group Name".localized()
 
-        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(save(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Save".localized(), style: .plain, target: self, action: #selector(save(sender:)))
         navigationItem.rightBarButtonItem?.isEnabled = false
         
         textField.text = name
         textField.addTarget(self, action: #selector(didChanged(sender:)), for: .editingChanged)
+        textField.placeholder = "Name".localized()
         
     }
 

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/GroupTopicViewController.swift

@@ -20,10 +20,11 @@ class GroupTopicViewController: UITableViewController {
         
         title = "Add Topic".localized()
 
-        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(save(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Save".localized(), style: .plain, target: self, action: #selector(save(sender:)))
         navigationItem.rightBarButtonItem?.isEnabled = false
         
         topic.addTarget(self, action: #selector(didChanged(sender:)), for: .editingChanged)
+        topic.placeholder = "Name".localized()
     }
 
     @objc func didChanged(sender: Any) {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/HistoryCCViewController.swift

@@ -17,7 +17,7 @@ public class HistoryCCViewController: UITableViewController, QLPreviewController
 
     public override func viewDidLoad() {
         super.viewDidLoad()
-        self.title = "History Contact Center".localized()
+        self.title = "Call Center History".localized()
         
         let randomInt = Int.random(in: 5..<11)
         let image = UIImage(named: "lbackground_\(randomInt)")

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ProfileViewController.swift

@@ -27,6 +27,9 @@ public class ProfileViewController: UITableViewController {
     @IBOutlet weak var buttonHistoryCC: UIButton!
     @IBOutlet weak var viewFriend: UIView!
     @IBOutlet weak var countFriend: UILabel!
+    @IBOutlet weak var labelPrivateAccount: UILabel!
+    @IBOutlet weak var labelChangePassword: UILabel!
+    @IBOutlet weak var labelAcceptCall: UILabel!
     
     private var imageVideoPicker : ImageVideoPicker!
     
@@ -173,9 +176,13 @@ public class ProfileViewController: UITableViewController {
             navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didTapExit(sender:)))
         }
         let myData = User.getData(pin: self.data)
+        labelPrivateAccount.text = "Private Account Mode".localized()
+        labelChangePassword.text = "Change Password".localized()
+        labelAcceptCall.text = "Accept Call".localized()
+        buttonHistoryCC.setTitle("Call Center History".localized(), for: .normal)
         if let me = UserDefaults.standard.string(forKey: "me"), me == data || flag == Flag.me {
             buttonGroup.removeFromSuperview()
-            navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(didTapEdit(sender:)))
+            navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Edit".localized(), style: .plain, target: self, action: #selector(didTapEdit(sender:)))
             imageVideoPicker = ImageVideoPicker(presentationController: self, delegate: self)
             buttonEditPass.addTarget(self, action: #selector(editPassword(sender:)), for: .touchUpInside)
             buttonHistoryCC.addTarget(self, action: #selector(historyCC(sender:)), for: .touchUpInside)

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Streaming/QmeraCreateStreamingViewController.swift

@@ -32,8 +32,8 @@ public class QmeraCreateStreamingViewController: UITableViewController {
     ]
     
     private var chooser: [Chooser] = [
-        Chooser(title: "Target Audience", value: AudienceViewController.data.first),
-        Chooser(title: "Promotion Type", value: TypeViewController.data.first)
+        Chooser(title: "Target Audience".localized(), value: AudienceViewController.data.first),
+        Chooser(title: "Promotion Type".localized(), value: TypeViewController.data.first)
     ]
     
     private var users: [User] = [] {
@@ -92,7 +92,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
         
         title = "Live Streaming".localized()
         
-        navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didTapCancel(sender:)))
+        navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel".localized(), style: .plain, target: self, action: #selector(didTapCancel(sender:)))
         navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Done".localized(), style: .plain, target: self, action: #selector(didTapRight(sender:)))
         
         descriptionView.delegate = self

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Streaming/QmeraStreamingViewController.swift

@@ -206,7 +206,7 @@ class QmeraStreamingViewController: UIViewController {
         
         like.anchor(bottom: stack.bottomAnchor, right: stack.rightAnchor)
         textView.anchor(left: stack.leftAnchor, bottom: stack.bottomAnchor, right: like.leftAnchor, paddingRight: 10)
-        send.anchor(bottom: textView.bottomAnchor, right: textView.rightAnchor, width: 33, height: 33)
+        send.anchor(bottom: textView.bottomAnchor, right: textView.rightAnchor, paddingBottom: 2, width: 33, height: 33)
         tableView.anchor(left: stack.leftAnchor, bottom: textView.topAnchor, right: stack.rightAnchor)
         heightTableView = tableView.heightAnchor.constraint(equalToConstant: 44.0)
         heightTableView?.isActive = true
@@ -223,13 +223,13 @@ class QmeraStreamingViewController: UIViewController {
         
         Nexilis.shared.streamingDelagate = self
         if isLive {
-//            let buttonRotate = UIButton()
-//            buttonRotate.frame = CGRect(x:0, y:0, width:30, height:30)
-//            buttonRotate.setImage(UIImage(systemName: "arrow.triangle.2.circlepath.camera")?.withTintColor(.mainColor, renderingMode: .alwaysOriginal), for: .normal)
-//            buttonRotate.backgroundColor = .white.withAlphaComponent(0.2)
-//            buttonRotate.layer.cornerRadius = 15.0
-//            buttonRotate.addTarget(self, action: #selector(camera(sender:)), for: .touchUpInside)
-//            navigationItem.rightBarButtonItem = UIBarButtonItem(customView: buttonRotate)
+            let buttonRotate = UIButton()
+            buttonRotate.frame = CGRect(x:0, y:0, width:30, height:30)
+            buttonRotate.setImage(UIImage(systemName: "arrow.triangle.2.circlepath.camera")?.withTintColor(.mainColor, renderingMode: .alwaysOriginal), for: .normal)
+            buttonRotate.backgroundColor = .white.withAlphaComponent(0.2)
+            buttonRotate.layer.cornerRadius = 15.0
+            buttonRotate.addTarget(self, action: #selector(camera(sender:)), for: .touchUpInside)
+            navigationItem.rightBarButtonItem = UIBarButtonItem(customView: buttonRotate)
             
             API.initiateBC(sTitle: data, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivLocalView: imageView)
         } else {
@@ -328,6 +328,11 @@ class QmeraStreamingViewController: UIViewController {
             return
         }
         chats.append(StreamingChat(name: "You".localized(), thumb: me.thumb, messageText: text.trimmingCharacters(in: .whitespacesAndNewlines)))
+        if textViewHeightConstraint != nil {
+            NSLayoutConstraint.deactivate([textViewHeightConstraint])
+        }
+        textView.isScrollEnabled = false
+        textView.setNeedsUpdateConstraints()
         DispatchQueue.global().async {
             self.sendChat(text: text.trimmingCharacters(in: .whitespacesAndNewlines))
         }

appbuilder-ios/NexilisLite/NexilisLite/Source/Whiteboard.swift

@@ -62,7 +62,7 @@ public class Whiteboard: WhiteboardDelegate {
         canvas?.setLineColor(color: UIColor(hexString: "FF000000"))
         let me = UserDefaults.standard.string(forKey: "me")!
         let tid = CoreMessage_TMessageUtil.getTID()
-        roomId = "\(me)\(tid)"
+        roomId = "\(me)wbvc\(tid)"
         _ = Nexilis.writeDraw(data: "WB/0/\(roomId)/\(destinations)")
     }
     

appbuilder-ios/NexilisLite/NexilisLite/Source/WhiteboardCanvas.swift

@@ -124,16 +124,24 @@ public class WhiteboardCanvas: UIView {
                 startingPoint = touchPoint
                 drawShapeLayer(color: colorDraw)
             } else {
-                onDrawing?(touchPoint.x, touchPoint.y, nWidth, nHeight, lineColor.toHexString(), lineWidth, startingPoint.x, startingPoint.y)
+                let dataWB = UserDefaults.standard.string(forKey: "wb_vc")!
+                print("DATA WB \(dataWB)")
+                var colorDraw = UIColor.red
+                let requester = dataWB.components(separatedBy: ",")[0]
+                let idMe = UserDefaults.standard.string(forKey: "me")!
+                if requester == idMe {
+                    colorDraw = UIColor.blue
+                }
+                onDrawing?(touchPoint.x, touchPoint.y, nWidth, nHeight, colorDraw.toHexString(), lineWidth, startingPoint.x, startingPoint.y)
 
-                self.drawWhiteboard(destination: destination ?? "", x: toString(from: touchPoint.x), y: toString(from: touchPoint.y), w: toString(from: nWidth), h: toString(from: nHeight), fc: peerLineColor.toHexString(),
+                self.drawWhiteboard(destination: destination ?? "", x: toString(from: touchPoint.x), y: toString(from: touchPoint.y), w: toString(from: nWidth), h: toString(from: nHeight), fc: colorDraw.toHexString(),
                                sw: toString(from: lineWidth), xo: toString(from: startingPoint.x), yo: toString(from: startingPoint.y))
                 
                 path = UIBezierPath()
                 path.move(to: startingPoint)
                 path.addLine(to: touchPoint)
                 startingPoint = touchPoint
-                drawShapeLayer()
+                drawShapeLayer(color: colorDraw)
             }
         }