@jwplayer/jwplayer-react-native 1.3.1 → 1.3.4

package/RNJWPlayer.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "15.0"
   s.source       = { :git => "https://github.com/jwplayer/jwplayer-react-native.git", :tag => "v#{s.version}" }
   s.source_files  = "ios/RNJWPlayer/*.{h,m,swift}"
-  s.dependency   'JWPlayerKit', '4.25.0'
+  s.dependency   'JWPlayerKit', '4.25.1'
   s.dependency   'React-Core'
   s.static_framework = true
   s.info_plist = {

package/android/src/ima/java/com/jwplayer/rnjwplayer/ImaHelper.java

@@ -21,7 +21,6 @@ import java.util.Objects;
 public class ImaHelper {
     
     public static AdvertisingConfig configureImaOrDai(ReadableMap ads, List<AdBreak> adSchedule) {
-        cd /Users/jmilham/source/sdk/react/jwplayer-react-native/Example && yarn remove @jwplayer/jwplayer-react-native && yarn add file:../ 2>&1 | tail -20        // Check both "client" (JWPlayer JSON format) and "adClient" (RN wrapper format)
         String adClientType = null;
         if (ads.hasKey("adClient")) {
             adClientType = ads.getString("adClient");

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerView.java

@@ -243,6 +243,9 @@ public class RNJWPlayerView extends RelativeLayout implements
     // Add completion handler field
     PlaylistItemDecision itemUpdatePromise = null;
 
+    // Flag to prevent race conditions during player destruction
+    private volatile boolean isDestroying = false;
+
     private void doBindService() {
         if (mMediaServiceController != null) {
             if (!isBackgroundAudioServiceRunning()) {
@@ -380,7 +383,22 @@ public class RNJWPlayerView extends RelativeLayout implements
     // }
 
     public void destroyPlayer() {
-        if (mPlayer != null) {
+        if (mPlayer != null && !isDestroying) {
+            isDestroying = true;
+            
+            // Disable touch events immediately to prevent race conditions
+            if (mPlayerView != null) {
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                mainHandler.post(() -> {
+                    if (mPlayerView != null) {
+                        mPlayerView.setClickable(false);
+                        mPlayerView.setFocusable(false);
+                        mPlayerView.setEnabled(false);
+                        mPlayerView.setOnTouchListener(null);
+                    }
+                });
+            }
+            
             unRegisterReceiver();
 
             // If we are casting we need to break the cast session as there is no simple
@@ -480,6 +498,8 @@ public class RNJWPlayerView extends RelativeLayout implements
             audioManager = null;
 
             doUnbindService();
+            
+            isDestroying = false; // Reset flag for potential reuse
         }
     }
 

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerViewManager.java

@@ -1,5 +1,7 @@
 package com.jwplayer.rnjwplayer;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
@@ -43,7 +45,14 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
     if (view == null || view.mPlayerView == null) {
       return;
     }
-    view.mPlayerView.getPlayer().setControls(controls);
+    // Add null check for getPlayer() to prevent crashes
+    try {
+      if (view.mPlayerView.getPlayer() != null) {
+        view.mPlayerView.getPlayer().setControls(controls);
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "Error setting controls: " + e.getMessage());
+    }
   }
 
   /**
@@ -58,8 +67,15 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
     if (view == null || view.mPlayerView == null) {
       return;
     }
-    view.mPlayerView.getPlayer().stop();
-    view.setConfig(config);
+    // Add null check for getPlayer() to prevent crashes
+    try {
+      if (view.mPlayerView.getPlayer() != null) {
+        view.mPlayerView.getPlayer().stop();
+      }
+      view.setConfig(config);
+    } catch (Exception e) {
+      Log.w(TAG, "Error recreating player: " + e.getMessage());
+    }
   }
 
   public Map getExportedCustomBubblingEventTypeConstants() {

package/badges/version.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.3.1"><title>version: 1.3.1</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.3.1</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.3.1</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.3.4"><title>version: 1.3.4</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.3.4</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.3.4</text></g></svg>

package/ios/RNJWPlayer/RNJWPlayerView.swift

@@ -1255,10 +1255,16 @@ class RNJWPlayerView: UIView, JWPlayerDelegate, JWPlayerStateDelegate,
     }
 
     func dismissPlayerViewController() {
-        if (playerViewController != nil) {
-            playerViewController.player.pause() // hack for stop not always stopping on unmount
-            playerViewController.player.stop()
-            playerViewController.enableLockScreenControls = false
+        guard playerViewController != nil else { return }
+        
+        // Ensure UI operations happen on main thread to prevent crashes
+        // when deinit is called from a background thread during unmount
+        let cleanup = { [self] in
+            guard let pvc = self.playerViewController else { return }
+            
+            pvc.player.pause() // hack for stop not always stopping on unmount
+            pvc.player.stop()
+            pvc.enableLockScreenControls = false
 
             // hack for stop not always stopping on unmount
             let configBuilder:JWPlayerConfigurationBuilder! = JWPlayerConfigurationBuilder()
@@ -1266,19 +1272,24 @@ class RNJWPlayerView: UIView, JWPlayerDelegate, JWPlayerStateDelegate,
             
             do {
                 let configuration: JWPlayerConfiguration = try configBuilder.build()
-                playerViewController.player.configurePlayer(with: configuration)
+                pvc.player.configurePlayer(with: configuration)
             } catch {
                 print(error)
             }
             
-
-            playerViewController.parentView = nil
-            playerViewController.setVisibility(.hidden, for:[.pictureInPictureButton])
-            playerViewController.view.removeFromSuperview()
-            playerViewController.removeFromParent()
-            playerViewController.willMove(toParent: nil)
-            playerViewController.removeDelegates()
-            playerViewController = nil
+            pvc.parentView = nil
+            pvc.setVisibility(.hidden, for:[.pictureInPictureButton])
+            pvc.view.removeFromSuperview()
+            pvc.removeFromParent()
+            pvc.willMove(toParent: nil)
+            pvc.removeDelegates()
+            self.playerViewController = nil
+        }
+        
+        if Thread.isMainThread {
+            cleanup()
+        } else {
+            DispatchQueue.main.sync(execute: cleanup)
         }
     }
 
@@ -1330,10 +1341,21 @@ class RNJWPlayerView: UIView, JWPlayerDelegate, JWPlayerStateDelegate,
     }
 
     func removePlayerView() {
-        if (playerView != nil) {
-            playerView.player.stop()
-            playerView.removeFromSuperview()
-            playerView = nil
+        guard playerView != nil else { return }
+        
+        // Ensure UI operations happen on main thread to prevent crashes
+        // when deinit is called from a background thread during unmount
+        let cleanup = { [self] in
+            guard let pv = self.playerView else { return }
+            pv.player.stop()
+            pv.removeFromSuperview()
+            self.playerView = nil
+        }
+        
+        if Thread.isMainThread {
+            cleanup()
+        } else {
+            DispatchQueue.main.sync(execute: cleanup)
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwplayer/jwplayer-react-native",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",