omikit-plugin 4.1.0 → 4.1.1

package/README.md

@@ -2,7 +2,7 @@
 
 The [omikit-plugin](https://www.npmjs.com/package/omikit-plugin) enables VoIP/SIP calling via the OMICALL platform with support for both Old and **New Architecture** (TurboModules + Fabric).
 
-**Status:** Active maintenance | **Version:** 4.1.0
+**Status:** Active maintenance | **Version:** 4.1.1
 
 ---
 
@@ -46,7 +46,7 @@ The [omikit-plugin](https://www.npmjs.com/package/omikit-plugin) enables VoIP/SI
 
 | Platform | SDK | Version |
 |----------|-----|---------|
-| Android | OMIKIT | 2.6.4 |
+| Android | OMIKIT | 2.6.6 |
 | iOS | OmiKit | 1.11.4 |
 
 ### Platform Requirements
@@ -54,8 +54,8 @@ The [omikit-plugin](https://www.npmjs.com/package/omikit-plugin) enables VoIP/SI
 | | Android | iOS |
 |--|---------|-----|
 | **Min SDK** | API 24 (Android 7.0) | iOS 13.0 |
-| **Target SDK** | API 35 (Android 15) | — |
-| **Compile SDK** | API 35 | — |
+| **Target SDK** | API 36 (Android 16) | — |
+| **Compile SDK** | API 36 | — |
 
 ### Device Requirements
 
@@ -131,7 +131,32 @@ Add to `android/app/src/main/AndroidManifest.xml`:
 >
 > Make sure to add the `tools` namespace to your manifest tag: `xmlns:tools="http://schemas.android.com/tools"`
 
-### 2. Firebase Cloud Messaging (FCM)
+### 2. Incoming Call Activity (Required)
+
+Your main Activity must handle incoming call intents from the SDK. Add the following `intent-filter` to your `MainActivity` in `AndroidManifest.xml`:
+
+```xml
+<activity
+  android:name=".MainActivity"
+  android:showWhenLocked="true"
+  android:turnScreenOn="true"
+  android:launchMode="singleTask"
+  ...>
+
+  <!-- Incoming call intent-filter (required for lock screen) -->
+  <intent-filter>
+    <action android:name="${applicationId}.ACTION_INCOMING_CALL" />
+    <action android:name="android.intent.action.CALL" />
+    <category android:name="android.intent.category.DEFAULT" />
+    <data android:host="incoming_call" android:scheme="omisdk" />
+  </intent-filter>
+</activity>
+```
+
+> **Important:** The `${applicationId}.ACTION_INCOMING_CALL` action ensures incoming calls show correctly on **lock screen** for Android 9-14. Without this, the default dialer may intercept the intent instead of your app.
+
+### 3. Firebase Cloud Messaging (FCM)
+
 
 Add your `google-services.json` to `android/app/`.
 
@@ -141,7 +166,7 @@ In `android/app/build.gradle`:
 apply plugin: 'com.google.gms.google-services'
 ```
 
-### 3. Maven Repository
+### 4. Maven Repository
 
 **Option A — `settings.gradle.kts` (recommended for new projects)**
 
@@ -201,7 +226,7 @@ OMI_TOKEN=omi_github_access_token
 
 > **Note:** Contact the OMICall development team to get `OMI_USER` and `OMI_TOKEN` credentials.
 
-### 4. New Architecture (Optional)
+### 5. New Architecture (Optional)
 
 To enable New Architecture on Android, in `android/gradle.properties`:
 
@@ -238,13 +263,352 @@ Enable **Push Notifications** capability in Xcode for VoIP push (PushKit).
 
 ### 4. AppDelegate Setup
 
-In your `AppDelegate.mm` (or `.m`):
+The AppDelegate template differs depending on your React Native version. Choose the one that matches your project:
+
+#### RN 0.74 – 0.78 (RCTAppDelegate pattern)
+
+<details>
+<summary>AppDelegate.h</summary>
 
 ```objc
-#import <OmiKit/OmiKit-umbrella.h>
-#import <OmiKit/Constants.h>
+#import <RCTAppDelegate.h>
+#import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
+#import <OmiKit/OmiKit.h>
+
+@interface AppDelegate : RCTAppDelegate <UIApplicationDelegate, RCTBridgeDelegate, UNUserNotificationCenterDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
+@property (nonatomic, strong) PushKitManager *pushkitManager;
+@property (nonatomic, strong) CallKitProviderDelegate *provider;
+@property (nonatomic, strong) PKPushRegistry *voipRegistry;
+
+@end
 ```
 
+</details>
+
+<details>
+<summary>AppDelegate.mm</summary>
+
+```objc
+#import "AppDelegate.h"
+#import <Firebase.h>
+#import <React/RCTBundleURLProvider.h>
+#import <OmiKit/OmiKit.h>
+
+#if __has_include("OmikitNotification.h")
+#import "OmikitNotification.h"
+#else
+#import <omikit_plugin/OmikitNotification.h>
+#endif
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  self.moduleName = @"YourAppName"; // Replace with your app name
+
+  // ----- OmiKit Config ------
+  [OmiClient setEnviroment:KEY_OMI_APP_ENVIROMENT_SANDBOX
+                userNameKey:@"full_name"
+                    maxCall:2
+               callKitImage:@"call_image"
+              typePushVoip:TYPE_PUSH_CALLKIT_DEFAULT];
+
+  self.provider = [[CallKitProviderDelegate alloc]
+      initWithCallManager:[OMISIPLib sharedInstance].callManager];
+  self.voipRegistry = [[PKPushRegistry alloc]
+      initWithQueue:dispatch_get_main_queue()];
+  self.pushkitManager = [[PushKitManager alloc]
+      initWithVoipRegistry:self.voipRegistry];
+
+  if (@available(iOS 10.0, *)) {
+    [UNUserNotificationCenter currentNotificationCenter].delegate =
+        (id<UNUserNotificationCenterDelegate>)self;
+  }
+
+  if ([FIRApp defaultApp] == nil) {
+    [FIRApp configure];
+  }
+  // ----- End OmiKit Config ------
+
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+// Handle foreground notifications
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+{
+  completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
+}
+
+// Handle missed call notification tap
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)())completionHandler
+{
+  NSDictionary *userInfo = response.notification.request.content.userInfo;
+  if (userInfo && [userInfo valueForKey:@"omisdkCallerNumber"]) {
+    [OmikitNotification didRecieve:userInfo];
+  }
+  completionHandler();
+}
+
+// Register push notification token
+- (void)application:(UIApplication *)app
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)devToken
+{
+  const unsigned char *data = (const unsigned char *)[devToken bytes];
+  NSMutableString *token = [NSMutableString string];
+  for (NSUInteger i = 0; i < [devToken length]; i++) {
+    [token appendFormat:@"%02.2hhX", data[i]];
+  }
+  [OmiClient setUserPushNotificationToken:[token copy]];
+}
+
+// Terminate all calls when app is killed
+- (void)applicationWillTerminate:(UIApplication *)application {
+  @try {
+    [OmiClient OMICloseCall];
+  } @catch (NSException *exception) {}
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self bundleURL];
+}
+
+- (NSURL *)bundleURL
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+@end
+```
+
+</details>
+
+#### RN 0.79+ (RCTReactNativeFactory pattern)
+
+RN 0.79+ uses `RCTReactNativeFactory` instead of `RCTAppDelegate`. Add OmiKit setup in your existing AppDelegate:
+
+<details>
+<summary>AppDelegate.swift (Swift template)</summary>
+
+```swift
+import UIKit
+import React
+import ReactAppDependencyProvider
+import OmiKit
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
+  var window: UIWindow?
+  var provider: CallKitProviderDelegate?
+  var pushkitManager: PushKitManager?
+  var voipRegistry: PKPushRegistry?
+
+  func application(_ application: UIApplication,
+                   didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    // React Native setup
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    window = UIWindow(frame: UIScreen.main.bounds)
+    factory.startReactNative(
+      withModuleName: "YourAppName",
+      in: window,
+      launchOptions: launchOptions
+    )
+
+    // ----- OmiKit Config ------
+    #ifdef DEBUG
+    OmiClient.setEnviroment(KEY_OMI_APP_ENVIROMENT_SANDBOX,
+                            userNameKey: "full_name",
+                            maxCall: 1,
+                            callKitImage: "call_image",
+                            typePushVoip: TYPE_PUSH_CALLKIT_DEFAULT)
+    #else
+    OmiClient.setEnviroment(KEY_OMI_APP_ENVIROMENT_PRODUCTION,
+                            userNameKey: "full_name",
+                            maxCall: 1,
+                            callKitImage: "call_image",
+                            typePushVoip: TYPE_PUSH_CALLKIT_DEFAULT)
+    #endif
+
+    provider = CallKitProviderDelegate(callManager: OMISIPLib.sharedInstance().callManager)
+    voipRegistry = PKPushRegistry(queue: .main)
+    pushkitManager = PushKitManager(voipRegistry: voipRegistry!)
+
+    UNUserNotificationCenter.current().delegate = self
+    FirebaseApp.configure()
+    // ----- End OmiKit Config ------
+
+    return true
+  }
+
+  // Handle missed call notification tap
+  func userNotificationCenter(_ center: UNUserNotificationCenter,
+                              didReceive response: UNNotificationResponse,
+                              withCompletionHandler completionHandler: @escaping () -> Void) {
+    let userInfo = response.notification.request.content.userInfo
+    if userInfo["omisdkCallerNumber"] != nil {
+      OmikitNotification.didRecieve(userInfo)
+    }
+    completionHandler()
+  }
+
+  // Register push notification token
+  func application(_ application: UIApplication,
+                   didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    let token = deviceToken.map { String(format: "%02.2hhX", $0) }.joined()
+    OmiClient.setUserPushNotificationToken(token)
+  }
+
+  // Terminate all calls when app is killed
+  func applicationWillTerminate(_ application: UIApplication) {
+    try? OmiClient.omiCloseCall()
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    return bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+    #if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+    #else
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+    #endif
+  }
+}
+```
+
+</details>
+
+<details>
+<summary>AppDelegate.mm (Objective-C template)</summary>
+
+```objc
+#import "AppDelegate.h"
+#import <Firebase.h>
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTReactNativeFactory.h>
+#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
+#import <OmiKit/OmiKit.h>
+
+#if __has_include("OmikitNotification.h")
+#import "OmikitNotification.h"
+#else
+#import <omikit_plugin/OmikitNotification.h>
+#endif
+
+@interface ReactNativeDelegate : RCTDefaultReactNativeFactoryDelegate
+@end
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  ReactNativeDelegate *delegate = [ReactNativeDelegate new];
+  RCTReactNativeFactory *factory = [[RCTReactNativeFactory alloc] initWithDelegate:delegate];
+  delegate.dependencyProvider = [RCTAppDependencyProvider new];
+
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  [factory startReactNativeWithModuleName:@"YourAppName" in:self.window launchOptions:launchOptions];
+
+  // ----- OmiKit Config ------
+  #ifdef DEBUG
+        [OmiClient setEnviroment:KEY_OMI_APP_ENVIROMENT_SANDBOX userNameKey:@"full_name" maxCall:1 callKitImage:@"icYourApp" typePushVoip:@"background"];
+  #else
+        [OmiClient setEnviroment:KEY_OMI_APP_ENVIROMENT_PRODUCTION userNameKey:@"full_name" maxCall:1 callKitImage:@"icYourApp" typePushVoip:@"background"];
+  #endif
+
+  self.provider = [[CallKitProviderDelegate alloc]
+      initWithCallManager:[OMISIPLib sharedInstance].callManager];
+  self.voipRegistry = [[PKPushRegistry alloc]
+      initWithQueue:dispatch_get_main_queue()];
+  self.pushkitManager = [[PushKitManager alloc]
+      initWithVoipRegistry:self.voipRegistry];
+
+  if (@available(iOS 10.0, *)) {
+    [UNUserNotificationCenter currentNotificationCenter].delegate =
+        (id<UNUserNotificationCenterDelegate>)self;
+  }
+
+  if ([FIRApp defaultApp] == nil) {
+    [FIRApp configure];
+  }
+  // ----- End OmiKit Config ------
+
+  return YES;
+}
+
+// Handle missed call notification tap
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)())completionHandler
+{
+  NSDictionary *userInfo = response.notification.request.content.userInfo;
+  if (userInfo && [userInfo valueForKey:@"omisdkCallerNumber"]) {
+    [OmikitNotification didRecieve:userInfo];
+  }
+  completionHandler();
+}
+
+// Register push notification token
+- (void)application:(UIApplication *)app
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)devToken
+{
+  const unsigned char *data = (const unsigned char *)[devToken bytes];
+  NSMutableString *token = [NSMutableString string];
+  for (NSUInteger i = 0; i < [devToken length]; i++) {
+    [token appendFormat:@"%02.2hhX", data[i]];
+  }
+  [OmiClient setUserPushNotificationToken:[token copy]];
+}
+
+// Terminate all calls when app is killed
+- (void)applicationWillTerminate:(UIApplication *)application {
+  @try {
+    [OmiClient OMICloseCall];
+  } @catch (NSException *exception) {}
+}
+
+@end
+
+@implementation ReactNativeDelegate
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self bundleURL];
+}
+
+- (NSURL *)bundleURL
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+@end
+```
+
+</details>
+
+> **Note:** Replace `YourAppName` with your app's module name. For production, change `KEY_OMI_APP_ENVIROMENT_SANDBOX` to `KEY_OMI_APP_ENVIROMENT_PRODUCTION`.
+
 ### 5. New Architecture (Optional)
 
 In your `Podfile`:
@@ -253,15 +617,20 @@ In your `Podfile`:
 ENV['RN_NEW_ARCH_ENABLED'] = '1'
 ```
 
-For **full bridgeless mode**, in `AppDelegate.mm`:
+For **New Architecture with video call support**, add Fabric interop registration in `AppDelegate.mm` inside `didFinishLaunchingWithOptions`, **before** `return [super ...]`:
 
 ```objc
-- (BOOL)bridgelessEnabled
-{
-  return YES;
-}
+// Required imports at the top of AppDelegate.mm
+#import <React-RCTFabric/React/RCTComponentViewFactory.h>
+#import <React-RCTFabric/React/RCTLegacyViewManagerInteropComponentView.h>
+
+// Inside didFinishLaunchingWithOptions, before return:
+[RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:@"OmiLocalCameraView"];
+[RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:@"OmiRemoteCameraView"];
 ```
 
+> **Important:** Bridgeless mode is **not yet supported** for video call views. If you use New Architecture, keep bridge mode enabled (do **not** add `bridgelessEnabled` returning `YES`).
+
 Then run `cd ios && pod install`.
 
 ---
@@ -293,7 +662,7 @@ Then run `cd ios && pod install`.
    │      │      │                  │      │       │
    │      ▼      │                  │      ▼       │
    │  OMIKIT SDK │                  │  OmiKit SDK  │
-   │  (v2.6.4)   │                  │  (v1.10.34)  │
+   │  (v2.6.5)   │                  │  (v1.11.4)  │
    │      │      │                  │      │       │
    │      ▼      │                  │      ▼       │
    │  SIP Stack  │                  │  SIP Stack   │

package/android/build.gradle

@@ -65,7 +65,7 @@ dependencies {
   // OMISDK
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
-  api "io.omicrm.vihat:omi-sdk:2.6.4"
+  api "io.omicrm.vihat:omi-sdk:2.6.6"
 
   // React Native — resolved from consumer's node_modules
   implementation "com.facebook.react:react-native:+"

package/android/src/main/java/com/omikitplugin/OmiLocalCameraView.kt

@@ -5,7 +5,7 @@ import android.util.Log
 import android.view.Surface
 import android.view.TextureView
 import android.view.ViewGroup
-import android.widget.LinearLayout
+import android.widget.FrameLayout
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
@@ -17,24 +17,25 @@ import vn.vihat.omicall.omisdk.videoutils.ScaleManager
 import vn.vihat.omicall.omisdk.videoutils.Size
 
 class OmiLocalCameraView(private val context: ReactApplicationContext) :
-  SimpleViewManager<LinearLayout>() {
+  SimpleViewManager<FrameLayout>() {
 
-  val localView: LinearLayout = LinearLayout(context)
+  val localView: FrameLayout = FrameLayout(context)
   private val cameraView: TextureView = TextureView(context)
 
-  // Track whether the surface is ready for rendering
   @Volatile
   private var isSurfaceReady = false
-
-  // Queued refresh — executed when surface becomes available
   private var pendingRefreshPromise: Promise? = null
 
   init {
-    localView.addView(cameraView)
+    // TextureView fills container — RN styles (width/height) control the FrameLayout
+    localView.addView(cameraView, FrameLayout.LayoutParams(
+      FrameLayout.LayoutParams.MATCH_PARENT,
+      FrameLayout.LayoutParams.MATCH_PARENT
+    ))
+
     cameraView.surfaceTextureListener = object : TextureView.SurfaceTextureListener {
       override fun onSurfaceTextureAvailable(surface: SurfaceTexture, width: Int, height: Int) {
         isSurfaceReady = true
-        // Execute queued refresh if any
         pendingRefreshPromise?.let { promise ->
           pendingRefreshPromise = null
           doRefresh(promise)
@@ -46,36 +47,28 @@ class OmiLocalCameraView(private val context: ReactApplicationContext) :
       override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
         isSurfaceReady = false
         pendingRefreshPromise = null
-        return true
+        return false
       }
 
       override fun onSurfaceTextureUpdated(surface: SurfaceTexture) {}
     }
   }
 
-  override fun getName(): String {
-    return "OmiLocalCameraView"
-  }
+  override fun getName(): String = "OmiLocalCameraView"
 
-  override fun createViewInstance(p0: ThemedReactContext): LinearLayout {
-    // Detach from previous parent if remounted
-    // (avoids "The specified child already has a parent" crash)
+  override fun createViewInstance(p0: ThemedReactContext): FrameLayout {
     (localView.parent as? ViewGroup)?.removeView(localView)
     return localView
   }
 
-  fun localViewInstance(): LinearLayout {
-    return localView
-  }
+  fun localViewInstance(): FrameLayout = localView
 
-  // Exposed to JS via NativeModules.OmiLocalCameraView.refresh()
   @ReactMethod
   fun refresh(promise: Promise) {
     UiThreadUtil.runOnUiThread {
       if (isSurfaceReady && cameraView.surfaceTexture != null) {
         doRefresh(promise)
       } else {
-        // Surface not ready yet — queue and execute when available
         pendingRefreshPromise = promise
       }
     }
@@ -84,25 +77,14 @@ class OmiLocalCameraView(private val context: ReactApplicationContext) :
   private fun doRefresh(promise: Promise) {
     try {
       val surface = Surface(cameraView.surfaceTexture)
-      val client = OmiClient.getInstance(context.applicationContext)
-
-      // Connect local camera feed — delay slightly to ensure camera subsystem ready
-      // (matches native SDK sample behavior with AppUtils.postDelay)
-      android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-        try {
-          client.setupLocalVideoFeed(surface)
-          Log.d("OmiLocalCameraView", "Connected local video feed to surface")
-
-          ScaleManager.adjustAspectRatio(
-            cameraView,
-            Size(cameraView.width, cameraView.height),
-            Size(9, 16)
-          )
-        } catch (e: Exception) {
-          Log.e("OmiLocalCameraView", "Error setting up local feed: ${e.message}")
-        }
-      }, 300)
-
+      OmiClient.getInstance(context.applicationContext).setupLocalVideoFeed(surface)
+      Log.d("OmiLocalCameraView", "Connected local video feed to surface")
+
+      ScaleManager.adjustAspectRatioCrop(
+        cameraView,
+        Size(cameraView.width, cameraView.height),
+        Size(3, 4)
+      )
       promise.resolve(true)
     } catch (e: Exception) {
       Log.e("OmiLocalCameraView", "Error refreshing: ${e.message}")

package/android/src/main/java/com/omikitplugin/OmiRemoteCameraView.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.Surface
 import android.view.TextureView
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
@@ -16,22 +17,30 @@ import vn.vihat.omicall.omisdk.videoutils.ScaleManager
 import vn.vihat.omicall.omisdk.videoutils.Size
 
 class OmiRemoteCameraView(private val context: ReactApplicationContext) :
-  SimpleViewManager<TextureView>() {
+  SimpleViewManager<FrameLayout>() {
 
-  val remoteView: TextureView = TextureView(context)
+  companion object {
+    @Volatile
+    var instance: OmiRemoteCameraView? = null
+  }
+
+  val remoteContainer: FrameLayout = FrameLayout(context)
+  private val remoteView: TextureView = TextureView(context)
 
-  // Track whether the surface is ready for rendering
   @Volatile
   private var isSurfaceReady = false
-
-  // Queued refresh — executed when surface becomes available
   private var pendingRefreshPromise: Promise? = null
 
   init {
+    instance = this
+    remoteContainer.addView(remoteView, FrameLayout.LayoutParams(
+      FrameLayout.LayoutParams.MATCH_PARENT,
+      FrameLayout.LayoutParams.MATCH_PARENT
+    ))
+
     remoteView.surfaceTextureListener = object : TextureView.SurfaceTextureListener {
       override fun onSurfaceTextureAvailable(surface: SurfaceTexture, width: Int, height: Int) {
         isSurfaceReady = true
-        // Execute queued refresh if any
         pendingRefreshPromise?.let { promise ->
           pendingRefreshPromise = null
           doRefresh(promise)
@@ -43,36 +52,28 @@ class OmiRemoteCameraView(private val context: ReactApplicationContext) :
       override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
         isSurfaceReady = false
         pendingRefreshPromise = null
-        return true
+        return false
       }
 
       override fun onSurfaceTextureUpdated(surface: SurfaceTexture) {}
     }
   }
 
-  override fun getName(): String {
-    return "OmiRemoteCameraView"
-  }
+  override fun getName(): String = "OmiRemoteCameraView"
 
-  override fun createViewInstance(p0: ThemedReactContext): TextureView {
-    // Detach from previous parent if remounted
-    // (avoids "The specified child already has a parent" crash)
-    (remoteView.parent as? ViewGroup)?.removeView(remoteView)
-    return remoteView
+  override fun createViewInstance(p0: ThemedReactContext): FrameLayout {
+    (remoteContainer.parent as? ViewGroup)?.removeView(remoteContainer)
+    return remoteContainer
   }
 
-  fun remoteViewInstance(): TextureView {
-    return remoteView
-  }
+  fun remoteViewInstance(): FrameLayout = remoteContainer
 
-  // Exposed to JS via NativeModules.OmiRemoteCameraView.refresh()
   @ReactMethod
   fun refresh(promise: Promise) {
     UiThreadUtil.runOnUiThread {
       if (isSurfaceReady && remoteView.surfaceTexture != null) {
         doRefresh(promise)
       } else {
-        // Surface not ready yet — queue and execute when available
         pendingRefreshPromise = promise
       }
     }
@@ -80,15 +81,15 @@ class OmiRemoteCameraView(private val context: ReactApplicationContext) :
 
   private fun doRefresh(promise: Promise) {
     try {
-      // Connect TextureView surface to SDK incoming video feed
       val surface = Surface(remoteView.surfaceTexture)
       OmiClient.getInstance(context.applicationContext).setupIncomingVideoFeed(surface)
       Log.d("OmiRemoteCameraView", "Connected remote video feed to surface")
 
+      // Default landscape; updated by onVideoSize when PJSIP reports actual dimensions
       ScaleManager.adjustAspectRatio(
         remoteView,
         Size(remoteView.width, remoteView.height),
-        Size(1280, 720)
+        Size(640, 480)
       )
       promise.resolve(true)
     } catch (e: Exception) {
@@ -96,4 +97,21 @@ class OmiRemoteCameraView(private val context: ReactApplicationContext) :
       promise.resolve(false)
     }
   }
+
+  /**
+   * Called from OmikitPluginModule.onVideoSize() when PJSIP reports
+   * actual remote video dimensions. Re-applies correct aspect ratio.
+   */
+  fun updateAspectRatio(videoWidth: Int, videoHeight: Int) {
+    UiThreadUtil.runOnUiThread {
+      if (remoteView.width > 0 && remoteView.height > 0 && videoWidth > 0 && videoHeight > 0) {
+        Log.d("OmiRemoteCameraView", "updateAspectRatio: video=${videoWidth}x${videoHeight}")
+        ScaleManager.adjustAspectRatio(
+          remoteView,
+          Size(remoteView.width, remoteView.height),
+          Size(videoWidth, videoHeight)
+        )
+      }
+    }
+  }
 }

package/android/src/main/java/com/omikitplugin/OmikitPluginModule.kt

@@ -121,6 +121,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   private var isIncoming: Boolean = false
   private var isAnswerCall: Boolean = false
   @Volatile private var permissionPromise: Promise? = null
+
+  // Helper for bridgeless mode (Expo/RN 0.81+) where currentActivity
+  // is not directly available as inherited property
+  private val safeActivity: Activity?
+    get() = reactApplicationContext?.currentActivity
   
   // Call state management to prevent concurrent calls
   private var isCallInProgress: Boolean = false
@@ -409,7 +414,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onVideoSize(width: Int, height: Int) {
-
+    // PJSIP reports actual remote video dimensions — update aspect ratio dynamically
+    OmiRemoteCameraView.instance?.updateAspectRatio(width, height)
   }
 
   private val accountListener = object : OmiAccountListener {
@@ -633,7 +639,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
             return
         }
 
-        currentActivity?.runOnUiThread {
+        safeActivity?.runOnUiThread {
             try {
                 // Extract parameters from data with proper defaults
                 val notificationIcon = data.getString("notificationIcon") ?: "ic_notification"
@@ -898,7 +904,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       )
     val map: WritableMap = WritableNativeMap()
     if (audio == PackageManager.PERMISSION_GRANTED) {
-      val activity = currentActivity
+      val activity = safeActivity
       if (activity == null) {
         promise.reject("E_NO_ACTIVITY", "Current activity is null")
         return
@@ -966,7 +972,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun joinCall(promise: Promise) {
       val appContext = reactApplicationContext.applicationContext
-      val activity = currentActivity
+      val activity = safeActivity
 
       if (appContext == null) { 
           promise.reject("E_NULL_CONTEXT", "Application context is null")
@@ -1075,7 +1081,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun toggleSpeaker(promise: Promise) {
-    val activity = currentActivity
+    val activity = safeActivity
     if (activity == null) { promise.resolve(null); return }
     activity.runOnUiThread {
       val newStatus = OmiClient.getInstance(reactApplicationContext!!).toggleSpeaker()
@@ -1086,7 +1092,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun sendDTMF(data: ReadableMap, promise: Promise) {
-    val activity = currentActivity
+    val activity = safeActivity
     if (activity == null) { promise.resolve(false); return }
     activity.runOnUiThread {
       val character = data.getString("character")
@@ -1106,7 +1112,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun switchOmiCamera(promise: Promise) {
-    val activity = currentActivity
+    val activity = safeActivity
     if (activity == null) { promise.resolve(false); return }
     activity.runOnUiThread {
       OmiClient.getInstance(reactApplicationContext!!).switchCamera()
@@ -1116,7 +1122,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun toggleOmiVideo(promise: Promise) {
-    val activity = currentActivity
+    val activity = safeActivity
     if (activity == null) { promise.resolve(false); return }
     activity.runOnUiThread {
       OmiClient.getInstance(reactApplicationContext!!).toggleCamera()
@@ -1354,7 +1360,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun transferCall(data: ReadableMap, promise: Promise) {
-    val activity = currentActivity
+    val activity = safeActivity
     if (activity == null) { promise.resolve(false); return }
     activity.runOnUiThread {
       val phone = data.getString("phoneNumber")
@@ -1559,7 +1565,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       // Store promise for callback
       permissionPromise = promise
       
-      val activity = reactApplicationContext?.currentActivity ?: run {
+      val activity = safeActivity ?: run {
         promise.resolve(false)
         return
       }
@@ -1681,7 +1687,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           Uri.parse("package:${reactApplicationContext.packageName}")
         )
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        reactApplicationContext.currentActivity?.startActivityForResult(intent, REQUEST_OVERLAY_PERMISSION_CODE)
+        safeActivity?.startActivityForResult(intent, REQUEST_OVERLAY_PERMISSION_CODE)
       } else {
         promise.resolve(true)
       }
@@ -1737,7 +1743,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       // Store promise for callback
       permissionPromise = promise
       
-      val activity = reactApplicationContext?.currentActivity ?: run {
+      val activity = safeActivity ?: run {
         promise.reject("E_NULL_ACTIVITY", "Current activity is null")
         return
       }
@@ -1759,7 +1765,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       return
     }
 
-    val activity = reactApplicationContext?.currentActivity ?: return
+    val activity = safeActivity ?: return
     ActivityCompat.requestPermissions(
       activity,
       missingPermissions.toTypedArray(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omikit-plugin",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Omikit Plugin by ViHAT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",