From 2fbbf95414701c9aff17d86e5f64a790ee16c7df Mon Sep 17 00:00:00 2001
From: Hein Rutjes <hrutjes@gmail.com>
Date: Tue, 19 May 2020 17:10:29 +0200
Subject: [PATCH] [video][ios] Fix unable to call presentFullScreenPlayer twice
 (#8343)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes an issue when calling `presentFullScreenPlayer` more than once on iOS. This would result in the error “Fullscreen player is already being presented” when the `useNativeControls` prop also set on the `<Video>` component.

When useNativeControls is set, it re-creates the PlayerViewController every time the full-screen view-controller was closed. This caused the “videoBounds” key-value handler to be called which incorrectly assumed the regular ViewController was transitioning from full-screen to non full-screen. An additional check has been added to ensure this detection is not triggered when the full-screen viewcontroller is used.
---
 CHANGELOG.md                 | 1 +
 ios/EXAV/Video/EXVideoView.m | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 694fbda4fb7bc..59ad3a1d98672 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,4 +8,5 @@
 
 ### 🐛 Bug fixes
 
+- Fix unable to call presentFullScreenPlayer twice. ([#8343](https://github.com/expo/expo/pull/8343) by [@IjzerenHein](https://github.com/IjzerenHein))
 - Fixed `Plaback.loadAsync()` return type. ([#7559](https://github.com/expo/expo/pull/7559) by [@awinograd](https://github.com/awinograd))
diff --git a/ios/EXAV/Video/EXVideoView.m b/ios/EXAV/Video/EXVideoView.m
index a60a7715e7790..0ded09e3a5426 100644
--- a/ios/EXAV/Video/EXVideoView.m
+++ b/ios/EXAV/Video/EXVideoView.m
@@ -243,14 +243,14 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     CGRect viewBounds = [change[@"new"] CGRectValue];
     CGRect screen = [[UIScreen mainScreen] bounds];
     
-    if (viewBounds.size.height != screen.size.height && viewBounds.size.width != screen.size.width && _fullscreenPlayerPresented) {
+    if (viewBounds.size.height != screen.size.height && viewBounds.size.width != screen.size.width && _fullscreenPlayerPresented && !_fullscreenPlayerViewController) {
       // Fullscreen player is being dismissed
-      _fullscreenPlayerPresented = false;
+      _fullscreenPlayerPresented = NO;
       [self _callFullscreenCallbackForUpdate:EXVideoFullscreenUpdatePlayerWillDismiss];
       [self _callFullscreenCallbackForUpdate:EXVideoFullscreenUpdatePlayerDidDismiss];
     } else if (viewBounds.size.height == screen.size.height && viewBounds.size.width == screen.size.width && !_fullscreenPlayerPresented) {
       // Fullscreen player is being presented
-      _fullscreenPlayerPresented = true;
+      _fullscreenPlayerPresented = YES;
       [self _callFullscreenCallbackForUpdate:EXVideoFullscreenUpdatePlayerWillPresent];
       [self _callFullscreenCallbackForUpdate:EXVideoFullscreenUpdatePlayerDidPresent];
     } else {