MRN-969

Author: karthikeyan-se-contus

.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

@@ -24,6 +24,8 @@
 		A7B20D1B2CF6DF400075CC1B /* sendDeliveredApiCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B20D162CF6DF400075CC1B /* sendDeliveredApiCall.swift */; };
 		A7F436612D4CB216003518B3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A7F436602D4CB216003518B3 /* GoogleService-Info.plist */; };
 		B42B189CF199C58746A31FD6 /* Pods_mirrorfly_rn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D29BAF4B0875C49FA458AB9 /* Pods_mirrorfly_rn.framework */; };
+		CE2074AA2DBA65C800C4A09A /* DeviceIdModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2074A92DBA65C800C4A09A /* DeviceIdModule.swift */; };
+		CE2074AC2DBA666300C4A09A /* DeviceIdModule.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2074AB2DBA666300C4A09A /* DeviceIdModule.m */; };
 		CE4307242D801FFC002485FF /* FlyUtiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4307212D801FFC002485FF /* FlyUtiles.swift */; };
 		CE4307252D801FFC002485FF /* MediaService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4307222D801FFC002485FF /* MediaService.swift */; };
 		CE4307262D801FFC002485FF /* MediaServiceBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4307232D801FFC002485FF /* MediaServiceBridge.m */; };
@@ -96,6 +98,8 @@
 		A7B20D152CF6DF400075CC1B /* NotificationService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotificationService.m; sourceTree = "<group>"; };
 		A7B20D162CF6DF400075CC1B /* sendDeliveredApiCall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sendDeliveredApiCall.swift; sourceTree = "<group>"; };
 		A7F436602D4CB216003518B3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		CE2074A92DBA65C800C4A09A /* DeviceIdModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceIdModule.swift; sourceTree = "<group>"; };
+		CE2074AB2DBA666300C4A09A /* DeviceIdModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeviceIdModule.m; sourceTree = "<group>"; };
 		CE4307212D801FFC002485FF /* FlyUtiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlyUtiles.swift; sourceTree = "<group>"; };
 		CE4307222D801FFC002485FF /* MediaService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaService.swift; sourceTree = "<group>"; };
 		CE4307232D801FFC002485FF /* MediaServiceBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MediaServiceBridge.m; sourceTree = "<group>"; };
@@ -167,6 +171,8 @@
 				13B07FB71A68108700A75B9A /* main.m */,
 				13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */,
 				351382106977CC60AE8C9180 /* PrivacyInfo.xcprivacy */,
+				CE2074A92DBA65C800C4A09A /* DeviceIdModule.swift */,
+				CE2074AB2DBA666300C4A09A /* DeviceIdModule.m */,
 			);
 			name = mirrorfly_rn;
 			sourceTree = "<group>";
@@ -565,6 +571,8 @@
 				CE4307252D801FFC002485FF /* MediaService.swift in Sources */,
 				CE4307262D801FFC002485FF /* MediaServiceBridge.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				CE2074AC2DBA666300C4A09A /* DeviceIdModule.m in Sources */,
+				CE2074AA2DBA65C800C4A09A /* DeviceIdModule.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package.json

@@ -122,8 +122,7 @@
       "rollup-plugin-node-polyfills": "^0.2.1",
       "rollup-plugin-peer-deps-external": "^2.2.4",
       "rollup-plugin-terser": "^7.0.2",
-      "typescript": "4.8.4",
-       "react-native-device-info": "^14.0.4"
+      "typescript": "4.8.4"
    },
    "engines": {
       "node": ">=18"

src/SDK/index.js

@@ -26,12 +26,12 @@ const config = {
    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',
    // ================ Dev environment variables =====================
-   // API_URL: 'https://api-uikit-dev.contus.us/api/v1',
-   // licenseKey: '2sdgNtr3sFBSM3bYRa7RKDPEiB38Xo',
+   API_URL: 'https://api-uikit-dev.contus.us/api/v1',
+   licenseKey: '2sdgNtr3sFBSM3bYRa7RKDPEiB38Xo',
    // =====================================
    // ================ QA Environment variables =====================
-   API_URL: 'https://api-uikit-qa.contus.us/api/v1',
-   licenseKey: 'ckIjaccWBoMNvxdbql8LJ2dmKqT5bp',
+   // API_URL: 'https://api-uikit-qa.contus.us/api/v1',
+   // licenseKey: 'ckIjaccWBoMNvxdbql8LJ2dmKqT5bp',
    // ================ UAT/Staging Environment variables =====================
    // API_URL: 'https://api-uikit-uat.contus.us/api/v1',
    // licenseKey: 'lu3Om85JYSghcsB6vgVoSgTlSQArL5',

src/config/config.js

@@ -22,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 DeviceInfo from 'react-native-device-info';
 
 let uiKitCallbackListenersVal = {},
    appInitialized = false,
@@ -141,15 +140,12 @@ export const mirrorflyRegister = async ({ userIdentifier, fcmToken = '', metadat
          };
       }
 
-      const deviceId = await DeviceInfo.getUniqueId();
-
       const registerRes = await SDK.register({
          userIdentifier,
          fcmtoken: fcmToken,
          voipDeviceToken: voipToken,
          mode: process.env?.NODE_ENV === 'production',
          registerMetaData: metadata,
-         deviceId: deviceId.toLowerCase(),
          forceRegister: true,
       });
       if (registerRes.statusCode === 200) {
@@ -214,7 +210,7 @@ export const mirrorflyLogout = async () => {
       notifee.stopForegroundService();
       notifee.cancelAllNotifications();
       return statusCode;
-   } catch (error) { }
+   } catch (error) {}
 };
 
 export const fetchCurrentUserProfile = async (iq = false) => {