Merge branch 'release/0.2.10'

Author: chaimPaneth

android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerView.java

@@ -181,11 +181,16 @@ public class RNJWPlayerView extends RelativeLayout implements
     private MediaServiceController mMediaServiceController;
 
     private void doBindService() {
-        mMediaServiceController.bindService();
+        if (mMediaServiceController != null) {
+            mMediaServiceController.bindService();
+        }
     }
 
     private void doUnbindService() {
-        mMediaServiceController.unbindService();
+        if (mMediaServiceController != null) {
+            mMediaServiceController.unbindService();
+            mMediaServiceController = null;
+        }
     }
 
     private static boolean contextHasBug(Context context) {

android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerViewManager.java

@@ -139,10 +139,6 @@ public Map getExportedCustomBubblingEventTypeConstants() {
                     MapBuilder.of(
                             "phasedRegistrationNames",
                             MapBuilder.of("bubbled", "onAudioTracks")))
-            .put("topControlBarVisible",
-                    MapBuilder.of(
-                            "phasedRegistrationNames",
-                            MapBuilder.of("bubbled", "onControlBarVisible")))
             .build();
   }
 
@@ -214,9 +210,8 @@ public void toggleSpeed(RNJWPlayerView root) {
 
   @Override
   public void onDropViewInstance(@Nonnull RNJWPlayerView view) {
-    super.onDropViewInstance(view);
-
     view.destroyPlayer();
+    super.onDropViewInstance(view);
     view = null;
   }
 }

index.js

@@ -158,6 +158,7 @@ export default class JWPlayer extends Component {
     onPlaylist: PropTypes.func,
     play: PropTypes.func,
     pause: PropTypes.func,
+    setVolume: PropTypes.func,
     toggleSpeed: PropTypes.func,
     setSpeed: PropTypes.func,
     setPlaylistIndex: PropTypes.func,
@@ -189,7 +190,6 @@ export default class JWPlayer extends Component {
     onSeeked: PropTypes.func,
     onPlaylistItem: PropTypes.func,
     onControlBarVisible: PropTypes.func,
-    onControlBarVisible: PropTypes.func,
     onPlaylistComplete: PropTypes.func,
     getAudioTracks: PropTypes.func,
     getCurrentAudioTrack: PropTypes.func,
@@ -253,6 +253,12 @@ export default class JWPlayer extends Component {
       );
   }
 
+  setVolume(value) {
+    if (RNJWPlayerManager) {
+      RNJWPlayerManager.setVolume(this.getRNJWPlayerBridgeHandle(), value);
+    }
+  }
+
   async time() {
     if (RNJWPlayerManager) {
       try {

ios/RNJWPlayer/RNJWPlayerView.m

@@ -921,8 +921,16 @@ - (void)contentKeyWithSPCData:(NSData * _Nonnull)spcData completionHandler:(void
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *, id> *)change context:(void *)context
 {
-    if (_playerView != nil && [object isEqual:_playerView.pictureInPictureController] && [keyPath isEqualToString:@"isPictureInPicturePossible"]) {
-        
+    if (_playerView != nil || _playerViewController != nil) {
+        if ([keyPath isEqualToString:@"playbackLikelyToKeepUp"]) {
+            if (_playerView != nil) {
+                [_playerView.player play];
+            } else if (_playerViewController != nil) {
+                [_playerViewController.player play];
+            }
+        } else if (_playerView != nil && [object isEqual:_playerView.pictureInPictureController] && [keyPath isEqualToString:@"isPictureInPicturePossible"]) {
+            
+        }
     }
 }
 
@@ -1143,6 +1151,8 @@ - (void)jwplayer:(id<JWPlayer>)player didLoadPlaylistItem:(JWPlayerItem *)item a
 
         self.onPlaylistItem(@{@"playlistItem": [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding], @"index": [NSNumber numberWithInteger:index]});
     }
+    
+    [item addObserver:self forKeyPath:@"playbackLikelyToKeepUp" options:NSKeyValueObservingOptionNew context:nil];
 }
 
 - (void)jwplayer:(id<JWPlayer>)player didLoadPlaylist:(NSArray<JWPlayerItem *> *)playlist
@@ -1468,46 +1478,75 @@ - (void)initializeAudioSession
 {
     AVAudioSession *audioSession = [AVAudioSession sharedInstance];
 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleMediaServicesReset)
+                                                 name:AVAudioSessionMediaServicesWereResetNotification
+                                               object:audioSession];
+    
     [[NSNotificationCenter defaultCenter] addObserver: self
                                              selector: @selector(audioSessionInterrupted:)
                                                  name: AVAudioSessionInterruptionNotification
                                                object: audioSession];
 
-    NSError *setCategoryError = nil;
-    BOOL success = [audioSession setCategory:AVAudioSessionCategoryPlayback withOptions:AVAudioSessionCategoryOptionMixWithOthers|AVAudioSessionCategoryOptionAllowBluetooth|AVAudioSessionCategoryOptionDefaultToSpeaker error:&setCategoryError];
+    NSError *categoryError = nil;
+    BOOL success = [audioSession setCategory:AVAudioSessionCategoryPlayback error:&categoryError];
+    
+    NSError *modeError = nil;
+    [audioSession setMode:AVAudioSessionModeDefault error:&modeError];
 
     NSError *activationError = nil;
-    success = [audioSession setActive:YES withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:&activationError];
+    success = [audioSession setActive:YES error:&activationError];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(applicationWillResignActive:)
                                                      name:UIApplicationWillResignActiveNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(applicationWillEnterForeground:)
+                                                     name:UIApplicationWillEnterForegroundNotification object:nil];
 }
 
+// Interupted
+
 -(void)audioSessionInterrupted:(NSNotification*)note
 {
-    if ([note.name isEqualToString:AVAudioSessionInterruptionNotification]) {
-        NSLog(@"Interruption notification");
-        
-        if ([[note.userInfo valueForKey:AVAudioSessionInterruptionTypeKey] isEqualToNumber:[NSNumber numberWithInt:AVAudioSessionInterruptionTypeBegan]]) {
-            [self audioInterruptionsStarted:note];
-        } else {
-            [self audioInterruptionsEnded:note];
-        }
+    NSNumber *interruptionType = [[note userInfo] objectForKey:AVAudioSessionInterruptionTypeKey];
+    NSNumber *interruptionOption = [[note userInfo] objectForKey:AVAudioSessionInterruptionOptionKey];
+
+    switch (interruptionType.unsignedIntegerValue) {
+        case AVAudioSessionInterruptionTypeBegan: {
+            _wasInterrupted = YES;
+            
+            if (_playerView != nil) {
+                [_playerView.player pause];
+            } else if (_playerViewController != nil) {
+                [_playerViewController.player pause];
+            }
+        } break;
+        case AVAudioSessionInterruptionTypeEnded: {
+            if (interruptionOption.unsignedIntegerValue == AVAudioSessionInterruptionOptionShouldResume || (!_userPaused && _backgroundAudioEnabled)) {
+                if (_playerView != nil) {
+                    [self->_playerView.player play];
+                } else if (_playerViewController != nil) {
+                    [self->_playerViewController.player play];
+                }
+            }
+        } break;
+        default:
+            break;
     }
 }
 
--(void)audioInterruptionsStarted:(NSNotification *)note {
-    _wasInterrupted = YES;
-    
-    if (_playerView != nil) {
-        [_playerView.player pause];
-    } else if (_playerViewController != nil) {
-        [_playerViewController.player pause];
-    }
+// Service reset
+
+-(void)handleMediaServicesReset
+{
+    // • Handle this notification by fully reconfiguring audio
 }
 
--(void)audioInterruptionsEnded:(NSNotification *)note {
+// Inactive
+// Hack for ios 14 stopping audio when going to background
+-(void)applicationWillResignActive:(NSNotification *)notification {
     if (!_userPaused && _backgroundAudioEnabled) {
         if (_playerView != nil) {
             [_playerView.player play];
@@ -1517,9 +1556,9 @@ -(void)audioInterruptionsEnded:(NSNotification *)note {
     }
 }
 
-// Inactive
+// Active
 
--(void)applicationWillResignActive:(NSNotification *)notification {
+-(void)applicationWillEnterForeground:(NSNotification *)notification{
     if (!_userPaused && _backgroundAudioEnabled) {
         if (_playerView != nil) {
             [_playerView.player play];

package.json

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