π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Apply mute changes immediately
ashilknc04ea1883c5f
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dartindex 4abf1caada..86930ed359 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart@@ -94,7 +94,7 @@ class MemoryMusicController extends ChangeNotifier {final isMuted = !_isMuted;_isMuted = isMuted;notifyListeners();- final synchronizePlayback = _synchronizePlayback();+ final synchronizePlayback = _synchronizePlayback(immediately: true);try {await _persistMuted(isMuted);} catch (error, stackTrace) {@@ -109,7 +109,7 @@ class MemoryMusicController extends ChangeNotifier {Future<void> setAppActive(bool isActive) async {if (_setPauseReason(_MemoryMusicPauseReason.appBackground, !isActive)) {- await _synchronizePlayback(pauseImmediately: !isActive);+ await _synchronizePlayback(immediately: !isActive);}}@@ -125,7 +125,7 @@ class MemoryMusicController extends ChangeNotifier {: _pauseReasons.remove(reason);}- Future<void> _synchronizePlayback({bool pauseImmediately = false}) async {+ Future<void> _synchronizePlayback({bool immediately = false}) async {if (_isDisposed) return;final shouldPlay =_status == _MemoryMusicPlaybackStatus.ready &&@@ -133,11 +133,9 @@ class MemoryMusicController extends ChangeNotifier {_pauseReasons.isEmpty;try {if (shouldPlay) {- await _player.play();- } else if (pauseImmediately) {- await _player.pauseImmediately();+ await (immediately ? _player.playImmediately() : _player.play());} else {- await _player.pause();+ await (immediately ? _player.pauseImmediately() : _player.pause());}} catch (error, stackTrace) {if (_isDisposed) return;diff --git a/mobile/apps/photos/lib/services/memories/memory_music_player.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dartindex 2204639895..07a3bf7bfa 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_player.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart@@ -13,6 +13,8 @@ abstract interface class MemoryMusicPlayer {Future<void> play();+ Future<void> playImmediately();+Future<void> pause();Future<void> pauseImmediately();@@ -56,20 +58,20 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {if (!_player.playing) {await _player.setVolume(0);if (generation != _fadeGeneration) return;- unawaited(- _player.play().catchError((Object error, StackTrace stackTrace) {- _logger.fine(- "Failed to start memory music playback",- error,- stackTrace,- );- }),- );+ _startPlayback();}await _fadeTo(1, _fadeInDuration, generation);});}+ @override+ Future<void> playImmediately() async {+ final generation = ++_fadeGeneration;+ await _player.setVolume(1);+ if (generation != _fadeGeneration) return;+ _startPlayback();+ }+@overrideFuture<void> pause() {final generation = ++_fadeGeneration;@@ -116,6 +118,19 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {}}+ void _startPlayback() {+ if (_player.playing) return;+ unawaited(+ _player.play().catchError((Object error, StackTrace stackTrace) {+ _logger.fine(+ "Failed to start memory music playback",+ error,+ stackTrace,+ );+ }),+ );+ }+Future<void> _enqueueFade(int generation, Future<void> Function() operation) {final result = _fadeQueue.then((_) async {if (generation == _fadeGeneration) await operation();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 3f9ee7e9ff..04f2eb781a 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@@ -72,10 +72,12 @@ void main() {await controller.toggleMuted();expect(player.playing, isFalse);+ expect(player.pausedImmediately, isTrue);expect(persistedMuteValues, <bool>[true]);await controller.toggleMuted();expect(player.playing, isTrue);+ expect(player.playedImmediately, isTrue);expect(persistedMuteValues, <bool>[true, false]);});@@ -158,6 +160,7 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {final List<String> loadedAssets = <String>[];bool looping = false;bool playing = false;+ bool playedImmediately = false;bool pausedImmediately = false;bool failNextLoad = false;int loadAttempts = 0;@@ -191,6 +194,13 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {playing = true;}+ @override+ Future<void> playImmediately() async {+ playAttempts++;+ playedImmediately = true;+ playing = true;+ }+@overrideFuture<void> pause() async {playing = false;