Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Pause memory music immediately when leaving

ashilkn8d85e2e436dc
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
index 1e5f064d19..4abf1caada 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -109,7 +109,7 @@ class MemoryMusicController extends ChangeNotifier {
Future<void> setAppActive(bool isActive) async {
if (_setPauseReason(_MemoryMusicPauseReason.appBackground, !isActive)) {
- await _synchronizePlayback();
+ await _synchronizePlayback(pauseImmediately: !isActive);
}
}
@@ -125,7 +125,7 @@ class MemoryMusicController extends ChangeNotifier {
: _pauseReasons.remove(reason);
}
- Future<void> _synchronizePlayback() async {
+ Future<void> _synchronizePlayback({bool pauseImmediately = false}) async {
if (_isDisposed) return;
final shouldPlay =
_status == _MemoryMusicPlaybackStatus.ready &&
@@ -134,6 +134,8 @@ class MemoryMusicController extends ChangeNotifier {
try {
if (shouldPlay) {
await _player.play();
+ } else if (pauseImmediately) {
+ await _player.pauseImmediately();
} else {
await _player.pause();
}
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_player.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
index 2724c4b7fb..2204639895 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_player.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
@@ -15,6 +15,8 @@ abstract interface class MemoryMusicPlayer {
Future<void> pause();
+ Future<void> pauseImmediately();
+
Future<void> stop();
Future<void> dispose();
@@ -78,6 +80,12 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
});
}
+ @override
+ Future<void> pauseImmediately() {
+ _fadeGeneration++;
+ return _player.pause();
+ }
+
@override
Future<void> stop() {
final generation = ++_fadeGeneration;
@@ -86,7 +94,7 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
@override
Future<void> dispose() async {
- await pause();
+ await pauseImmediately();
final generation = ++_fadeGeneration;
await _enqueueFade(generation, _player.dispose);
}
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.dart
index 9494d5e688..3f9ee7e9ff 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
@@ -133,6 +133,7 @@ void main() {
await controller.setAppActive(false);
expect(player.playing, isFalse);
+ expect(player.pausedImmediately, isTrue);
await controller.setViewerActionPaused(true);
await controller.setAppActive(true);
@@ -157,6 +158,7 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
final List<String> loadedAssets = <String>[];
bool looping = false;
bool playing = false;
+ bool pausedImmediately = false;
bool failNextLoad = false;
int loadAttempts = 0;
int playAttempts = 0;
@@ -194,6 +196,12 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
playing = false;
}
+ @override
+ Future<void> pauseImmediately() async {
+ pausedImmediately = true;
+ playing = false;
+ }
+
@override
Future<void> stop() async {
playing = false;