@jwplayer/jwplayer-react-native 1.2.0 → 1.3.1

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

@@ -2,21 +2,13 @@ package com.jwplayer.rnjwplayer;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.ads.interactivemedia.v3.api.FriendlyObstruction;
-import com.google.ads.interactivemedia.v3.api.ImaSdkFactory;
-import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
 import com.jwplayer.pub.api.configuration.ads.AdRules;
 import com.jwplayer.pub.api.configuration.ads.AdvertisingConfig;
 import com.jwplayer.pub.api.configuration.ads.VastAdvertisingConfig;
-import com.jwplayer.pub.api.configuration.ads.dai.ImaDaiAdvertisingConfig;
-import com.jwplayer.pub.api.configuration.ads.ima.ImaAdvertisingConfig;
 import com.jwplayer.pub.api.media.ads.AdBreak;
-import com.jwplayer.pub.api.media.ads.dai.ImaDaiSettings;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 public class RNJWPlayerAds {
@@ -27,103 +19,43 @@ public class RNJWPlayerAds {
             return null;
         }
 
-        String adClientType = ads.getString("adClient");
+        // Check both "client" (JWPlayer JSON format) and "adClient" (RN wrapper format)
+        String adClientType = null;
+        if (ads.hasKey("adClient")) {
+            adClientType = ads.getString("adClient");
+        } else if (ads.hasKey("client")) {
+            adClientType = ads.getString("client");
+        }
+        
+        // Validate client type exists and is not null
+        if (adClientType == null) {
+            throw new IllegalArgumentException("Missing required 'adClient' or 'client' field in advertising config");
+        }
+        
+        // Normalize to lowercase for case-insensitive matching
+        adClientType = adClientType.toLowerCase();
+
         switch (adClientType) {
             case "ima":
-                try {
-                    return configureImaAdvertising(ads);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+            case "googima":  // Support legacy "googima" format
             case "ima_dai":
+                // Delegate to ImaHelper (implementation selected by Gradle)
+                // Note: Only parse adSchedule for regular IMA, not for DAI (ads are embedded in stream)
+                List<AdBreak> adSchedule = ("ima".equals(adClientType) || "googima".equals(adClientType)) 
+                    ? getAdSchedule(ads) 
+                    : new ArrayList<>();
                 try {
-                    return configureImaDaiAdvertising(ads);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    return ImaHelper.configureImaOrDai(ads, adSchedule);
+                } catch (RuntimeException e) {
+                    // IMA not enabled - log error and return null (graceful degradation)
+                    android.util.Log.e("RNJWPlayerAds", "Failed to configure IMA ads: " + e.getMessage());
+                    return null;
                 }
             default: // Defaulting to VAST
                 return configureVastAdvertising(ads);
         }
     }
 
-    // Configure IMA Advertising
-    private static ImaAdvertisingConfig configureImaAdvertising(ReadableMap ads) throws Exception {
-        if (!BuildConfig.USE_IMA) {
-            throw new Exception("Error: Google ads services is not installed. Add RNJWPlayerUseGoogleIMA = true to your app/build.gradle ext {}");
-        }
-
-        ImaAdvertisingConfig.Builder builder = new ImaAdvertisingConfig.Builder();
-
-        List<AdBreak> adScheduleList = getAdSchedule(ads);
-        builder.schedule(adScheduleList);
-
-        if (ads.hasKey("imaSettings")) {
-            builder.imaSdkSettings(getImaSettings(Objects.requireNonNull(ads.getMap("imaSettings"))));
-        }
-
-        // companionSlots
-
-        return builder.build();
-    }
-
-    // Configure IMA DAI Advertising
-    private static ImaDaiAdvertisingConfig configureImaDaiAdvertising(ReadableMap ads) throws Exception {
-        if (!BuildConfig.USE_IMA) {
-            throw new Exception("Error: Google ads services is not installed. Add RNJWPlayerUseGoogleIMA = true to your app/build.gradle ext {}");
-        }
-
-        ImaDaiAdvertisingConfig.Builder builder = new ImaDaiAdvertisingConfig.Builder();
-
-        if (ads.hasKey("imaSettings")) {
-            builder.imaSdkSettings(getImaSettings(Objects.requireNonNull(ads.getMap("imaSettings"))));
-        }
-
-        if (ads.hasKey("imaDaiSettings")) {
-            builder.imaDaiSettings(getImaDaiSettings(Objects.requireNonNull(ads.getMap("imaDaiSettings"))));
-        }
-
-        return builder.build();
-    }
-
-    // You'll need to implement this method based on how you pass ImaDaiSettings from React Native
-    private static ImaDaiSettings getImaDaiSettings(ReadableMap imaDaiSettingsMap) {
-        String videoId = imaDaiSettingsMap.hasKey("videoId") ? imaDaiSettingsMap.getString("videoId") : null;
-        String cmsId = imaDaiSettingsMap.hasKey("cmsId") ? imaDaiSettingsMap.getString("cmsId") : null;
-        String assetKey = imaDaiSettingsMap.hasKey("assetKey") ? imaDaiSettingsMap.getString("assetKey") : null;
-        String apiKey = imaDaiSettingsMap.hasKey("apiKey") ? imaDaiSettingsMap.getString("apiKey") : null;
-
-        // Extracting adTagParameters from imaDaiSettingsMap if present
-        Map<String, String> adTagParameters = null;
-        if (imaDaiSettingsMap.hasKey("adTagParameters") && imaDaiSettingsMap.getMap("adTagParameters") != null) {
-            adTagParameters = new HashMap<>();
-            ReadableMap adTagParamsMap = imaDaiSettingsMap.getMap("adTagParameters");
-            for (Map.Entry<String, Object> entry : adTagParamsMap.toHashMap().entrySet()) {
-                if (entry.getValue() instanceof String) {
-                    adTagParameters.put(entry.getKey(), (String) entry.getValue());
-                }
-            }
-        }
-
-        // Handling streamType
-        ImaDaiSettings.StreamType streamType = ImaDaiSettings.StreamType.HLS; // Default to HLS
-        if (imaDaiSettingsMap.hasKey("streamType")) {
-            String streamTypeStr = imaDaiSettingsMap.getString("streamType");
-            if ("DASH".equalsIgnoreCase(streamTypeStr)) {
-                streamType = ImaDaiSettings.StreamType.DASH;
-            }
-        }
-        // Create ImaDaiSettings based on the provided values
-        ImaDaiSettings imaDaiSettings = (assetKey != null) ?
-                new ImaDaiSettings(assetKey, streamType, apiKey) :
-                new ImaDaiSettings(videoId, cmsId, streamType, apiKey);
-
-        if (adTagParameters != null) {
-            imaDaiSettings.setAdTagParameters(adTagParameters);
-        }
-
-        return imaDaiSettings;
-    }
-
     // Configure VAST Advertising
     private static VastAdvertisingConfig configureVastAdvertising(ReadableMap ads) {
         VastAdvertisingConfig.Builder builder = new VastAdvertisingConfig.Builder();
@@ -154,9 +86,23 @@ public class RNJWPlayerAds {
 
     private static List<AdBreak> getAdSchedule(ReadableMap ads) {
         List<AdBreak> adScheduleList = new ArrayList<>();
+        
+        // Check if adSchedule exists
+        if (!ads.hasKey("adSchedule")) {
+            return adScheduleList; // Return empty list
+        }
+        
         ReadableArray adSchedule = ads.getArray("adSchedule");
+        if (adSchedule == null) {
+            return adScheduleList; // Return empty list if null
+        }
+        
         for (int i = 0; i < adSchedule.size(); i++) {
             ReadableMap adBreakProp = adSchedule.getMap(i);
+            // Skip null entries in the adSchedule array
+            if (adBreakProp == null) {
+                continue;
+            }
             String offset = adBreakProp.hasKey("offset") ? adBreakProp.getString("offset") : "pre";
             if (adBreakProp.hasKey("tag")) {
                 AdBreak adBreak = new AdBreak.Builder()
@@ -202,38 +148,4 @@ public class RNJWPlayerAds {
         return AdRules.RULES_START_ON_SEEK_NONE;
     }
 
-//    public static List<FriendlyObstruction> getFriendlyObstructions(ReadableArray obstructionsArray) {
-//        List<FriendlyObstruction> obstructions = new ArrayList<>();
-//        // Example: Parse and create FriendlyObstruction objects from obstructionsArray
-//        return obstructions;
-//    }
-
-    public static ImaSdkSettings getImaSettings(ReadableMap imaSettingsMap) {
-        ImaSdkSettings settings = ImaSdkFactory.getInstance().createImaSdkSettings();
-
-        if (imaSettingsMap.hasKey("maxRedirects")) {
-            settings.setMaxRedirects(imaSettingsMap.getInt("maxRedirects"));
-        }
-        if (imaSettingsMap.hasKey("language")) {
-            settings.setLanguage(imaSettingsMap.getString("language"));
-        }
-        if (imaSettingsMap.hasKey("ppid")) {
-            settings.setPpid(imaSettingsMap.getString("ppid"));
-        }
-        if (imaSettingsMap.hasKey("playerType")) {
-            settings.setPlayerType(imaSettingsMap.getString("playerType"));
-        }
-        if (imaSettingsMap.hasKey("playerVersion")) {
-            settings.setPlayerVersion(imaSettingsMap.getString("playerVersion"));
-        }
-        if (imaSettingsMap.hasKey("sessionId")) {
-            settings.setSessionId(imaSettingsMap.getString("sessionId"));
-        }
-        if (imaSettingsMap.hasKey("debugMode")) {
-            settings.setDebugMode(imaSettingsMap.getBoolean("debugMode"));
-        }
-        // Add other settings as needed
-
-        return settings;
-    }
 }

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

@@ -434,12 +434,27 @@ public class RNJWPlayerModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     /**
-     * Stub method for recreatePlayerWithConfig - this method is iOS only
-     * On Android, create a new player instance with the new configuration instead
+     * Reconfigures or recreates the player with a new configuration.
+     * 
+     * This method intelligently determines whether to:
+     * 1. Reconfigure the existing player (preferred, ~90% of cases)
+     * 2. Recreate the player (only when necessary, e.g., license changes)
+     * 
+     * Note: Despite the name "recreate", this method usually does NOT recreate the player.
+     * It follows the JWPlayer SDK's design intent of reusing player instances via setup() calls.
+     * 
+     * This provides API parity with iOS while being more efficient on Android.
      */
     public void recreatePlayerWithConfig(final int reactTag, final ReadableMap config) {
-        // No-op on Android - this method is iOS only
-        Log.w("RNJWPlayer", "recreatePlayerWithConfig is not supported on Android. Create a new player instance with the new configuration instead.");
+        new Handler(Looper.getMainLooper()).post(() -> {
+            RNJWPlayerView playerView = getPlayerView(reactTag);
+            if (playerView != null) {
+                // Delegate to setConfig() which intelligently handles reconfiguration vs recreation
+                playerView.setConfig(config);
+            } else {
+                Log.e("RNJWPlayer", "recreatePlayerWithConfig: Player view not found for tag " + reactTag);
+            }
+        });
     }
 
     private int stateToInt(PlayerState playerState) {