fix(android): properly handle preview aspect ratio

See #64
apivideo · Feb 28, 2024 · e26a9a9 · e26a9a9
1 parent eb17ff9
commit e26a9a9
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 40 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -121,7 +121,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
 
   implementation("video.api:rtmpdroid:1.2.1-packed")
-  implementation("video.api:android-live-stream:1.4.0") {
+  implementation("video.api:android-live-stream:1.4.1") {
     exclude group: 'video.api', module: 'rtmpdroid'
     // exclude the transitive dependency to use packed version to avoid conflict with libssl.so and libcrypto.so
   }

diff --git a/android/src/main/java/video/api/reactnative/livestream/LiveStreamView.kt b/android/src/main/java/video/api/reactnative/livestream/LiveStreamView.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import android.util.Log
 import android.view.ScaleGestureDetector
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.uimanager.ThemedReactContext
 import video.api.livestream.ApiVideoLiveStream
@@ -26,7 +27,7 @@ class LiveStreamView @JvmOverloads constructor(
   attrs: AttributeSet? = null,
   defStyle: Int = 0
 ) : ConstraintLayout(context, attrs, defStyle),
-  Closeable {
+  Closeable, LifecycleEventListener {
   private val liveStream: ApiVideoLiveStream
   private val permissionsManager = SerialPermissionsManager(
     PermissionsManager((context as ThemedReactContext).reactApplicationContext)
@@ -123,50 +124,22 @@ class LiveStreamView @JvmOverloads constructor(
   var videoConfig: VideoConfig?
     get() = liveStream.videoConfig
     set(value) {
-      permissionsManager.requestPermission(
-        Manifest.permission.CAMERA,
-        onGranted = {
-          liveStream.videoConfig = value
-        },
-        onShowPermissionRationale = { onRequiredPermissionLastTime ->
-          runOnUiThread {
-            context.showDialog(
-              R.string.permission_required,
-              R.string.camera_permission_required_message,
-              android.R.string.ok,
-              onPositiveButtonClick = { onRequiredPermissionLastTime() }
-            )
-          }
-        },
-        onDenied = {
-          Log.e(TAG, "Missing permissions Manifest.permission.CAMERA")
-          onPermissionsDenied?.let { it(listOf(Manifest.permission.CAMERA)) }
-        })
+      /**
+       * Camera permission is required when `startPreview` is called internally. The permission
+       * request goes through the `permissionRequester` callback.
+       */
+      liveStream.videoConfig = value
     }
 
 
   var audioConfig: AudioConfig?
     get() = liveStream.audioConfig
     set(value) {
-      permissionsManager.requestPermission(
-        Manifest.permission.RECORD_AUDIO,
-        onGranted = {
-          liveStream.audioConfig = value
-        },
-        onShowPermissionRationale = { onRequiredPermissionLastTime ->
-          runOnUiThread {
-            context.showDialog(
-              R.string.permission_required,
-              R.string.record_audio_permission_required_message,
-              android.R.string.ok,
-              onPositiveButtonClick = { onRequiredPermissionLastTime() }
-            )
-          }
-        },
-        onDenied = {
-          Log.e(TAG, "Missing permissions Manifest.permission.RECORD_AUDIO")
-          onPermissionsDenied?.let { it(listOf(Manifest.permission.RECORD_AUDIO)) }
-        })
+      /**
+       * Record audio permission is required when `configure` is called internally. The permission
+       * request goes through the `permissionRequester` callback.
+       */
+      liveStream.audioConfig = value
     }
 
   val isStreaming: Boolean
@@ -252,4 +225,33 @@ class LiveStreamView @JvmOverloads constructor(
   companion object {
     private const val TAG = "RNLiveStreamView"
   }
+
+  /**
+   * If you request a permission here, it will loop indefinitely between [onHostPause] and
+   * [onHostResume].
+   */
+  override fun onHostResume() {
+    /**
+     * Only start preview if the app has the required permissions.
+     */
+    if (permissionsManager.hasPermission(Manifest.permission.CAMERA)) {
+      liveStream.startPreview()
+    }
+    /**
+     * Workaround to reapply audio config in case it was not applied when the app started (due to
+     * missing RECORD_AUDIO permissions).
+     */
+    if (permissionsManager.hasPermission(Manifest.permission.RECORD_AUDIO)) {
+      liveStream.audioConfig = liveStream.audioConfig
+    }
+  }
+
+  override fun onHostPause() {
+    liveStream.stopStreaming()
+    liveStream.stopPreview()
+  }
+
+  override fun onHostDestroy() {
+    liveStream.release()
+  }
 }
diff --git a/android/src/main/java/video/api/reactnative/livestream/LiveStreamViewManager.kt b/android/src/main/java/video/api/reactnative/livestream/LiveStreamViewManager.kt
@@ -21,6 +21,7 @@ class LiveStreamViewManager : LiveStreamViewManagerSpec<LiveStreamView>() {
 
   override fun createViewInstance(reactContext: ThemedReactContext): LiveStreamView {
     val view = LiveStreamView(reactContext)
+    reactContext.addLifecycleEventListener(view)
     view.onConnectionSuccess = {
       UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)?.dispatchEvent(
         OnConnectionSuccessEvent(view.id)