Fix native player queue

assets/js/plugins/NativeVideoPlayer.staticjs

@@ -46,8 +46,11 @@ class NativeVideoPlayer {
 			this.uri = status.uri;
 
 			if (this.uri === null) {
-				// The uri is null, tell playbackManager to stop playback
-				this.playbackManager.stop(this);
+				// If the player was closed manually,
+				// we need to tell web to stop playback
+				if (status.didPlayerCloseManually) {
+					this.playbackManager.stop(this);
+				}
 				// Notify web that playback has stopped
 				this._safelyTriggerEvent('stopped');
 			} else {

components/VideoPlayer.js

@@ -29,6 +29,7 @@ const VideoPlayer = observer(() => {
 	// Update the player when media type or uri changes
 	useEffect(() => {
 		if (rootStore.mediaStore.type === MediaTypes.Video) {
+			rootStore.didPlayerCloseManually = true;
 			player.current?.loadAsync({
 				uri: rootStore.mediaStore.uri
 			}, {
@@ -53,6 +54,7 @@ const VideoPlayer = observer(() => {
 	// Close the player when the store indicates it should stop playback
 	useEffect(() => {
 		if (rootStore.mediaStore.shouldStop) {
+			rootStore.didPlayerCloseManually = false;
 			player.current?.dismissFullscreenPlayer()
 				.catch(console.debug);
 			rootStore.mediaStore.shouldStop = false;
@@ -70,7 +72,13 @@ const VideoPlayer = observer(() => {
 				player.current?.presentFullscreenPlayer()
 					.catch(console.debug);
 			}}
-			onPlaybackStatusUpdate={({ isPlaying, positionMillis }) => {
+			onPlaybackStatusUpdate={({ isPlaying, positionMillis, didJustFinish }) => {
+				if (didJustFinish) {
+					rootStore.didPlayerCloseManually = false;
+					player.current?.dismissFullscreenPlayer()
+						.catch(console.debug);
+					return;
+				}
 				rootStore.mediaStore.isPlaying = isPlaying;
 				rootStore.mediaStore.positionTicks = msToTicks(positionMillis);
 			}}

screens/HomeScreen.js

@@ -59,6 +59,7 @@ const HomeScreen = observer(() => {
 	// Report media updates to the video plugin
 	useEffect(() => {
 		webview.current?.injectJavaScript(`window.ExpoVideoPlayer && window.ExpoVideoPlayer._reportStatus(${JSON.stringify({
+			didPlayerCloseManually: rootStore.didPlayerCloseManually,
 			uri: rootStore.mediaStore.uri,
 			isPlaying: rootStore.mediaStore.isPlaying,
 			positionTicks: rootStore.mediaStore.positionTicks,

stores/RootStore.js

@@ -26,13 +26,19 @@ export default class RootStore {
 	 */
 	isReloadRequired = false
 
+	/**
+	 * Was the native player closed manually
+	 */
+	didPlayerCloseManually = true
+
 	mediaStore = new MediaStore()
 	serverStore = new ServerStore()
 	settingStore = new SettingStore()
 
 	reset() {
 		this.isFullscreen = false;
 		this.isReloadRequired = false;
+		this.didPlayerCloseManually = true;
 
 		this.mediaStore.reset();
 		this.serverStore.reset();
@@ -45,5 +51,6 @@ export default class RootStore {
 decorate(RootStore, {
 	storeLoaded: [ ignore, observable ],
 	isFullscreen: [ ignore, observable ],
-	isReloadRequired: [ ignore, observable ]
+	isReloadRequired: [ ignore, observable ],
+	didPlayerCloseManually: [ ignore, observable ]
 });