@jwplayer/jwplayer-react-native 1.0.2 → 1.1.0

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

@@ -2,6 +2,7 @@ package com.jwplayer.rnjwplayer;
 
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -18,16 +19,20 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.bridge.Arguments;
@@ -35,15 +40,18 @@ import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
-import com.jwplayer.pub.api.JsonHelper;
 import com.jwplayer.pub.api.JWPlayer;
+import com.jwplayer.pub.api.JsonHelper;
 import com.jwplayer.pub.api.UiGroup;
+import com.jwplayer.pub.api.background.MediaService;
 import com.jwplayer.pub.api.background.MediaServiceController;
 import com.jwplayer.pub.api.configuration.PlayerConfig;
 import com.jwplayer.pub.api.configuration.UiConfig;
@@ -110,9 +118,12 @@ import com.jwplayer.pub.api.fullscreen.delegates.DeviceOrientationDelegate;
 import com.jwplayer.pub.api.fullscreen.delegates.DialogLayoutDelegate;
 import com.jwplayer.pub.api.fullscreen.delegates.SystemUiDelegate;
 import com.jwplayer.pub.api.license.LicenseUtil;
+import com.jwplayer.pub.api.media.captions.Caption;
 import com.jwplayer.pub.api.media.playlists.PlaylistItem;
 import com.jwplayer.ui.views.CueMarkerSeekbar;
 
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -120,8 +131,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import org.json.JSONObject;
-
 public class RNJWPlayerView extends RelativeLayout implements
         VideoPlayerEvents.OnFullscreenListener,
         VideoPlayerEvents.OnReadyListener,
@@ -148,6 +157,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         VideoPlayerEvents.OnCaptionsListListener,
         VideoPlayerEvents.OnCaptionsChangedListener,
         VideoPlayerEvents.OnMetaListener,
+        VideoPlayerEvents.PlaylistItemCallbackListener,
 
         CastingEvents.OnCastListener,
 
@@ -179,7 +189,7 @@ public class RNJWPlayerView extends RelativeLayout implements
 
         AudioManager.OnAudioFocusChangeListener,
 
-        LifecycleEventListener {
+        LifecycleEventListener, LifecycleOwner {
     public RNJWPlayer mPlayerView = null;
     public JWPlayer mPlayer = null;
 
@@ -228,9 +238,18 @@ public class RNJWPlayerView extends RelativeLayout implements
     private MediaServiceController mMediaServiceController;
     private PipHandlerReceiver mReceiver = null;
 
+    // Add completion handler field
+    PlaylistItemDecision itemUpdatePromise = null;
+
     private void doBindService() {
         if (mMediaServiceController != null) {
-            mMediaServiceController.bindService();
+            if (!isBackgroundAudioServiceRunning()) {
+                // This may not be your expected behavior, but is necessary to avoid crashing
+                // Do not use multiple player instances with background audio enabled
+
+                // don't rebind me if the service is already active with a player.
+                mMediaServiceController.bindService();
+            }
         }
     }
 
@@ -265,10 +284,23 @@ public class RNJWPlayerView extends RelativeLayout implements
         return superContext;
     }
 
+    private boolean isBackgroundAudioServiceRunning() {
+        ActivityManager manager = (ActivityManager) mAppContext.getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (MediaService.class.getName().equals(service.service.getClassName())) {
+                Log.w(TAG, "MediaService is already running with another player loaded. To avoid crashing, this player, "
+                        + mPlayerView.getTag() + "  will not be loaded into the background service.");
+                return true;
+            }
+        }
+        return false;
+    }
+
     public RNJWPlayerView(ThemedReactContext reactContext, ReactApplicationContext appContext) {
         super(getNonBuggyContext(reactContext, appContext));
         mAppContext = appContext;
 
+        registry.setCurrentState(Lifecycle.State.CREATED);
         mThemedReactContext = reactContext;
 
         mActivity = (ReactActivity) getActivity();
@@ -276,11 +308,25 @@ public class RNJWPlayerView extends RelativeLayout implements
             mWindow = mActivity.getWindow();
         }
 
+        if (mActivity != null) {
+            mActivity.getLifecycle().addObserver(lifecycleObserver);
+        }
+
         mRootView = mActivity.findViewById(android.R.id.content);
 
         getReactContext().addLifecycleEventListener(this);
     }
 
+    private LifecycleObserver lifecycleObserver = new LifecycleEventObserver() {
+        @Override
+        public void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event) {
+            if (event.getTargetState() == Lifecycle.State.DESTROYED) {
+                return; // no op: handled elsewhere
+            }
+            registry.setCurrentState(event.getTargetState());
+        }
+    };
+
     public ReactApplicationContext getAppContext() {
         return mAppContext;
     }
@@ -303,12 +349,44 @@ public class RNJWPlayerView extends RelativeLayout implements
         return mThemedReactContext.getReactApplicationContext().getCurrentActivity();
     }
 
+    // The registry for lifecycle events. Required by player object. Main use case if for garbage collection / teardown
+    private final LifecycleRegistry registry = new LifecycleRegistry(this);
+
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return registry;
+    }
+
+    // // closest to `ondestroy` for a view without listening to the activity event
+    // // The activity event can be deceptive in React-Native
+    // @Override
+    // protected void onDetachedFromWindow() {
+    //     super.onDetachedFromWindow();
+    //     registry.setCurrentState(Lifecycle.State.DESTROYED);
+    // }
+
     public void destroyPlayer() {
         if (mPlayer != null) {
             unRegisterReceiver();
-            mPlayer.deregisterActivityForPip();
+
+            // If we are casting we need to break the cast session as there is no simple
+            // way to reconnect to an existing session if the player that created it is dead
+            
+            // If this doesn't match your use case, using a single player object and load content
+            // into it rather than creating a new player for every piece of content. 
             mPlayer.stop();
 
+            // send signal to JW SDK player is destroyed
+            registry.setCurrentState(Lifecycle.State.DESTROYED);
+
+            // Stop listening to activities lifecycle
+            mActivity.getLifecycle().removeObserver(lifecycleObserver);
+            mPlayer.deregisterActivityForPip();
+
+            // Remove playlist item callback listener
+            mPlayer.removePlaylistItemCallbackListener();
+
             mPlayer.removeListeners(this,
                     // VideoPlayerEvents
                     EventType.READY,
@@ -386,7 +464,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         }
     }
 
-    public void setupPlayerView(Boolean backgroundAudioEnabled) {
+    public void setupPlayerView(Boolean backgroundAudioEnabled, Boolean playlistItemCallbackEnabled) {
         if (mPlayer != null) {
 
             mPlayer.addListeners(this,
@@ -400,6 +478,8 @@ public class RNJWPlayerView extends RelativeLayout implements
                     EventType.SETUP_ERROR,
                     EventType.BUFFER,
                     EventType.TIME,
+                    EventType.AUDIO_TRACKS,
+                    EventType.AUDIO_TRACK_CHANGED,
                     EventType.PLAYLIST,
                     EventType.PLAYLIST_ITEM,
                     EventType.PLAYLIST_COMPLETE,
@@ -449,13 +529,38 @@ public class RNJWPlayerView extends RelativeLayout implements
             } else {
                 mPlayer.setFullscreenHandler(new fullscreenHandler());
             }
-
             mPlayer.allowBackgroundAudio(backgroundAudioEnabled);
+
+            if (playlistItemCallbackEnabled) {
+                mPlayer.setPlaylistItemCallbackListener(this);
+            }
+        }
+    }
+
+   public void resolveNextPlaylistItem(ReadableMap playlistItem) {
+        if (itemUpdatePromise == null) {
+            return;
+        }
+
+        if (playlistItem == null) {
+            itemUpdatePromise.continuePlayback();
+            itemUpdatePromise = null;
+            return;
+        }
+
+        try {
+            PlaylistItem updatedPlaylistItem = Util.getPlaylistItem(playlistItem);
+            itemUpdatePromise.modify(updatedPlaylistItem);
+        } catch (Exception exception) {
+            itemUpdatePromise.continuePlayback();
         }
+
+        itemUpdatePromise = null;
     }
 
     /**
      * Helper to build the a generic `ExtensibleFullscreenHandler` with small tweaks to play nice with Modals
+     *
      * @return {@link ExtensibleFullscreenHandler}
      */
     private ExtensibleFullscreenHandler createModalFullscreenHandler() {
@@ -554,6 +659,18 @@ public class RNJWPlayerView extends RelativeLayout implements
         return delegate;
     }
 
+    @Override
+    public void onBeforeNextPlaylistItem(PlaylistItemDecision playlistItemDecision, PlaylistItem nextItem, int indexOfNextItem) {
+        WritableMap event = Arguments.createMap();
+        Gson gson = new Gson();
+        event.putString("message", "onBeforeNextPlaylistItem");
+        event.putInt("index", indexOfNextItem);
+        event.putString("playlistItem", gson.toJson(nextItem));
+        getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topBeforeNextPlaylistItem", event);
+
+        itemUpdatePromise = playlistItemDecision;
+    }
+
     private class fullscreenHandler implements FullscreenHandler {
         ViewGroup mPlayerViewContainer = (ViewGroup) mPlayerView.getParent();
         private View mDecorView;
@@ -622,6 +739,9 @@ public class RNJWPlayerView extends RelativeLayout implements
             mPlayerViewContainer.post(new Runnable() {
                 @Override
                 public void run() {
+                    // View may not have been removed properly (especially if returning from PiP)
+                    mPlayerViewContainer.removeView(mPlayerView);
+                    
                     mPlayerViewContainer.addView(mPlayerView, new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             ViewGroup.LayoutParams.MATCH_PARENT));
@@ -714,6 +834,11 @@ public class RNJWPlayerView extends RelativeLayout implements
                         mPlayer.setForceControlsVisibility(true);
                         mPlayer.setForceControlsVisibility(false);
 
+                        // If player was in fullscreen when going into PiP, we need to force it back out
+                        if (mPlayer.getFullscreen()) {
+                            mPlayer.setFullscreen(false, true);
+                        }
+
                         // Strip player view
                         rootView.removeView(mPlayerView);
 
@@ -822,7 +947,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         return differences.size() == 1 && differences.containsKey(keyName);
     }
 
-    boolean playlistNotTheSame(ReadableMap prop) {
+    private boolean playlistNotTheSame(ReadableMap prop) {
         return prop.hasKey("playlist") && mPlaylistProp != prop.getArray("playlist") && !Arrays
                 .deepEquals(new ReadableArray[]{mPlaylistProp}, new ReadableArray[]{prop.getArray("playlist")});
     }
@@ -834,6 +959,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         JSONObject obj;
         PlayerConfig jwConfig = null;
         Boolean forceLegacy = prop.hasKey("forceLegacyConfig") ? prop.getBoolean("forceLegacyConfig") : false;
+        Boolean playlistItemCallbackEnabled = prop.hasKey("playlistItemCallbackEnabled") ? prop.getBoolean("playlistItemCallbackEnabled") : false;
         Boolean isJwConfig = false;
         if (!forceLegacy) {
             try {
@@ -940,9 +1066,11 @@ public class RNJWPlayerView extends RelativeLayout implements
                 ReadableArray uiGroupsArray = prop.getArray("hideUIGroups");
                 UiConfig.Builder hideConfigBuilder = new UiConfig.Builder().displayAllControls();
                 for (int i = 0; i < uiGroupsArray.size(); i++) {
-                    UiGroup uiGroup = GROUP_TYPES.get(uiGroupsArray.getString(i));
-                    if (uiGroup != null) {
-                        hideConfigBuilder.hide(uiGroup);
+                    if (uiGroupsArray.getType(i) == ReadableType.String) {
+                        UiGroup uiGroup = GROUP_TYPES.get(uiGroupsArray.getString(i));
+                        if (uiGroup != null) {
+                            hideConfigBuilder.hide(uiGroup);
+                        }
                     }
                 }
                 UiConfig hideJwControlbarUiConfig = hideConfigBuilder.build();
@@ -966,6 +1094,11 @@ public class RNJWPlayerView extends RelativeLayout implements
                 LinearLayout.LayoutParams.MATCH_PARENT));
         addView(mPlayerView);
 
+        // Ensure we have a valid state before applying to the player
+        registry.setCurrentState(registry.getCurrentState()); // This is a hack to ensure player and view know the lifecycle state
+
+        mPlayer = mPlayerView.getPlayer(this);
+
         if (prop.hasKey("controls")) { // Hack for controls hiding not working right away
             mPlayerView.getPlayer().setControls(prop.getBoolean("controls"));
         }
@@ -992,8 +1125,6 @@ public class RNJWPlayerView extends RelativeLayout implements
             mPlayerView.exitFullScreenOnPortrait = exitFullScreenOnPortrait;
         }
 
-        mPlayer = mPlayerView.getPlayer();
-
         if (isJwConfig) {
             mPlayer.setup(jwConfig);
         } else {
@@ -1015,7 +1146,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         // Legacy
         // This isn't the ideal way to do this on Android. All drawables/colors/themes shoudld
         // be targed using styling. See `https://docs.jwplayer.com/players/docs/android-styling-guide`
-        // for more information on how best to override the JWP styles using XML. If you are unsure of a 
+        // for more information on how best to override the JWP styles using XML. If you are unsure of a
         // color/drawable/theme, open an `Ask` issue.
         if (mColors != null) {
             if (mColors.hasKey("backgroundColor")) {
@@ -1068,12 +1199,10 @@ public class RNJWPlayerView extends RelativeLayout implements
             backgroundAudioEnabled = prop.getBoolean("backgroundAudioEnabled");
         }
 
-        setupPlayerView(backgroundAudioEnabled);
+        setupPlayerView(backgroundAudioEnabled, playlistItemCallbackEnabled);
 
         if (backgroundAudioEnabled) {
             audioManager = (AudioManager) simpleContext.getSystemService(Context.AUDIO_SERVICE);
-            // Throws a fatal error if using a playlistURL instead of manually created playlist
-            // Related to SDK-11346
             mMediaServiceController = new MediaServiceController.Builder((AppCompatActivity) mActivity, mPlayer)
                     .build();
         }
@@ -1232,7 +1361,7 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdLoaded(AdLoadedEvent adLoadedEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adLoadedEvent.getClient().toString());
+        event.putInt("client", Util.getAdEventClientValue(adLoadedEvent));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1240,7 +1369,7 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdLoadedXml(AdLoadedXmlEvent adLoadedXmlEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adLoadedXmlEvent.getClient().toString());
+        event.putInt("client", Util.getAdEventClientValue(adLoadedXmlEvent));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1249,7 +1378,8 @@ public class RNJWPlayerView extends RelativeLayout implements
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
         event.putString("reason", adPauseEvent.getAdPauseReason().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypePause));
+        event.putInt("client", Util.getAdEventClientValue(adPauseEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypePause));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1258,7 +1388,8 @@ public class RNJWPlayerView extends RelativeLayout implements
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
         event.putString("reason", adPlayEvent.getAdPlayReason().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypePlay));
+        event.putInt("client", Util.getAdEventClientValue(adPlayEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypePlay));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1266,8 +1397,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdBreakEnd(AdBreakEndEvent adBreakEndEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adBreakEndEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeAdBreakEnd));
+        event.putInt("client", Util.getAdEventClientValue(adBreakEndEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeAdBreakEnd));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1275,8 +1406,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdBreakStart(AdBreakStartEvent adBreakStartEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adBreakStartEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeAdBreakStart));
+        event.putInt("client", Util.getAdEventClientValue(adBreakStartEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeAdBreakStart));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1284,7 +1415,7 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdBreakIgnored(AdBreakIgnoredEvent adBreakIgnoredEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adBreakIgnoredEvent.getClient().toString());
+        event.putInt("client", Util.getAdEventClientValue(adBreakIgnoredEvent));
         // missing type code
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
@@ -1293,8 +1424,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdClick(AdClickEvent adClickEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adClickEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeClicked));
+        event.putInt("client", Util.getAdEventClientValue(adClickEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeClicked));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1302,7 +1433,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdCompanions(AdCompanionsEvent adCompanionsEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeCompanion));
+        event.putInt("client", Util.getAdEventClientValue(adCompanionsEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeCompanion));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1310,8 +1442,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdComplete(AdCompleteEvent adCompleteEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adCompleteEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeComplete));
+        event.putInt("client", Util.getAdEventClientValue(adCompleteEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeComplete));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1331,7 +1463,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         event.putString("message", "onPlayerAdWarning");
         event.putInt("code", adWarningEvent.getCode());
         event.putInt("adErrorCode", adWarningEvent.getAdErrorCode());
-        event.putString("error", adWarningEvent.getMessage());
+        event.putString("warning", adWarningEvent.getMessage());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topPlayerAdWarning", event);
     }
 
@@ -1339,8 +1471,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdImpression(AdImpressionEvent adImpressionEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adImpressionEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeImpression));
+        event.putInt("client", Util.getAdEventClientValue(adImpressionEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeImpression));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1348,8 +1480,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdMeta(AdMetaEvent adMetaEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adMetaEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeMeta));
+        event.putInt("client", Util.getAdEventClientValue(adMetaEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeMeta));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1357,8 +1489,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdRequest(AdRequestEvent adRequestEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adRequestEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeRequest));
+        event.putInt("client", Util.getAdEventClientValue(adRequestEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeRequest));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1366,8 +1498,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdSchedule(AdScheduleEvent adScheduleEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adScheduleEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeSchedule));
+        event.putInt("client", Util.getAdEventClientValue(adScheduleEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeSchedule));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1375,8 +1507,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdSkipped(AdSkippedEvent adSkippedEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putString("client", adSkippedEvent.getClient().toString());
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeSkipped));
+        event.putInt("client", Util.getAdEventClientValue(adSkippedEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeSkipped));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1384,7 +1516,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onAdStarted(AdStartedEvent adStartedEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onAdEvent");
-        event.putInt("type", Util.getEventTypeValue(Util.AdEventType.JWAdEventTypeStarted));
+        event.putInt("client", Util.getAdEventClientValue(adStartedEvent));
+        event.putInt("type", Util.getAdEventTypeValue(Util.AdEventType.JWAdEventTypeStarted));
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topAdEvent", event);
     }
 
@@ -1437,6 +1570,38 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     }
 
+    // Captions Events
+
+    @Override
+    public void onCaptionsChanged(CaptionsChangedEvent captionsChangedEvent) {
+        WritableMap event = Arguments.createMap();
+        event.putString("message", "onCaptionsChanged");
+        event.putInt("index", captionsChangedEvent.getCurrentTrack());
+        getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCaptionsChanged", event);
+    }
+
+    @Override
+    public void onCaptionsList(CaptionsListEvent captionsListEvent) {
+        WritableMap event = Arguments.createMap();
+        List<Caption> captionTrackList = captionsListEvent.getCaptions();
+        WritableArray captionTracks = Arguments.createArray();
+        if (captionTrackList != null) {
+            for(int i = 0; i < captionTrackList.size(); i++) {
+                WritableMap captionTrack = Arguments.createMap();
+                Caption track = captionTrackList.get(i);
+                captionTrack.putString("file", track.getFile());
+                captionTrack.putString("label", track.getLabel());
+                captionTrack.putBoolean("default", track.isDefault());
+                captionTracks.pushMap(captionTrack);
+            }
+        }
+        event.putString("message", "onCaptionsList");
+        event.putInt("index", captionsListEvent.getCurrentCaptionIndex());
+        event.putArray("tracks", captionTracks);
+        getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCaptionsList", event);
+
+    }
+
     // Player Events
 
     @Override
@@ -1485,6 +1650,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         if (ex != null) {
             event.putString("error", ex.toString());
             event.putString("description", errorEvent.getMessage());
+            event.putInt("errorCode", errorEvent.getErrorCode());
         }
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topPlayerError", event);
 
@@ -1635,6 +1801,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onSetupError(SetupErrorEvent setupErrorEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onSetupError");
+        event.putString("errorMessage", setupErrorEvent.getMessage());
+        event.putInt("errorCode", setupErrorEvent.getCode());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topSetupPlayerError", event);
 
         updateWakeLock(false);
@@ -1649,16 +1817,6 @@ public class RNJWPlayerView extends RelativeLayout implements
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topTime", event);
     }
 
-    @Override
-    public void onCaptionsChanged(CaptionsChangedEvent captionsChangedEvent) {
-
-    }
-
-    @Override
-    public void onCaptionsList(CaptionsListEvent captionsListEvent) {
-
-    }
-
     @Override
     public void onMeta(MetaEvent metaEvent) {
 
@@ -1678,6 +1836,17 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     // Casting events
 
+    private boolean mIsCastActive = false;
+
+    /**
+     * Get if this player-view is currently casting
+     *
+     * @return true if casting
+     */
+    public boolean getIsCastActive() {
+        return mIsCastActive;
+    }
+
     @Override
     public void onCast(CastEvent castEvent) {
         WritableMap event = Arguments.createMap();
@@ -1686,6 +1855,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         event.putBoolean("active", castEvent.isActive());
         event.putBoolean("available", castEvent.isAvailable());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCasting", event);
+        mIsCastActive = castEvent.isActive();
         // stop/start the background audio service if it's running and we're casting
         if (castEvent.isActive()) {
             doUnbindService();