yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: watch together guest losing sync when host switches episodes

Browse Source 
close #431
This commit is contained in:
edde746
2026-02-10 01:41:28 +01:00
parent 2de92e660d
commit 075a4a45c8
3 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/watch_together/providers/watch_together_provider.dart
+32 -10
View File
@@ -356,6 +356,10 @@ class WatchTogetherProvider with ChangeNotifier {
_handleSessionConfig(message);
break;
case SyncMessageType.requestSessionConfig:
// Handled at sync manager level (host responds with config)
break;
default:
break;
}
@@ -372,6 +376,18 @@ class WatchTogetherProvider with ChangeNotifier {
_syncManager?.updateSession(_session!); // Update sync manager if it exists
notifyListeners();
}
// If config contains media info that differs from our current state,
// trigger a media switch so the guest navigates to the correct content.
// This handles the case where a guest missed a mediaSwitch broadcast
// (e.g., host switched episodes while guest was popping out of the player).
if (message.ratingKey != null &&
message.serverId != null &&
message.mediaTitle != null &&
message.ratingKey != _session?.mediaRatingKey) {
appLogger.d('WatchTogether: Session config contains different media, triggering switch');
_handleMediaSwitch(message);
}
}
/// Called when user seeks locally (to broadcast to peers)
@@ -431,7 +447,17 @@ class WatchTogetherProvider with ChangeNotifier {
appLogger.d('WatchTogether: Received media switch: ${message.mediaTitle}');
// Update local session state
// Dispatch callback BEFORE updating session state.
// If the callback fails silently (e.g., player disposed mid-animation),
// the ratingKey stays unchanged so the next positionSync or re-sent
// message can retry instead of being treated as a duplicate.
if (onPlayerMediaSwitched != null) {
onPlayerMediaSwitched!(message.ratingKey!, message.serverId!, message.mediaTitle!);
} else {
onMediaSwitched?.call(message.ratingKey!, message.serverId!, message.mediaTitle!);
}
// Update local session state after successful dispatch
_session = _session?.copyWith(
mediaRatingKey: message.ratingKey,
mediaServerId: message.serverId,
@@ -439,15 +465,6 @@ class WatchTogetherProvider with ChangeNotifier {
);
notifyListeners();
// If player handler is set (VideoPlayerScreen is active), use that for proper navigation context
if (onPlayerMediaSwitched != null) {
onPlayerMediaSwitched!(message.ratingKey!, message.serverId!, message.mediaTitle!);
return;
}
// Otherwise, trigger app-level navigation callback (MainScreen handles it)
onMediaSwitched?.call(message.ratingKey!, message.serverId!, message.mediaTitle!);
}
/// Notify guests that host is exiting the video player
@@ -469,6 +486,11 @@ class WatchTogetherProvider with ChangeNotifier {
appLogger.d('WatchTogether: Host exited player, callback set: ${onHostExitedPlayer != null}');
// Clear the player callback BEFORE popping so that any mediaSwitch message
// arriving during the pop animation routes to MainScreen's handler instead
// of the dying VideoPlayerScreen.
onPlayerMediaSwitched = null;
// Trigger callback for the app to navigate guest out of player
if (onHostExitedPlayer != null) {
onHostExitedPlayer!.call();