expo-libvlc-player 7.0.34 → 7.0.36

package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerModule.kt

@@ -60,7 +60,6 @@ class LibVlcPlayerModule : Module() {
             }
 
             OnActivityEntersBackground {
-                MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                 MediaPlayerManager.onModuleBackground()
             }
 

package/android/src/main/java/expo/modules/libvlcplayer/managers/KeepAwakeManager.kt

@@ -17,7 +17,7 @@ class KeepAwakeManager(
                 view.mediaPlayer?.isPlaying() == true
             }
 
-    fun activateKeepAwake() {
+    private fun activateKeepAwake() {
         activity.let { activity ->
             activity.runOnUiThread {
                 activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -25,7 +25,7 @@ class KeepAwakeManager(
         }
     }
 
-    fun deactivateKeepAwake() {
+    private fun deactivateKeepAwake() {
         activity.let { activity ->
             activity.runOnUiThread {
                 activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

package/android/src/main/java/expo/modules/libvlcplayer/managers/PictureInPictureManager.kt

@@ -115,11 +115,7 @@ class PictureInPictureManager(
 
                             when (controlType) {
                                 MediaPlayerConstants.EXTRA_CONTROL_REWIND -> {
-                                    val time = player.getTime()
-
-                                    if (time != -1L) {
-                                        player.setTime(time - MediaPlayerConstants.SEEK_STEP_MS)
-                                    }
+                                    player.setTime(player.getTime() - MediaPlayerConstants.SEEK_STEP_MS)
                                 }
 
                                 MediaPlayerConstants.EXTRA_CONTROL_PLAY -> {
@@ -131,11 +127,7 @@ class PictureInPictureManager(
                                 }
 
                                 MediaPlayerConstants.EXTRA_CONTROL_FORWARD -> {
-                                    val time = player.getTime()
-
-                                    if (time != -1L) {
-                                        player.setTime(time + MediaPlayerConstants.SEEK_STEP_MS)
-                                    }
+                                    player.setTime(player.getTime() + MediaPlayerConstants.SEEK_STEP_MS)
                                 }
                             }
                         }
@@ -284,9 +276,6 @@ class PictureInPictureManager(
 
         pipView?.let { view ->
             // Black screen workaround
-            view.detachPlayerLayout()
-            view.attachPlayerLayout(pictureLayout)
-
             view.detachPlayerLayout()
             view.post { view.attachPlayerLayout(pictureLayout) }
         }

package/ios/Constants/MediaPlayerConstants.swift

@@ -5,7 +5,6 @@ enum MediaPlayerConstants {
     static let minPlayerVolume: Int = 0
     static let maxPlayerVolume: Int = 100
 
-    static let resetDelayMs: Double = 1_000.0
     static let expDelayMultiplier: Double = 1.5
     static let retryDelayMs: Double = 300.0
     static let maxRetryCount: Int = 3

package/ios/LibVlcPlayerModule.swift

@@ -41,7 +41,6 @@ public class LibVlcPlayerModule: Module {
         }
 
         OnAppEntersBackground {
-            MediaPlayerManager.shared.keepAwakeManager.deactivateKeepAwake()
             MediaPlayerManager.shared.onModuleBackground()
         }
 

package/ios/Managers/AudioSessionManager.swift

@@ -51,10 +51,12 @@ class AudioSessionManager {
             }
         }
 
-        do {
-            try audioSession.setActive(anyPlayingView || doNotMixOverride)
-        } catch {
-            log.warn("Failed to set the audio session")
+        if anyPlayingView || doNotMixOverride {
+            do {
+                try audioSession.setActive(true)
+            } catch {
+                log.warn("Failed to set the audio session")
+            }
         }
     }
 

package/ios/Managers/KeepAwakeManager.swift

@@ -3,13 +3,13 @@ class KeepAwakeManager {
 
     private lazy var expoViews = MediaPlayerManager.shared.expoViews
 
-    func activateKeepAwake() {
+    private func activateKeepAwake() {
         DispatchQueue.main.async {
             UIApplication.shared.isIdleTimerDisabled = true
         }
     }
 
-    func deactivateKeepAwake() {
+    private func deactivateKeepAwake() {
         DispatchQueue.main.async {
             UIApplication.shared.isIdleTimerDisabled = false
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "7.0.34",
+  "version": "7.0.36",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",