Merge pull request #22 from MirrorFly/feature/update-2.2.0

Feature/update 2.2.0

Author: Vanithacontus

.gitignore

@@ -60,6 +60,7 @@ yarn.lock
 # Ruby / CocoaPods
 **/Pods/
 /vendor/bundle/
+**/Podfile.lock
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*

android/app/src/main/java/com/mirrorfly_rn/DeviceIdModule.kt

@@ -0,0 +1,26 @@
+package com.mirrorfly_rn
+
+import android.annotation.SuppressLint
+import android.provider.Settings
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactMethod
+
+class DeviceIdModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+    override fun getName(): String = "DeviceId"
+
+    @SuppressLint("HardwareIds")
+    @ReactMethod
+    fun getDeviceID(promise: Promise) {
+        try {
+            val androidId = Settings.Secure.getString(
+                reactContext.contentResolver,
+                Settings.Secure.ANDROID_ID
+            )
+            promise.resolve(androidId)
+        } catch (e: Exception) {
+            promise.reject("DEVICE_ID_ERROR", "Failed to get Android ID", e)
+        }
+    }
+}

android/app/src/main/java/com/mirrorfly_rn/MFModule.kt

@@ -14,6 +14,7 @@ class MFModule : ReactPackage {
         modules.add(BluetoothHeadsetDetectModule(reactContext))
         modules.add(RingtoneSilentKeyEventModule(reactContext))
         modules.add(MediaService(reactContext))
+        modules.add(DeviceIdModule(reactContext))
         return modules
     }
 

ios/DeviceIdModule.m

@@ -0,0 +1,16 @@
+//
+//  DeviceIdModule.m
+//  mirrorfly_rn
+//
+//  Created by user on 24/04/25.
+
+// DeviceIdModule.m
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+
+@interface RCT_EXTERN_MODULE(DeviceId, NSObject)
+RCT_EXTERN_METHOD(getDeviceID:(RCTPromiseResolveBlock *)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+@end
+

ios/DeviceIdModule.swift

@@ -0,0 +1,66 @@
+//
+//  DeviceIdModule.swift
+//  mirrorfly_rn
+//
+//  Created by user on 24/04/25.
+//
+import React
+import Foundation
+import UIKit
+import Security
+
+@objc(DeviceId)
+class DeviceId: NSObject {
+  let key = "com.mirrorfly.deviceid"
+  @objc
+   func getDeviceID(
+     _ resolve: @escaping RCTPromiseResolveBlock,
+     rejecter reject: @escaping RCTPromiseRejectBlock
+   ) {
+     if let data = KeychainHelper.load(key: key),
+        let existingUUID = String(data: data, encoding: .utf8) {
+       resolve(existingUUID)
+     } else {
+       let uuid = UUID().uuidString.replacingOccurrences(of: "-", with: "")
+       let shortened = String(uuid.prefix(8))
+       if KeychainHelper.save(key: key, data: shortened.data(using: .utf8)!) {
+         resolve(shortened)
+       } else {
+         reject("DEVICE_ID_ERROR", "Failed to save UUID to Keychain", nil)
+       }
+     }
+   }
+}
+
+
+class KeychainHelper {
+
+  static func save(key: String, data: Data) -> Bool {
+    let query = [
+      kSecClass: kSecClassGenericPassword,
+      kSecAttrAccount: key,
+      kSecValueData: data
+    ] as CFDictionary
+
+    SecItemDelete(query) // delete existing
+    let status = SecItemAdd(query, nil)
+    return status == errSecSuccess
+  }
+
+  static func load(key: String) -> Data? {
+    let query = [
+      kSecClass: kSecClassGenericPassword,
+      kSecAttrAccount: key,
+      kSecReturnData: kCFBooleanTrue!,
+      kSecMatchLimit: kSecMatchLimitOne
+    ] as CFDictionary
+
+    var dataTypeRef: AnyObject?
+    let status = SecItemCopyMatching(query, &dataTypeRef)
+    if status == errSecSuccess {
+      return dataTypeRef as? Data
+    }
+    return nil
+  }
+}
+

ios/mirrorfly_rn.xcodeproj/project.pbxproj

@@ -21,6 +21,8 @@
 		CE312F572D26CC7D00069D84 /* MediaService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE312F542D26CC7D00069D84 /* MediaService.swift */; };
 		CE312F582D26CC7D00069D84 /* FlyUtiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE312F552D26CC7D00069D84 /* FlyUtiles.swift */; };
 		CE312F592D26CC7D00069D84 /* MediaServiceBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = CE312F562D26CC7D00069D84 /* MediaServiceBridge.m */; };
+		CE8C4CA22DC0F00F00B1D471 /* DeviceIdModule.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C4CA02DC0F00F00B1D471 /* DeviceIdModule.m */; };
+		CE8C4CA32DC0F00F00B1D471 /* DeviceIdModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8C4CA12DC0F00F00B1D471 /* DeviceIdModule.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -75,6 +77,8 @@
 		CE312F542D26CC7D00069D84 /* MediaService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaService.swift; sourceTree = "<group>"; };
 		CE312F552D26CC7D00069D84 /* FlyUtiles.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlyUtiles.swift; sourceTree = "<group>"; };
 		CE312F562D26CC7D00069D84 /* MediaServiceBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaServiceBridge.m; sourceTree = "<group>"; };
+		CE8C4CA02DC0F00F00B1D471 /* DeviceIdModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeviceIdModule.m; sourceTree = "<group>"; };
+		CE8C4CA12DC0F00F00B1D471 /* DeviceIdModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceIdModule.swift; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -118,6 +122,8 @@
 		13B07FAE1A68108700A75B9A /* mirrorfly_rn */ = {
 			isa = PBXGroup;
 			children = (
+				CE8C4CA02DC0F00F00B1D471 /* DeviceIdModule.m */,
+				CE8C4CA12DC0F00F00B1D471 /* DeviceIdModule.swift */,
 				CE312F552D26CC7D00069D84 /* FlyUtiles.swift */,
 				CE312F542D26CC7D00069D84 /* MediaService.swift */,
 				CE312F562D26CC7D00069D84 /* MediaServiceBridge.m */,
@@ -465,6 +471,8 @@
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
 				A7B20C262CF5F71C0075CC1B /* RNCallKeep.m in Sources */,
 				CE312F582D26CC7D00069D84 /* FlyUtiles.swift in Sources */,
+				CE8C4CA22DC0F00F00B1D471 /* DeviceIdModule.m in Sources */,
+				CE8C4CA32DC0F00F00B1D471 /* DeviceIdModule.swift in Sources */,
 				CE312F572D26CC7D00069D84 /* MediaService.swift in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 				CE312F592D26CC7D00069D84 /* MediaServiceBridge.m in Sources */,
@@ -692,10 +700,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -779,10 +784,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

package.json

@@ -47,7 +47,7 @@
       "jest": "^29.6.3",
       "lodash-es": "^4.17.21",
       "luxon": "^3.5.0",
-      "mirrorfly-reactnative-sdk": "^2.1.0",
+      "mirrorfly-reactnative-sdk": "^2.2.0",
       "moment": "^2.30.1",
       "patch-package": "^8.0.0",
       "prettier": "2.8.8",

src/config/config.js

@@ -25,7 +25,7 @@ const config = {
    INVITE_APP_URL: 'https://app.mirrorfly.com',
    INVITE_SMS_CONTENT:
       'Hey, MirrorFly is a real time chat, Audio and Video call solution for B2B and B2C.\n Download the app from this URL: https://app.mirrorfly.com',
-   API_URL: 'https://console.mirrorfly.com/', // NOSONAR
+   API_URL: 'https://api-preprod-sandbox.mirrorfly.com/api/v1', // NOSONAR
    licenseKey: '*****************', // NOSONAR
 };
 

src/uikitMethods.js

@@ -12,6 +12,7 @@ import { CallComponent } from './calls/CallComponent';
 import { setupCallKit } from './calls/ios';
 import { setNotificationForegroundService } from './calls/notification/callNotifyHandler';
 import { getNotifyMessage, getNotifyNickName, getUserIdFromJid, showToast } from './helpers/chatHelpers';
+import { NOTIFICATION } from './helpers/constants';
 import { setLanguageCode } from './localization/stringSet';
 import { addChatMessageItem } from './redux/chatMessageDataSlice';
 import { clearState } from './redux/clearSlice';
@@ -21,7 +22,6 @@ import { setRoasterData } from './redux/rosterDataSlice';
 import store from './redux/store';
 import { updateTheme, updateThemeColor } from './redux/themeColorDataSlice';
 import { RECENTCHATSCREEN, REGISTERSCREEN } from './screens/constants';
-import { NOTIFICATION } from './helpers/constants';
 
 let uiKitCallbackListenersVal = {},
    appInitialized = false,
@@ -140,13 +140,14 @@ export const mirrorflyRegister = async ({ userIdentifier, fcmToken = '', metadat
          };
       }
 
-      const registerRes = await SDK.register(
+      const registerRes = await SDK.register({
          userIdentifier,
-         fcmToken,
-         voipToken,
-         process.env?.NODE_ENV === 'production',
-         metadata,
-      );
+         fcmtoken: fcmToken,
+         voipDeviceToken: voipToken,
+         mode: process.env?.NODE_ENV === 'production',
+         registerMetaData: metadata,
+         forceRegister: true,
+      });
       if (registerRes.statusCode === 200) {
          const { data } = registerRes;
          const connect = await SDK.connect(data.username, data.password);