π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Track wake lock holders per screen
r4khulc263c8e86383
diff --git a/mobile/apps/photos/lib/services/wake_lock_service.dart b/mobile/apps/photos/lib/services/wake_lock_service.dartindex 2f15537c36..6a79b27403 100644--- a/mobile/apps/photos/lib/services/wake_lock_service.dart+++ b/mobile/apps/photos/lib/services/wake_lock_service.dart@@ -2,6 +2,7 @@ import "package:wakelock_plus/wakelock_plus.dart";enum WakeLockFor {videoPlayback,+ externalVideoPlayback,machineLearningSettingsScreen,rewindViewer,largeBackupStandbyScreen,@@ -9,10 +10,17 @@ enum WakeLockFor {}class EnteWakeLockService {+ final Set<WakeLockFor> _activeWakeLocks = {};+void updateWakeLock({required bool enable,required WakeLockFor wakeLockFor,}) {- WakelockPlus.toggle(enable: enable);+ if (enable) {+ _activeWakeLocks.add(wakeLockFor);+ } else {+ _activeWakeLocks.remove(wakeLockFor);+ }+ WakelockPlus.toggle(enable: _activeWakeLocks.isNotEmpty);}}diff --git a/mobile/apps/photos/lib/ui/viewer/file/external_video_viewer.dart b/mobile/apps/photos/lib/ui/viewer/file/external_video_viewer.dartindex 1034a50f5f..96978e4fb6 100644--- a/mobile/apps/photos/lib/ui/viewer/file/external_video_viewer.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/external_video_viewer.dart@@ -8,6 +8,8 @@ import "package:flutter/services.dart";import "package:hugeicons/hugeicons.dart";import "package:logging/logging.dart";import "package:native_video_player/native_video_player.dart";+import "package:photos/service_locator.dart";+import "package:photos/services/wake_lock_service.dart";import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_button.dart";import "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";@@ -17,7 +19,6 @@ import "package:photos/ui/viewer/file/video_double_tap_seek.dart";import "package:photos/ui/viewer/file/video_seek_controller.dart";import "package:photos/ui/viewer/file/viewer_app_bar.dart";import "package:video_player/video_player.dart" as vp;-import "package:wakelock_plus/wakelock_plus.dart";class ExternalVideoViewer extends StatefulWidget {final String uri;@@ -147,10 +148,9 @@ class ExternalVideoViewerState extends State<ExternalVideoViewer>if (event.status != PlaybackStatus.playing) {setState(() => _showControls = true);}- unawaited(- WakelockPlus.toggle(- enable: _isForeground && event.status == PlaybackStatus.playing,- ),+ wakeLockService.updateWakeLock(+ enable: _isForeground && event.status == PlaybackStatus.playing,+ wakeLockFor: WakeLockFor.externalVideoPlayback,);_scheduleHideControls();case VolumeChangedEvent():@@ -210,7 +210,7 @@ class ExternalVideoViewerState extends State<ExternalVideoViewer>unawaited(_subscription?.cancel());_controller?.dispose();_controller = null;- unawaited(WakelockPlus.disable());+ _releaseWakeLock();if (_isFullscreen) unawaited(exitFullscreen());setState(() => _hasError = true);}@@ -226,7 +226,7 @@ class ExternalVideoViewerState extends State<ExternalVideoViewer>_isForeground = false;_stopLongPressSpeed();unawaited(_run(() async => _controller?.pause()));- unawaited(WakelockPlus.disable());+ _releaseWakeLock();} else if (state == AppLifecycleState.resumed) {_isForeground = true;if (_resumePlayback && _isPlaybackReady) {@@ -277,6 +277,13 @@ class ExternalVideoViewerState extends State<ExternalVideoViewer>Future<void> exitFullscreen() => _setFullscreen(false);+ void _releaseWakeLock() {+ wakeLockService.updateWakeLock(+ enable: false,+ wakeLockFor: WakeLockFor.externalVideoPlayback,+ );+ }+@overridevoid dispose() {WidgetsBinding.instance.removeObserver(this);@@ -285,7 +292,7 @@ class ExternalVideoViewerState extends State<ExternalVideoViewer>unawaited(_subscription?.cancel());_controller?.dispose();_seekController.dispose();- unawaited(WakelockPlus.disable());+ _releaseWakeLock();if (_isFullscreen) {unawaited(SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge));unawaited(