π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): gate inactive memory playback
ashilknb8c66d8264b1
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dartindex 7555b490ee..72c5df26fa 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart@@ -5,7 +5,7 @@ import "package:logging/logging.dart";import "package:photos/services/memories/memory_music_catalog.dart";import "package:photos/services/memories/memory_music_source_loader.dart";-enum _MemoryMusicPlaybackStatus { idle, loading, ready, failed }+enum _MemoryMusicPlaybackStatus { idle, loading, ready }enum _MemoryMusicPauseReason { appBackground, viewerAction, videoItem }@@ -80,7 +80,7 @@ class MemoryMusicController extends ChangeNotifier {await _synchronizePlayback();} catch (error, stackTrace) {if (!_isCurrentLoad(generation)) return;- _status = _MemoryMusicPlaybackStatus.failed;+ _status = _MemoryMusicPlaybackStatus.idle;_logger.warning("Failed to load memory music track ${track.id}",error,diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dartindex 5503dc2311..25f28c106d 100644--- a/mobile/apps/photos/lib/services/memories_cache_service.dart+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart@@ -1407,6 +1407,7 @@ class MemoriesCacheService {child: FullScreenMemory(selectedPersonMemory.title,0,+ isActive: true,onCurrentItemChanged: (file) {unawaited(musicController.setCurrentItem(diff --git a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dartindex f35536eab0..4e988fb11f 100644--- a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart+++ b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart@@ -1,6 +1,8 @@import "dart:async";import 'package:flutter/material.dart';+import "package:photos/core/event_bus.dart";+import "package:photos/events/pause_video_event.dart";import "package:photos/models/file/file_type.dart";import "package:photos/models/memories/smart_memory.dart";import "package:photos/theme/colors.dart";@@ -29,11 +31,13 @@ class AllMemoriesPage extends StatefulWidget {class _AllMemoriesPageState extends State<AllMemoriesPage>with SingleTickerProviderStateMixin {late PageController pageController;+ late int _activePageIndex;final Map<String, FileType> _currentItemTypes = <String, FileType>{};@overridevoid initState() {super.initState();+ _activePageIndex = widget.initialPageIndex;pageController = PageController(initialPage: widget.initialPageIndex);}@@ -64,6 +68,8 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>hitTestBehavior: HitTestBehavior.translucent,itemCount: widget.allMemories.length,onPageChanged: (index) {+ Bus.instance.fire(PauseVideoEvent());+ setState(() => _activePageIndex = index);final smartMemory = widget.allMemories[index];final currentItemType =_currentItemTypes[smartMemory.id] ??@@ -87,6 +93,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>child: FullScreenMemory(smartMemory.title,initialMemoryIndex,+ isActive: index == _activePageIndex,onCurrentItemChanged: (file) {_currentItemTypes[smartMemory.id] = file.fileType;unawaited(diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dartindex f41101e204..fdb44e741b 100644--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart@@ -329,6 +329,7 @@ class FullScreenMemoryData extends InheritedWidget {class FullScreenMemory extends StatefulWidget {final String title;final int initialIndex;+ final bool isActive;final ValueChanged<EnteFile>? onCurrentItemChanged;final VoidCallback? onNextMemory;final VoidCallback? onPreviousMemory;@@ -336,6 +337,7 @@ class FullScreenMemory extends StatefulWidget {const FullScreenMemory(this.title,this.initialIndex, {+ required this.isActive,this.onCurrentItemChanged,this.onNextMemory,this.onPreviousMemory,@@ -369,7 +371,8 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {Object? _kenBurnsStartToken;bool _isViewerPaused = false;bool _isPlaybackPaused = false;- bool get _isAnimationPaused => _isViewerPaused || _isPlaybackPaused;+ bool get _isAnimationPaused =>+ !widget.isActive || _isViewerPaused || _isPlaybackPaused;bool _isMediaZoomed = false;final _socialControlsVisible = ValueNotifier<bool>(false);FullScreenMemoryData? _memoryData;@@ -452,6 +455,14 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {});}+ @override+ void didUpdateWidget(covariant FullScreenMemory oldWidget) {+ super.didUpdateWidget(oldWidget);+ if (oldWidget.isActive == widget.isActive) return;+ _syncAnimationState();+ if (widget.isActive) _reportCurrentItem();+ }+@overridevoid dispose() {_itemIndexNotifier?.removeListener(_reportCurrentItem);@@ -471,7 +482,8 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {inheritedData.memories.length,);if (index == null) return;- widget.onCurrentItemChanged?.call(inheritedData.memories[index].file);+ final file = inheritedData.memories[index].file;+ if (widget.isActive) widget.onCurrentItemChanged?.call(file);}/// Used to check if user has touched the screen and then to pause animation@@ -596,6 +608,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {}void _goToNext(FullScreenMemoryData inheritedData) {+ if (!widget.isActive) return;if (inheritedData.memories.isEmpty) return;_isMediaZoomed = false;hasFinalFileLoaded = false;@@ -617,6 +630,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {}void _goToPrevious(FullScreenMemoryData inheritedData) {+ if (!widget.isActive) return;if (inheritedData.memories.isEmpty) return;_isMediaZoomed = false;hasFinalFileLoaded = false;@@ -640,6 +654,14 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {void _onPageChange(FullScreenMemoryData inheritedData, int index) {if (!_isValidMemoryIndex(index, inheritedData.memories.length)) return;+ final currentIndex = _clampedMemoryIndex(+ inheritedData.indexNotifier.value,+ inheritedData.memories.length,+ );+ if (currentIndex != null &&+ inheritedData.memories[currentIndex].file.fileType == FileType.video) {+ Bus.instance.fire(PauseVideoEvent());+ }_isMediaZoomed = false;isAtFirstOrLastFile = false;unawaited(@@ -781,6 +803,10 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {isVideo: isVideo,child: FileWidget(currentFile,+ isActive: widget.isActive,+ itemIndex: safeIndex,+ activeItemIndexListenable:+ inheritedData.indexNotifier,autoPlay: false,tagPrefix: "memories",backgroundDecoration: const BoxDecoration(diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dartindex f757d77a30..40966cabff 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart@@ -1,5 +1,6 @@import "dart:io";+import "package:flutter/foundation.dart";import 'package:flutter/material.dart';import 'package:logging/logging.dart';import 'package:photos/models/file/file.dart';@@ -17,6 +18,9 @@ class FileWidget extends StatelessWidget {final BoxDecoration? backgroundDecoration;final bool? autoPlay;final bool? isFromMemories;+ final bool isActive;+ final int? itemIndex;+ final ValueListenable<int>? activeItemIndexListenable;final bool? isAudioMutedOverride;final Function({required int memoryDuration})? onFinalFileLoad;final ValueChanged<File>? onFinalImageLoaded;@@ -31,6 +35,9 @@ class FileWidget extends StatelessWidget {required this.tagPrefix,this.backgroundDecoration,this.isFromMemories = false,+ this.isActive = true,+ this.itemIndex,+ this.activeItemIndexListenable,this.isAudioMutedOverride,this.onFinalFileLoad,this.onFinalImageLoaded,@@ -77,6 +84,9 @@ class FileWidget extends StatelessWidget {shouldDisableScroll: shouldDisableScroll,onFinalFileLoad: onFinalFileLoad,isFromMemories: isFromMemories ?? false,+ isActive: isActive,+ itemIndex: itemIndex,+ activeItemIndexListenable: activeItemIndexListenable,isAudioMutedOverride: isAudioMutedOverride,key: key ?? ValueKey(fileKey),);diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dartindex 7d9ff6cb5f..63d7c71500 100644--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart@@ -28,6 +28,9 @@ class VideoWidget extends StatefulWidget {final Function(bool)? shouldDisableScroll;final Function({required int memoryDuration})? onFinalFileLoad;final bool isFromMemories;+ final bool isActive;+ final int? itemIndex;+ final ValueListenable<int>? activeItemIndexListenable;final bool? isAudioMutedOverride;const VideoWidget(@@ -37,6 +40,9 @@ class VideoWidget extends StatefulWidget {this.shouldDisableScroll,this.onFinalFileLoad,this.isFromMemories = false,+ required this.isActive,+ this.itemIndex,+ this.activeItemIndexListenable,this.isAudioMutedOverride,super.key,});@@ -57,9 +63,15 @@ class _VideoWidgetState extends State<VideoWidget> {bool isPreviewLoadable = false;+ bool get _isActive =>+ widget.isActive &&+ (widget.activeItemIndexListenable == null ||+ widget.activeItemIndexListenable!.value == widget.itemIndex);+@overridevoid initState() {super.initState();+ widget.activeItemIndexListenable?.addListener(_onActiveItemChanged);// Automatic error fallback: switch to MediaKit when native player failsuseMediaKitForVideoSubscription = Bus.instance.on<UseMediaKitForVideo>()@@ -90,10 +102,26 @@ class _VideoWidgetState extends State<VideoWidget> {@overridevoid dispose() {+ widget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);useMediaKitForVideoSubscription.cancel();super.dispose();}+ @override+ void didUpdateWidget(covariant VideoWidget oldWidget) {+ super.didUpdateWidget(oldWidget);+ if (identical(+ oldWidget.activeItemIndexListenable,+ widget.activeItemIndexListenable,+ )) {+ return;+ }+ oldWidget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);+ widget.activeItemIndexListenable?.addListener(_onActiveItemChanged);+ }++ void _onActiveItemChanged() => setState(() {});+Future<void> _checkForPreview() async {if (!widget.file.isOwner) {final bool isStreamable = await VideoPreviewService.instance@@ -177,6 +205,7 @@ class _VideoWidgetState extends State<VideoWidget> {playlistData: playlistData,selectedPreview: playPreview,isFromMemories: widget.isFromMemories,+ isActive: _isActive,isAudioMutedOverride: widget.isAudioMutedOverride,onStreamChange: () {setState(() {@@ -203,6 +232,7 @@ class _VideoWidgetState extends State<VideoWidget> {preview: playlistData?.preview,selectedPreview: playPreview,isFromMemories: widget.isFromMemories,+ isActive: _isActive,isAudioMutedOverride: widget.isAudioMutedOverride,onStreamChange: () {setState(() {diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dartindex 2456221138..9ff9cd892d 100644--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart@@ -36,6 +36,7 @@ class VideoWidgetMediaKit extends StatefulWidget {final FullScreenRequestCallback? playbackCallback;final Function(bool)? shouldDisableScroll;final bool isFromMemories;+ final bool isActive;final bool? isAudioMutedOverride;final void Function() onStreamChange;final File? preview;@@ -48,6 +49,7 @@ class VideoWidgetMediaKit extends StatefulWidget {this.playbackCallback,this.shouldDisableScroll,this.isFromMemories = false,+ required this.isActive,this.isAudioMutedOverride,required this.onStreamChange,this.preview,@@ -98,7 +100,7 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>resumeVideoSubscription = Bus.instance.on<ResumeVideoEvent>().listen((event,) {- player.play();+ if (widget.isActive) player.play();});if (!widget.isFromMemories) {_muteSubscription = Bus.instance.on<VideoMuteChangedEvent>().listen((@@ -146,6 +148,9 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>@overridevoid didUpdateWidget(covariant VideoWidgetMediaKit oldWidget) {super.didUpdateWidget(oldWidget);+ if (oldWidget.isActive != widget.isActive) {+ widget.isActive ? player.play() : player.pause();+ }if (oldWidget.isAudioMutedOverride != widget.isAudioMutedOverride) {_applyVolume();}@@ -352,7 +357,7 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>controller = VideoController(player);}_applyVolume();- player.open(Media(url), play: _isAppInFG);+ player.open(Media(url), play: _isAppInFG && widget.isActive);});int duration = controller!.player.state.duration.inSeconds;if (duration == 0) {diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dartindex fe047a19a3..dc4ad6b2ea 100644--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart@@ -46,6 +46,7 @@ class VideoWidgetNative extends StatefulWidget {final FullScreenRequestCallback? playbackCallback;final Function(bool)? shouldDisableScroll;final bool isFromMemories;+ final bool isActive;final bool? isAudioMutedOverride;final void Function()? onStreamChange;final PlaylistData? playlistData;@@ -58,6 +59,7 @@ class VideoWidgetNative extends StatefulWidget {this.playbackCallback,this.shouldDisableScroll,this.isFromMemories = false,+ required this.isActive,this.isAudioMutedOverride,required this.onStreamChange,super.key,@@ -115,7 +117,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>resumeVideoSubscription = Bus.instance.on<ResumeVideoEvent>().listen((event,) {- _controller?.play();+ if (widget.isActive) _controller?.play();});if (!widget.isFromMemories) {_muteSubscription = Bus.instance.on<VideoMuteChangedEvent>().listen((@@ -163,6 +165,9 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>@overridevoid didUpdateWidget(covariant VideoWidgetNative oldWidget) {super.didUpdateWidget(oldWidget);+ if (oldWidget.isActive != widget.isActive) {+ unawaited(_syncPlayback());+ }if (oldWidget.isAudioMutedOverride != widget.isAudioMutedOverride) {unawaited(_applyVolume());}@@ -180,7 +185,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>);await _controller?.loadVideo(videoSource);await _applyVolume();- await _controller?.play();+ await _syncPlayback();Bus.instance.fire(SeekbarTriggeredEvent(position: 0));}@@ -387,7 +392,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>}},onLongPressUp: () {- if (widget.isFromMemories) {+ if (widget.isFromMemories && widget.isActive) {widget.playbackCallback?.call(true,FullScreenRequestReason.userInteraction,@@ -600,7 +605,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>Future<void> _onPlaybackReady() async {if (_isPlaybackReady.value) return;await _applyVolume();- await _controller!.play();+ await _syncPlayback();final durationInSeconds = durationToSeconds(duration) ?? 10;widget.onFinalFileLoad?.call(memoryDuration: durationInSeconds);_isPlaybackReady.value = true;@@ -608,7 +613,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>void _onPlaybackEnded() async {await _controller?.stop();- if (localSettings.shouldLoopVideo()) {+ if (widget.isActive && localSettings.shouldLoopVideo()) {Bus.instance.fire(SeekbarTriggeredEvent(position: 0));await _controller?.play();}@@ -625,6 +630,16 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>}}+ Future<void> _syncPlayback() async {+ final controller = _controller;+ if (controller == null) return;+ if (widget.isActive) {+ await controller.play();+ } else {+ await controller.pause();+ }+ }+void _loadNetworkVideo(bool update) {getFileFromServer(widget.file,diff --git a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dartindex 7ee9a4d8ae..d5f5542011 100644--- a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart+++ b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart@@ -88,6 +88,16 @@ void main() {expect(player.loadedAssets.last, "assets/track-2.mp3");expect(player.position, Duration.zero);});++ test("a failed track load can be retried", () async {+ player.failNextLoad = true;++ await controller.activateMemory("memory-1", currentItemIsVideo: false);+ await controller.activateMemory("memory-1", currentItemIsVideo: false);++ expect(player.loadAttempts, 2);+ expect(player.playing, isTrue);+ });}class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {@@ -96,12 +106,19 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {bool playing = false;double volume = 1.0;Duration position = Duration.zero;+ bool failNextLoad = false;+ int loadAttempts = 0;@overrideFuture<void> configureAudioSession() async {}@overrideFuture<void> loadAsset(String assetPath) async {+ loadAttempts++;+ if (failNextLoad) {+ failNextLoad = false;+ throw StateError("load failed");+ }loadedAssets.add(assetPath);position = Duration.zero;}