update add app name and cpaas version

appbuilder-ios/AppBuilder/AppBuilder/AppDelegate.swift

@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             showButton = true
         }
         Nexilis.isShowForceSignIn = false
-        Nexilis.connect(apiKey: "***REPLACE***WITH***YOUR***ACCOUNT***", delegate: self, showButton: showButton, fromMAB: true) //23091CF494A11149F5A8FC8D17FF690DC69AE656F91B86070A11506ED24144F5(BPKH) //38747683290F62E9667A018F490396EAE47BC16ADECD85B7E865C733E6DBD6A2(OneApp)
+        APIS.connect(appName: Bundle.main.infoDictionary?["CFBundleName"] as! String , apiKey: "***REPLACE***WITH***YOUR***ACCOUNT***", delegate: self, showButton: showButton, fromMAB: true) //23091CF494A11149F5A8FC8D17FF690DC69AE656F91B86070A11506ED24144F5(BPKH) //38747683290F62E9667A018F490396EAE47BC16ADECD85B7E865C733E6DBD6A2(OneApp)
         registerForPushNotifications()
         return true
     }

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

@@ -13,8 +13,9 @@ import Toast_Swift
 import nuSDKService
 
 public class APIS: NSObject {
-    public static func connect(apiKey: String, delegate: ConnectDelegate, showButton: Bool = true) {
-        Nexilis.connect(apiKey: apiKey, delegate: delegate, showButton: showButton)
+    public static func connect(appName: String, apiKey: String, delegate: ConnectDelegate, showButton: Bool = true, fromMAB: Bool = false) {
+        APIS.appNm = appName
+        Nexilis.connect(apiKey: apiKey, delegate: delegate, showButton: showButton, fromMAB: fromMAB)
     }
     
     public static func getTotalCounter() -> Int32 {
@@ -749,6 +750,11 @@ public class APIS: NSObject {
     public static func setPreventScreenCapture(isActive: Bool) {
         Utils.bPreventScreenCapture = isActive
     }
+    
+    private static var appNm = "";
+    public static func getAppNm() -> String {
+        return appNm
+    }
 }
 
 extension UINavigationController {

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

@@ -33,6 +33,8 @@ public class CoreMessage_TMessageBank {
         tmessage.mCode = CoreMessage_TMessageCode.SIGN_UP_API
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mBodies[CoreMessage_TMessageKey.API] = api
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_APP_NAME] = APIS.getAppNm()
+        tmessage.mBodies[CoreMessage_TMessageKey.CPAAS_VERSION] = Utils.CPAAS_VERSION
         tmessage.mPIN = p_pin
         return tmessage
     }
@@ -43,6 +45,9 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
         tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = Utils.M_USER_ANDROID_ID
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_APP_NAME] = APIS.getAppNm()
+        tmessage.mBodies[CoreMessage_TMessageKey.CPAAS_VERSION] = Utils.CPAAS_VERSION
 //        tmessage.mBodies[CoreMessage_TMessageKey.BUSINESS_ENTITY] = "74"
         return tmessage
     }
@@ -1336,6 +1341,8 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.EMAIL] = p_email
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_APP_NAME] = APIS.getAppNm()
+        tmessage.mBodies[CoreMessage_TMessageKey.CPAAS_VERSION] = Utils.CPAAS_VERSION
         return tmessage
     }
 
@@ -1831,7 +1838,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
         tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
-        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = Utils.M_USER_ANDROID_ID
         return tmessage
     }
     
@@ -1843,7 +1850,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
         tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
-        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = Utils.M_USER_ANDROID_ID
         return tmessage
     }
     
@@ -1855,7 +1862,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
         tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
-        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = Utils.M_USER_ANDROID_ID
         return tmessage
     }
     
@@ -2216,6 +2223,9 @@ public class CoreMessage_TMessageBank {
         tmessage.mPIN = UserDefaults.standard.string(forKey: "me")!
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
         tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = Utils.M_USER_ANDROID_ID
+        tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_APP_NAME] = APIS.getAppNm()
+        tmessage.mBodies[CoreMessage_TMessageKey.CPAAS_VERSION] = Utils.CPAAS_VERSION
         return tmessage
     }
     

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

@@ -466,6 +466,8 @@ public class CoreMessage_TMessageKey {
     
     public static let LAST_SIGN = "LSG";
     public static let ANDROID_ID = "AID";
+    public static let ANDROID_APP_NAME = "AAN";
+    public static let CPAAS_VERSION = "CPN";
     
     public static let MAJOR_EDU = "majoredu";
     public static let SCHOOL_ID = "schoolid";

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

@@ -16,6 +16,8 @@ import CoreLocation
 //import typealias CommonCrypto.CC_LONG
 
 public final class Utils {
+    public static let M_USER_ANDROID_ID = "UNK"
+    public static let CPAAS_VERSION = "UCPaaS-Nexilis.3.2.8"
     
     public static func getCurrentTime()->Int64 {
         return Int64(Date().timeIntervalSince1970)

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

@@ -133,19 +133,23 @@ public class ProfileViewController: UITableViewController {
     }
     
     private func getData(completion: @escaping (User?) -> ()) {
-        DispatchQueue.global().async {
-            var r: User?
-            r = User.getData(pin: self.data)
-            Database.shared.database?.inTransaction({ fmdb, rollback in
-                let idMe = UserDefaults.standard.string(forKey: "me")!
-                if let cursorCount = Database.shared.getRecords(fmdb: fmdb, query: "select COUNT(*) from BUDDY where f_pin <> '\(idMe)' and first_name NOT LIKE 'USR%' "), cursorCount.next() {
-                    DispatchQueue.main.async {
-                        self.countFriend.text = cursorCount.string(forColumnIndex: 0) ?? "" + " " + "Friends".localized()
+        do {
+            DispatchQueue.global().async {
+                var r: User?
+                r = User.getData(pin: self.data)
+                Database.shared.database?.inTransaction({ fmdb, rollback in
+                    let idMe = UserDefaults.standard.string(forKey: "me")!
+                    if let cursorCount = Database.shared.getRecords(fmdb: fmdb, query: "select COUNT(*) from BUDDY where f_pin <> '\(idMe)' and first_name NOT LIKE 'USR%' "), cursorCount.next() {
+                        DispatchQueue.main.async {
+                            self.countFriend.text = cursorCount.string(forColumnIndex: 0) ?? "" + " " + "Friends".localized()
+                        }
+                        cursorCount.close()
                     }
-                    cursorCount.close()
-                }
-            })
-            completion(r)
+                })
+                completion(r)
+            }
+        } catch {
+            
         }
     }
     
@@ -156,7 +160,7 @@ public class ProfileViewController: UITableViewController {
     }
     
     public override func viewWillAppear(_ animated: Bool) {
-        if navigationController?.navigationBar.backgroundColor != .clear {
+        if navigationController?.navigationBar.backgroundColor != .clear || self.traitCollection.userInterfaceStyle == .dark {
             navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
             navigationController?.navigationBar.tintColor = .white
             navigationItem.rightBarButtonItem?.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal)