@100mslive/react-native-hms 1.6.0 → 1.6.2

package/android/build.gradle

@@ -74,4 +74,4 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.1'
-}
+}

package/android/src/main/java/com/reactnativehmssdk/HMSAudioshareActivity.kt

@@ -13,44 +13,44 @@ import live.hms.video.sdk.HMSActionResultListener
 
 class HMSAudioshareActivity : ComponentActivity() {
   private var resultLauncher: ActivityResultLauncher<Intent> =
-      this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-          val mediaProjectionPermissionResultData: Intent? = result.data
-          val id = intent.getStringExtra("id")
-          val audioMixingMode = intent.getStringExtra("audioMixingMode")
-          HMSManager.hmsCollection[id]?.hmsSDK?.startAudioshare(
-              object : HMSActionResultListener {
-                override fun onError(error: HMSException) {
-                  finish()
-                  HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
-                  HMSManager.hmsCollection[id]?.emitHMSError(error)
-                }
-                override fun onSuccess() {
-                  HMSManager.hmsCollection[id]?.isAudioSharing = true
-                  HMSManager.hmsCollection[id]?.audioshareCallback?.resolve(
-                      HMSManager.hmsCollection[id]?.emitHMSSuccess()
-                  )
-                  finish()
-                }
-              },
-              mediaProjectionPermissionResultData,
-              HMSHelper.getAudioMixingMode(audioMixingMode)
-          )
-        } else {
-          val id = intent.getStringExtra("id")
-          val error =
-              HMSException(
-                  103,
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED"
+    this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+      if (result.resultCode == Activity.RESULT_OK) {
+        val mediaProjectionPermissionResultData: Intent? = result.data
+        val id = intent.getStringExtra("id")
+        val audioMixingMode = intent.getStringExtra("audioMixingMode")
+        HMSManager.hmsCollection[id]?.hmsSDK?.startAudioshare(
+          object : HMSActionResultListener {
+            override fun onError(error: HMSException) {
+              finish()
+              HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
+              HMSManager.hmsCollection[id]?.emitHMSError(error)
+            }
+            override fun onSuccess() {
+              HMSManager.hmsCollection[id]?.isAudioSharing = true
+              HMSManager.hmsCollection[id]?.audioshareCallback?.resolve(
+                HMSManager.hmsCollection[id]?.emitHMSSuccess(),
               )
-          HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
-          HMSManager.hmsCollection[id]?.emitHMSError(error)
-          finish()
-        }
+              finish()
+            }
+          },
+          mediaProjectionPermissionResultData,
+          HMSHelper.getAudioMixingMode(audioMixingMode),
+        )
+      } else {
+        val id = intent.getStringExtra("id")
+        val error =
+          HMSException(
+            103,
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+          )
+        HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
+        HMSManager.hmsCollection[id]?.emitHMSError(error)
+        finish()
       }
+    }
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -63,20 +63,20 @@ class HMSAudioshareActivity : ComponentActivity() {
     if (isAudioShared !== null && !isAudioShared) {
       try {
         val mediaProjectionManager =
-            getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
+          getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
         resultLauncher.launch(mediaProjectionManager.createScreenCaptureIntent())
       } catch (e: Exception) {
         println(e)
       }
     } else {
       HMSManager.hmsCollection[id]?.emitHMSError(
-          HMSException(
-              103,
-              "AUDIOSHARE_IS_ALREADY_RUNNING",
-              "AUDIOSHARE_IS_ALREADY_RUNNING",
-              "AUDIOSHARE_IS_ALREADY_RUNNING",
-              "AUDIOSHARE_IS_ALREADY_RUNNING"
-          )
+        HMSException(
+          103,
+          "AUDIOSHARE_IS_ALREADY_RUNNING",
+          "AUDIOSHARE_IS_ALREADY_RUNNING",
+          "AUDIOSHARE_IS_ALREADY_RUNNING",
+          "AUDIOSHARE_IS_ALREADY_RUNNING",
+        ),
       )
       finish()
     }

package/android/src/main/java/com/reactnativehmssdk/HMSDecoder.kt

@@ -42,7 +42,7 @@ object HMSDecoder {
           hmsRoom.browserRecordingState?.let {
             room.putMap(
               "browserRecordingState",
-              this.getHMSBrowserRecordingState(it)
+              this.getHMSBrowserRecordingState(it),
             )
           }
         }
@@ -55,7 +55,7 @@ object HMSDecoder {
           hmsRoom.rtmpHMSRtmpStreamingState?.let {
             room.putMap(
               "rtmpHMSRtmpStreamingState",
-              this.getHMSRtmpStreamingState(it)
+              this.getHMSRtmpStreamingState(it),
             )
           }
         }
@@ -63,7 +63,7 @@ object HMSDecoder {
           hmsRoom.serverRecordingState?.let {
             room.putMap(
               "serverRecordingState",
-              this.getHMSServerRecordingState(it)
+              this.getHMSServerRecordingState(it),
             )
           }
         }
@@ -88,21 +88,21 @@ object HMSDecoder {
       hmsRoom.browserRecordingState?.let {
         room.putMap(
           "browserRecordingState",
-          this.getHMSBrowserRecordingState(it)
+          this.getHMSBrowserRecordingState(it),
         )
       }
 
       hmsRoom.rtmpHMSRtmpStreamingState?.let {
         room.putMap(
           "rtmpHMSRtmpStreamingState",
-          this.getHMSRtmpStreamingState(it)
+          this.getHMSRtmpStreamingState(it),
         )
       }
 
       hmsRoom.serverRecordingState?.let {
         room.putMap(
           "serverRecordingState",
-          this.getHMSServerRecordingState(it)
+          this.getHMSServerRecordingState(it),
         )
       }
 
@@ -445,7 +445,7 @@ object HMSDecoder {
     if (hmsAudioTrackSettings != null) {
       settings.putBoolean(
         "useHardwareAcousticEchoCanceler",
-        hmsAudioTrackSettings.useHardwareAcousticEchoCanceler
+        hmsAudioTrackSettings.useHardwareAcousticEchoCanceler,
       )
       settings.putString("initialState", hmsAudioTrackSettings.initialState.name)
     }
@@ -689,28 +689,28 @@ object HMSDecoder {
 
       subscribeSettings.putArray(
         "subscribeTo",
-        this.getWriteableArray(hmsSubscribeSettings.subscribeTo)
+        this.getWriteableArray(hmsSubscribeSettings.subscribeTo),
       )
     }
     return subscribeSettings
   }
 
   private fun getHmsSubscribeDegradationSettings(
-    hmsSubscribeDegradationParams: SubscribeDegradationParams?
+    hmsSubscribeDegradationParams: SubscribeDegradationParams?,
   ): WritableMap {
     val subscribeDegradationParams: WritableMap = Arguments.createMap()
     if (hmsSubscribeDegradationParams != null) {
       subscribeDegradationParams.putString(
         "degradeGracePeriodSeconds",
-        hmsSubscribeDegradationParams.degradeGracePeriodSeconds.toString()
+        hmsSubscribeDegradationParams.degradeGracePeriodSeconds.toString(),
       )
       subscribeDegradationParams.putString(
         "packetLossThreshold",
-        hmsSubscribeDegradationParams.packetLossThreshold.toString()
+        hmsSubscribeDegradationParams.packetLossThreshold.toString(),
       )
       subscribeDegradationParams.putString(
         "recoverGracePeriodSeconds",
-        hmsSubscribeDegradationParams.recoverGracePeriodSeconds.toString()
+        hmsSubscribeDegradationParams.recoverGracePeriodSeconds.toString(),
       )
     }
     return subscribeDegradationParams

package/android/src/main/java/com/reactnativehmssdk/HMSHelper.kt

@@ -32,7 +32,7 @@ object HMSHelper {
 
   fun areAllRequiredKeysAvailable(
     map: ReadableMap?,
-    requiredKeys: Array<Pair<String, String>>
+    requiredKeys: Array<Pair<String, String>>,
   ): Boolean {
     if (map == null) {
       return false
@@ -65,7 +65,7 @@ object HMSHelper {
 
   fun getUnavailableRequiredKey(
     map: ReadableMap?,
-    requiredKeys: Array<Pair<String, String>>
+    requiredKeys: Array<Pair<String, String>>,
   ): String? {
     if (map == null) {
       return "Object_Is_Null"
@@ -112,7 +112,7 @@ object HMSHelper {
 
   fun getRolesFromRoleNames(
     targetedRoles: ArrayList<String>?,
-    roles: List<HMSRole>?
+    roles: List<HMSRole>?,
   ): List<HMSRole> {
     val encodedRoles: MutableList<HMSRole> = mutableListOf()
 
@@ -163,9 +163,9 @@ object HMSHelper {
   fun getFrameworkInfo(data: ReadableMap?): FrameworkInfo? {
     if (data != null &&
       this.areAllRequiredKeysAvailable(
-          data,
-          arrayOf(Pair("version", "String"), Pair("sdkVersion", "String"))
-        )
+        data,
+        arrayOf(Pair("version", "String"), Pair("sdkVersion", "String")),
+      )
     ) {
       val version = data.getString("version") as String
       val sdkVersion = data.getString("sdkVersion") as String
@@ -177,13 +177,13 @@ object HMSHelper {
   fun getLogSettings(data: ReadableMap?): HMSLogSettings? {
     if (data != null &&
       this.areAllRequiredKeysAvailable(
-          data,
-          arrayOf(
-              Pair("level", "String"),
-              Pair("maxDirSizeInBytes", "String"),
-              Pair("isLogStorageEnabled", "Boolean")
-            )
-        )
+        data,
+        arrayOf(
+          Pair("level", "String"),
+          Pair("maxDirSizeInBytes", "String"),
+          Pair("isLogStorageEnabled", "Boolean"),
+        ),
+      )
     ) {
       val level = getLogLevel(data.getString("level"))
       val maxDirSizeInBytes = getLogAlarmManager(data.getString("maxDirSizeInBytes"))
@@ -370,7 +370,7 @@ object HMSHelper {
   }
 
   private fun getHMSHLSMeetingURLVariants(
-    hmsMeetingURLVariants: ArrayList<HashMap<String, String>>?
+    hmsMeetingURLVariants: ArrayList<HashMap<String, String>>?,
   ): List<HMSHLSMeetingURLVariant> {
     val meetingURLVariants = mutableListOf<HMSHLSMeetingURLVariant>()
     if (hmsMeetingURLVariants !== null) {
@@ -388,14 +388,14 @@ object HMSHelper {
       var videoOnDemand = false
       if (areAllRequiredKeysAvailable(
           hmsHlsRecordingConfig,
-          arrayOf(Pair("singleFilePerLayer", "Boolean"))
+          arrayOf(Pair("singleFilePerLayer", "Boolean")),
         )
       ) {
         singleFilePerLayer = hmsHlsRecordingConfig.getBoolean("singleFilePerLayer")
       }
       if (areAllRequiredKeysAvailable(
           hmsHlsRecordingConfig,
-          arrayOf(Pair("videoOnDemand", "Boolean"))
+          arrayOf(Pair("videoOnDemand", "Boolean")),
         )
       ) {
         videoOnDemand = hmsHlsRecordingConfig.getBoolean("videoOnDemand")
@@ -406,7 +406,7 @@ object HMSHelper {
   }
 
   private fun getHMSHLSMeetingURLVariant(
-    hmsMeetingURLVariant: HashMap<String, String>?
+    hmsMeetingURLVariant: HashMap<String, String>?,
   ): HMSHLSMeetingURLVariant {
     var meetingURLVariant = HMSHLSMeetingURLVariant("", "")
     if (hmsMeetingURLVariant !== null) {
@@ -453,7 +453,7 @@ object HMSHelper {
     var config =
       HMSConfig(
         credentials.getString("username") as String,
-        credentials.getString("authToken") as String
+        credentials.getString("authToken") as String,
       )
 
     when {
@@ -462,8 +462,8 @@ object HMSHelper {
         arrayOf(
           Pair("endpoint", "String"),
           Pair("metadata", "String"),
-          Pair("captureNetworkQualityInPreview", "Boolean")
-        )
+          Pair("captureNetworkQualityInPreview", "Boolean"),
+        ),
       ) -> {
         config =
           HMSConfig(
@@ -472,24 +472,24 @@ object HMSHelper {
             initEndpoint = credentials.getString("endpoint") as String,
             metadata = credentials.getString("metadata") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview")
+            credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(
         credentials,
-        arrayOf(Pair("endpoint", "String"), Pair("metadata", "String"))
+        arrayOf(Pair("endpoint", "String"), Pair("metadata", "String")),
       ) -> {
         config =
           HMSConfig(
             credentials.getString("username") as String,
             credentials.getString("authToken") as String,
             initEndpoint = credentials.getString("endpoint") as String,
-            metadata = credentials.getString("metadata") as String
+            metadata = credentials.getString("metadata") as String,
           )
       }
       areAllRequiredKeysAvailable(
         credentials,
-        arrayOf(Pair("endpoint", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))
+        arrayOf(Pair("endpoint", "String"), Pair("captureNetworkQualityInPreview", "Boolean")),
       ) -> {
         config =
           HMSConfig(
@@ -497,12 +497,12 @@ object HMSHelper {
             credentials.getString("authToken") as String,
             initEndpoint = credentials.getString("endpoint") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview")
+            credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(
         credentials,
-        arrayOf(Pair("metadata", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))
+        arrayOf(Pair("metadata", "String"), Pair("captureNetworkQualityInPreview", "Boolean")),
       ) -> {
         config =
           HMSConfig(
@@ -510,7 +510,7 @@ object HMSHelper {
             credentials.getString("authToken") as String,
             metadata = credentials.getString("metadata") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview")
+            credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(credentials, arrayOf(Pair("endpoint", "String"))) -> {
@@ -518,7 +518,7 @@ object HMSHelper {
           HMSConfig(
             credentials.getString("username") as String,
             credentials.getString("authToken") as String,
-            initEndpoint = credentials.getString("endpoint") as String
+            initEndpoint = credentials.getString("endpoint") as String,
           )
       }
       areAllRequiredKeysAvailable(credentials, arrayOf(Pair("metadata", "String"))) -> {
@@ -526,19 +526,19 @@ object HMSHelper {
           HMSConfig(
             credentials.getString("username") as String,
             credentials.getString("authToken") as String,
-            metadata = credentials.getString("metadata") as String
+            metadata = credentials.getString("metadata") as String,
           )
       }
       areAllRequiredKeysAvailable(
         credentials,
-        arrayOf(Pair("captureNetworkQualityInPreview", "Boolean"))
+        arrayOf(Pair("captureNetworkQualityInPreview", "Boolean")),
       ) -> {
         config =
           HMSConfig(
             credentials.getString("username") as String,
             credentials.getString("authToken") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview")
+            credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
     }
@@ -552,7 +552,7 @@ object HMSHelper {
     sdkId: String,
     args: ReadableArray?,
     context: Context,
-    id: Int
+    id: Int,
   ) {
     val output = Arguments.createMap()
     if (args != null) {
@@ -587,8 +587,8 @@ object HMSHelper {
                 copyResult.toString(),
                 copyResult.toString(),
                 copyResult.toString(),
-                copyResult.toString()
-              )
+                copyResult.toString(),
+              ),
             )
             output.putString("error", copyResult.toString())
             reactContext
@@ -596,7 +596,7 @@ object HMSHelper {
               .receiveEvent(id, "captureFrame", output)
           }
         },
-        Handler()
+        Handler(),
       )
     } catch (e: Exception) {
       Log.e("captureSurfaceView", "error: $e")

package/android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt

@@ -150,6 +150,13 @@ class HMSRNSDK(
     return data
   }
 
+  fun emitHMSMessageSuccess(hmsMessage: HMSMessage): ReadableMap {
+    val data: WritableMap = Arguments.createMap()
+    data.putString("message", hmsMessage.message)
+    data.putString("messageId", hmsMessage.messageId)
+    return data
+  }
+
   fun preview(credentials: ReadableMap) {
     if (previewInProgress) {
       self.emitCustomError("PREVIEW_IS_IN_PROGRESS")
@@ -377,6 +384,7 @@ class HMSRNSDK(
 
                 data.putMap("sender", HMSDecoder.getHmsPeerSubset(message.sender))
                 data.putString("message", message.message)
+                data.putString("messageId", message.messageId)
                 data.putString("type", message.type)
                 data.putString("time", message.serverReceiveTime.toString())
                 data.putString("id", id)
@@ -670,7 +678,7 @@ class HMSRNSDK(
             callback?.reject(error.code.toString(), error.message)
           }
           override fun onSuccess(hmsMessage: HMSMessage) {
-            callback?.resolve(emitHMSSuccess(hmsMessage))
+            callback?.resolve(emitHMSMessageSuccess(hmsMessage))
           }
         },
       )
@@ -702,7 +710,7 @@ class HMSRNSDK(
             callback?.reject(error.code.toString(), error.message)
           }
           override fun onSuccess(hmsMessage: HMSMessage) {
-            callback?.resolve(emitHMSSuccess(hmsMessage))
+            callback?.resolve(emitHMSMessageSuccess(hmsMessage))
           }
         },
       )
@@ -733,7 +741,7 @@ class HMSRNSDK(
               callback?.reject(error.code.toString(), error.message)
             }
             override fun onSuccess(hmsMessage: HMSMessage) {
-              callback?.resolve(emitHMSSuccess(hmsMessage))
+              callback?.resolve(emitHMSMessageSuccess(hmsMessage))
             }
           },
         )

package/android/src/main/java/com/reactnativehmssdk/HMSSDKViewManager.kt

@@ -28,7 +28,7 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
     return MapBuilder.builder<String, Any>()
       .put(
         "topChange",
-        MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onChange"))
+        MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onChange")),
       )
       .build()
   }
@@ -36,7 +36,7 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
     return MapBuilder.of(
       "captureFrame",
-      MapBuilder.of("registrationName", "onDataReturned")
+      MapBuilder.of("registrationName", "onDataReturned"),
     )
   }
 
@@ -64,9 +64,10 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
     val trackId = data.getString("trackId")
     val id = data.getString("id")
     val mirror = data.getBoolean("mirror")
+    val scaleType = data.getString("scaleType")
     val hmsCollection = getHms()
     if (hmsCollection != null) {
-      view.setData(id, trackId, hmsCollection, mirror)
+      view.setData(id, trackId, hmsCollection, mirror, scaleType)
     }
   }
 

package/android/src/main/java/com/reactnativehmssdk/HMSView.kt

@@ -15,57 +15,56 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 import live.hms.video.media.tracks.HMSVideoTrack
 import live.hms.video.utils.HmsUtilities
 import live.hms.videoview.HMSVideoView
+import live.hms.videoview.VideoViewStateChangeListener
 import org.webrtc.RendererCommon
 
 @SuppressLint("ViewConstructor")
 class HMSView(context: ReactContext) : FrameLayout(context) {
-  private var hmsVideoView: HMSVideoView = HMSVideoView(context)
+  private var hmsVideoView: HMSVideoView? = null
   private var videoTrack: HMSVideoTrack? = null
-  private var scaleTypeApplied: Boolean = false
   private var sdkId: String = "12345"
-  private var currentScaleType: RendererCommon.ScalingType =
-    RendererCommon.ScalingType.SCALE_ASPECT_FILL
   private var disableAutoSimulcastLayerSelect = false
+  private var jsCanApplyStyles = false
 
   init {
     val inflater = getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
     val view = inflater.inflate(R.layout.hms_view, this)
 
     hmsVideoView = view.findViewById(R.id.hmsVideoView)
-    hmsVideoView.setEnableHardwareScaler(false)
-    hmsVideoView.setScalingType(currentScaleType)
-    hmsVideoView.setMirror(false)
-    hmsVideoView.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
+    hmsVideoView?.setEnableHardwareScaler(false)
+
+    hmsVideoView?.setMirror(false)
+    hmsVideoView?.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
+
+    hmsVideoView?.addVideoViewStateChangeListener(object : VideoViewStateChangeListener {
+      override fun onResolutionChange(newWidth: Int, newHeight: Int) {
+        super.onResolutionChange(newWidth, newHeight)
+        if (!jsCanApplyStyles) {
+          val event: WritableMap = Arguments.createMap()
+          context.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+          jsCanApplyStyles = true
+        }
+      }
+    })
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
   fun captureHmsView(args: ReadableArray?) {
-    HMSHelper.captureSurfaceView(hmsVideoView, sdkId, args, context, id)
-  }
-
-  private fun onReceiveNativeEvent() {
-    val event: WritableMap = Arguments.createMap()
-    event.putString("message", "MyMessage")
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+    hmsVideoView?.let {
+      HMSHelper.captureSurfaceView(it, sdkId, args, context, id)
+    }
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    hmsVideoView.removeTrack()
+    hmsVideoView?.removeTrack()
   }
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
 
     videoTrack?.let { // Safe Call Operator to check if videoTrack is not null
-      hmsVideoView.addTrack(it) // add the videoTrack to the hmsVideoView
-      if (!scaleTypeApplied) { // check if the scaleTypeApplied flag is false
-        if (currentScaleType != RendererCommon.ScalingType.SCALE_ASPECT_FILL) { // check if the currentScaleType is not SCALE_ASPECT_FILL
-          onReceiveNativeEvent() // call the onReceiveNativeEvent function
-        }
-        scaleTypeApplied = true // set the scaleTypeApplied flag to true
-      }
+      hmsVideoView?.addTrack(it) // add the videoTrack to the hmsVideoView
     } ?: run { // Elvis Operator to handle the case when videoTrack is null
       Log.e(
         "HMSView",
@@ -77,7 +76,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
   fun updateZOrderMediaOverlay(setZOrderMediaOverlay: Boolean?) {
     if (setZOrderMediaOverlay != null && setZOrderMediaOverlay) {
       // hmsVideoView.setZOrderOnTop(true);
-      hmsVideoView.setZOrderMediaOverlay(setZOrderMediaOverlay)
+      hmsVideoView?.setZOrderMediaOverlay(setZOrderMediaOverlay)
     }
   }
 
@@ -85,18 +84,15 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     if (scaleType != null) {
       when (scaleType) {
         "ASPECT_FIT" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FIT
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
           return
         }
         "ASPECT_FILL" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FILL
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
           return
         }
         "ASPECT_BALANCED" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_BALANCED
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
           return
         }
         else -> {
@@ -111,6 +107,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     trackId: String?,
     hmsCollection: MutableMap<String, HMSRNSDK>,
     mirror: Boolean?,
+    scaleType: String?,
   ) {
     if (id != null) {
       sdkId = id
@@ -119,8 +116,9 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
     if (trackId != null && hms != null) {
       if (mirror != null) {
-        hmsVideoView.setMirror(mirror)
+        hmsVideoView?.setMirror(mirror)
       }
+      updateScaleType(scaleType)
       // TODO: can be optimized here
       videoTrack = hms.getRoom()?.let { HmsUtilities.getVideoTrack(trackId, it) }
     }
@@ -128,7 +126,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
   fun updateAutoSimulcast(autoSimulcast: Boolean?) {
     autoSimulcast?.let {
-      hmsVideoView.disableAutoSimulcastLayerSelect(!it)
+      hmsVideoView?.disableAutoSimulcastLayerSelect(!it)
     }
   }
 }