From b263d45171637d1529153622b26f21489a8ae0d6 Mon Sep 17 00:00:00 2001
From: Hein Rutjes <hrutjes@gmail.com>
Date: Mon, 18 May 2020 11:50:45 +0200
Subject: [PATCH 1/3] [expo-av][ios] Fix BOOL usage

---
 packages/expo-av/ios/EXAV/Video/EXVideoView.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/expo-av/ios/EXAV/Video/EXVideoView.m b/packages/expo-av/ios/EXAV/Video/EXVideoView.m
index a60a7715e7790..d5986de950a96 100644
--- a/packages/expo-av/ios/EXAV/Video/EXVideoView.m
+++ b/packages/expo-av/ios/EXAV/Video/EXVideoView.m
@@ -245,12 +245,12 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     
     if (viewBounds.size.height != screen.size.height && viewBounds.size.width != screen.size.width && _fullscreenPlayerPresented) {
       // 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 {

From 19bfd92bd30eddd4f118ca7f4451d8e2106b67d1 Mon Sep 17 00:00:00 2001
From: Hein Rutjes <hrutjes@gmail.com>
Date: Mon, 18 May 2020 12:28:54 +0200
Subject: [PATCH 2/3] [video][ios] Fix unable to call presentFullScreenPlayer
 twice
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 viewcontroll is used.

When `useNativeControls` is set, calling `presentFullScreenPlayer` twice fails with
---
 packages/expo-av/ios/EXAV/Video/EXVideoView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/expo-av/ios/EXAV/Video/EXVideoView.m b/packages/expo-av/ios/EXAV/Video/EXVideoView.m
index d5986de950a96..0ded09e3a5426 100644
--- a/packages/expo-av/ios/EXAV/Video/EXVideoView.m
+++ b/packages/expo-av/ios/EXAV/Video/EXVideoView.m
@@ -243,7 +243,7 @@ - (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 = NO;
       [self _callFullscreenCallbackForUpdate:EXVideoFullscreenUpdatePlayerWillDismiss];

From 10b70fdf2e44f340a4d4ca577ad6008ad797e4c1 Mon Sep 17 00:00:00 2001
From: Hein Rutjes <hrutjes@gmail.com>
Date: Tue, 19 May 2020 16:45:20 +0200
Subject: [PATCH 3/3] [expo-av] Update changelog

---
 packages/expo-av/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/expo-av/CHANGELOG.md b/packages/expo-av/CHANGELOG.md
index 694fbda4fb7bc..59ad3a1d98672 100644
--- a/packages/expo-av/CHANGELOG.md
+++ b/packages/expo-av/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))