expo-libvlc-player 3.4.19 → 3.4.20

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.libvlcplayer'
-version = '3.4.19'
+version = '3.4.20'
 
 def expoModulesCorePlugin = new File(project(':expo-modules-core').projectDir.absolutePath, 'ExpoModulesCorePlugin.gradle')
 apply from: expoModulesCorePlugin
@@ -25,7 +25,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 35)
 
         versionCode 1
-        versionName '3.4.19'
+        versionName '3.4.20'
 
         consumerProguardFiles('proguard-rules.pro')
     }

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

@@ -47,8 +47,8 @@ class LibVlcPlayerView(
     appContext: AppContext,
 ) : ExpoView(context, appContext) {
     private val playerView: VLCVideoLayout =
-        VLCVideoLayout(context).also {
-            addView(it)
+        VLCVideoLayout(context).also { textureView ->
+            addView(textureView)
         }
 
     var libVLC: LibVLC? = null
@@ -682,9 +682,9 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
 }
 
 fun LibVlcPlayerView.setDialogCallbacks() {
-    libVLC?.let {
+    libVLC?.let { ILibVLC ->
         VLCDialog.setCallbacks(
-            it,
+            ILibVLC,
             object : VLCDialog.Callbacks {
                 override fun onDisplay(dialog: VLCDialog.ErrorMessage) {
                     vlcDialog = dialog
@@ -743,7 +743,7 @@ private fun MutableList<String>.hasStartPausedOption(): Boolean {
             ":start-paused",
         )
 
-    return any { it in options }
+    return any { option -> option in options }
 }
 
 private fun MutableList<String>.toggleStartPausedOption(autoplay: Boolean) {
@@ -754,7 +754,7 @@ private fun MutableList<String>.toggleStartPausedOption(autoplay: Boolean) {
             ":start-paused",
         )
 
-    removeAll { it in options }
+    removeAll { option -> option in options }
 
     if (!autoplay) {
         add("--start-paused")

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

@@ -28,8 +28,8 @@ class AudioFocusManager(
 
     private val anyPlayerRequiresFocus: Boolean
         get() =
-            MediaPlayerManager.playerViews.toList().any { view ->
-                playerRequiresFocus(view.get()?.mediaPlayer)
+            MediaPlayerManager.playerViews.any { view ->
+                playerRequiresFocus(view.mediaPlayer)
             }
 
     var currentMixingMode: AudioMixingMode = AudioMixingMode.AUTO
@@ -46,20 +46,16 @@ class AudioFocusManager(
 
     private fun findAudioMixingMode(): AudioMixingMode {
         val mixingModes =
-            MediaPlayerManager.playerViews.toList().mapNotNull { playerView ->
-                playerView
-                    .get()
-                    ?.takeIf { view ->
-                        view.mediaPlayer?.isPlaying() == true
-                    }?.audioMixingMode
-            }
+            MediaPlayerManager.playerViews
+                .filter { view -> view.mediaPlayer?.isPlaying() == true }
+                .map { view -> view.audioMixingMode }
 
         if (mixingModes.isEmpty()) {
             return AudioMixingMode.AUTO
         }
 
         return mixingModes.reduce { currentAudioMixingMode, next ->
-            next.takeIf { it.priority > currentAudioMixingMode.priority } ?: currentAudioMixingMode
+            next.takeIf { nextAudioMixingMode -> nextAudioMixingMode.priority > currentAudioMixingMode.priority } ?: currentAudioMixingMode
         }
     }
 
@@ -81,8 +77,8 @@ class AudioFocusManager(
             }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            currentFocusRequest?.let {
-                if (it.focusGain == audioFocusType) {
+            currentFocusRequest?.let { focusRequest ->
+                if (focusRequest.focusGain == audioFocusType) {
                     return
                 }
             }
@@ -110,9 +106,9 @@ class AudioFocusManager(
     }
 
     private fun abandonAudioFocus() {
-        currentFocusRequest?.let {
+        currentFocusRequest?.let { focusRequest ->
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                audioManager.abandonAudioFocusRequest(it)
+                audioManager.abandonAudioFocusRequest(focusRequest)
             } else {
                 @Suppress("DEPRECATION")
                 audioManager.abandonAudioFocus(this)
@@ -159,7 +155,7 @@ class AudioFocusManager(
             AudioManager.AUDIOFOCUS_LOSS -> {
                 appContext.mainQueue.launch {
                     MediaPlayerManager.playerViews.forEach { view ->
-                        pausePlayerIfUnmuted(view.get()?.mediaPlayer)
+                        pausePlayerIfUnmuted(view.mediaPlayer)
                     }
 
                     currentFocusRequest = null
@@ -175,7 +171,7 @@ class AudioFocusManager(
 
                 appContext.mainQueue.launch {
                     MediaPlayerManager.playerViews.forEach { view ->
-                        pausePlayerIfUnmuted(view.get()?.mediaPlayer)
+                        pausePlayerIfUnmuted(view.mediaPlayer)
                     }
 
                     currentFocusRequest = null
@@ -187,12 +183,10 @@ class AudioFocusManager(
 
                 appContext.mainQueue.launch {
                     MediaPlayerManager.playerViews.forEach { view ->
-                        view.get()?.mediaPlayer?.let { player ->
-                            if (audioMixingMode == AudioMixingMode.DO_NOT_MIX) {
-                                pausePlayerIfUnmuted(player)
-                            } else {
-                                duckPlayer(player)
-                            }
+                        if (audioMixingMode == AudioMixingMode.DO_NOT_MIX) {
+                            pausePlayerIfUnmuted(view.mediaPlayer)
+                        } else {
+                            duckPlayer(view.mediaPlayer)
                         }
                     }
                 }
@@ -201,7 +195,7 @@ class AudioFocusManager(
             AudioManager.AUDIOFOCUS_GAIN -> {
                 appContext.mainQueue.launch {
                     MediaPlayerManager.playerViews.forEach { view ->
-                        unduckPlayer(view.get()?.mediaPlayer)
+                        unduckPlayer(view.mediaPlayer)
                     }
                 }
             }

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

@@ -12,17 +12,17 @@ class KeepAwakeManager(
         get() = appContext?.currentActivity ?: throw CurrentActivityNotFoundException()
 
     fun activateKeepAwake() {
-        currentActivity.let {
-            it.runOnUiThread {
-                it.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        currentActivity.let { activity ->
+            activity.runOnUiThread {
+                activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
             }
         }
     }
 
     fun deactivateKeepAwake() {
-        currentActivity.let {
-            it.runOnUiThread {
-                it.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        currentActivity.let { activity ->
+            activity.runOnUiThread {
+                activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
             }
         }
     }

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

@@ -2,20 +2,21 @@ package expo.modules.libvlcplayer.managers
 
 import expo.modules.kotlin.AppContext
 import expo.modules.libvlcplayer.LibVlcPlayerView
-import java.lang.ref.WeakReference
+import java.util.Collections
+import java.util.WeakHashMap
 
 object MediaPlayerManager {
     lateinit var audioFocusManager: AudioFocusManager
     lateinit var keepAwakeManager: KeepAwakeManager
 
-    val playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
+    val playerViews: MutableSet<LibVlcPlayerView> = Collections.newSetFromMap(WeakHashMap())
 
     fun registerPlayerView(view: LibVlcPlayerView) {
-        playerViews.find { it.get() == view } ?: run { playerViews.add(WeakReference(view)) }
+        playerViews.add(view)
     }
 
     fun unregisterPlayerView(view: LibVlcPlayerView) {
-        playerViews.removeAll { it.get() == view }
+        playerViews.remove(view)
     }
 
     fun onModuleCreate(appContext: AppContext) {
@@ -29,32 +30,26 @@ object MediaPlayerManager {
     }
 
     fun onModuleDestroy() {
-        playerViews.forEach { playerView ->
-            playerView.get()?.let { view ->
-                view.destroyPlayer()
-            }
+        playerViews.forEach { view ->
+            view.destroyPlayer()
         }
     }
 
     fun onModuleForeground() {
-        playerViews.forEach { playerView ->
-            playerView.get()?.let { view ->
-                view.onForeground(Unit)
-            }
+        playerViews.forEach { view ->
+            view.onForeground(Unit)
         }
     }
 
     fun onModuleBackground() {
-        playerViews.forEach { playerView ->
-            playerView.get()?.let { view ->
-                view.onBackground(Unit)
+        playerViews.forEach { view ->
+            view.onBackground(Unit)
 
-                view.mediaPlayer?.let { player ->
-                    val shouldPause = !view.playInBackground && player.isPlaying()
+            view.mediaPlayer?.let { player ->
+                val shouldPause = !view.playInBackground && player.isPlaying()
 
-                    if (shouldPause) {
-                        player.pause()
-                    }
+                if (shouldPause) {
+                    player.pause()
                 }
             }
         }

package/ios/Managers/LocalNetworkManager.swift

@@ -1,14 +1,14 @@
 class LocalNetworkManager {
     static let shared = LocalNetworkManager()
 
-    /// Attempts to trigger the local network privacy alert.
-    ///
-    /// This builds a list of link-local IPv6 addresses and then creates a connected
-    /// UDP socket to each in turn.  Connecting a UDP socket triggers the local
-    /// network alert without actually sending any traffic.
-    ///
-    /// This is a ‘best effort’ approach, and it handles errors by ignoring them.
-    /// There’s no guarantee that it’ll actually trigger the alert (FB8711182).
+    // Attempts to trigger the local network privacy alert.
+    //
+    // This builds a list of link-local IPv6 addresses and then creates a connected
+    // UDP socket to each in turn.  Connecting a UDP socket triggers the local
+    // network alert without actually sending any traffic.
+    //
+    // This is a ‘best effort’ approach, and it handles errors by ignoring them.
+    // There’s no guarantee that it’ll actually trigger the alert (FB8711182).
 
     func triggerNetworkAlert() {
         let addresses = selectedLinkLocalIPv6Addresses()
@@ -25,20 +25,20 @@ class LocalNetworkManager {
         }
     }
 
-    /// Returns a selection of IPv6 addresses to connect to.
-    ///
-    /// To build this list it:
-    ///
-    /// 1. Finds the IPv6 address of every broadcast-capable interface.
-    ///
-    /// 2. Filters out all the ones that aren’t link-local.
-    ///
-    /// 3. Sets the port number to port 9, that is, the discard service.  Even
-    ///    though the caller won’t actually send any traffic, this ensures that it
-    ///    would be discarded if it were sent.
-    ///
-    /// 4. Creates two copies of each address, and replaces the host part with a
-    ///    random number.
+    // Returns a selection of IPv6 addresses to connect to.
+    //
+    // To build this list it:
+    //
+    // 1. Finds the IPv6 address of every broadcast-capable interface.
+    //
+    // 2. Filters out all the ones that aren’t link-local.
+    //
+    // 3. Sets the port number to port 9, that is, the discard service.  Even
+    //    though the caller won’t actually send any traffic, this ensures that it
+    //    would be discarded if it were sent.
+    //
+    // 4. Creates two copies of each address, and replaces the host part with a
+    //    random number.
 
     private func selectedLinkLocalIPv6Addresses() -> [sockaddr_in6] {
         let r1 = (0 ..< 8).map { _ in UInt8.random(in: 0 ... 255) }
@@ -50,13 +50,13 @@ class LocalNetworkManager {
             .joined())
     }
 
-    /// Replaces the host part of an IPv6 link-local address with the supplied
-    /// value.
-    ///
-    /// In this context, _host part_ refers to the bottom 64-bits of the address,
-    /// that is, the `interface ID` as defined in Section 2.5.6 of [RFC
-    /// 4291](https://tools.ietf.org/html/rfc4291)).  Thus, the host part parameter
-    /// must be exactly 8 bytes.
+    // Replaces the host part of an IPv6 link-local address with the supplied
+    // value.
+    //
+    // In this context, _host part_ refers to the bottom 64-bits of the address,
+    // that is, the `interface ID` as defined in Section 2.5.6 of [RFC
+    // 4291](https://tools.ietf.org/html/rfc4291)).  Thus, the host part parameter
+    // must be exactly 8 bytes.
 
     private func setIPv6LinkLocalAddressHostPart(of address: sockaddr_in6, to hostPart: [UInt8]) -> sockaddr_in6 {
         precondition(hostPart.count == 8)
@@ -67,16 +67,16 @@ class LocalNetworkManager {
         return result
     }
 
-    /// Returns whether the supplied IPv6 address is link-local.
-    ///
-    /// Link-local address have the fe:c0/10 prefix.
+    // Returns whether the supplied IPv6 address is link-local.
+    //
+    // Link-local address have the fe:c0/10 prefix.
 
     private func isIPv6AddressLinkLocal(_ address: sockaddr_in6) -> Bool {
         address.sin6_addr.__u6_addr.__u6_addr8.0 == 0xFE
             && (address.sin6_addr.__u6_addr.__u6_addr8.1 & 0xC0) == 0x80
     }
 
-    /// Returns the IPv6 address of every broadcast-capable interface.
+    // Returns the IPv6 address of every broadcast-capable interface.
 
     private func ipv6AddressesOfBroadcastCapableInterfaces() -> [sockaddr_in6] {
         var addrList: UnsafeMutablePointer<ifaddrs>?

package/package.json

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