π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Simplify iOS refresh ML task flag
laurenspriem0819db0f2662
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex 2532e225e0..6f5a2d0b5b 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -47,7 +47,6 @@ import 'package:photos/services/favorites_service.dart';import 'package:photos/services/home_widget_service.dart';import "package:photos/services/machine_learning/face_ml/person/person_service.dart";import "package:photos/services/machine_learning/ml_run_control.dart";-import "package:photos/services/machine_learning/ml_run_policy.dart";import 'package:photos/services/machine_learning/ml_service.dart';import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';import "package:photos/services/memories/memory_music_service.dart";@@ -93,6 +92,7 @@ const kBGProcessingTaskMLLockWaitIOS = Duration(seconds: 60);const kBGTaskMLSelfStopAndroid = Duration(minutes: 9);const kBGProcessingTaskMLSelfStopAndroid = Duration(minutes: 8);bool isProcessBg = true;+bool isIOSBackgroundRefresh = false;bool _stopHearBeat = false;bool _isSyncInitialized = false;bool _isRustInitialized = false;@@ -254,6 +254,8 @@ Future<void> runBackgroundTask(MlRunControl? control,bool Function()? shouldStop,}) async {+ isIOSBackgroundRefresh =+ Platform.isIOS && taskId == BgTaskUtils.iOSBackgroundAppRefreshTask;// Created at task start so a stop that fires before ML begins stays// latched for the whole task.final mlRunControl = control ?? MlRunControl();@@ -289,12 +291,7 @@ Future<void> runBackgroundTask("[BG TASK] No recent foreground activity, proceeding with background work",);- await MlRunPolicy.run(- remoteSyncOnly:- Platform.isIOS && taskId == BgTaskUtils.iOSBackgroundAppRefreshTask,- action: () =>- _runMinimally(taskId, tlog, mlRunControl, mlLockWait, shouldStop),- );+ await _runMinimally(taskId, tlog, mlRunControl, mlLockWait, shouldStop);} finally {mlSelfStopTimer?.cancel();mlForegroundWatchTimer.cancel();@@ -417,7 +414,7 @@ Future<void> _runMinimally(if (shouldStop?.call() ?? false) return;final disposition = await MLService.instance.runAllML(force: false,- remoteSyncOnly: MlRunPolicy.remoteSyncOnly,+ remoteSyncOnly: isIOSBackgroundRefresh,allowImageIndexing: BgTaskUtils.allowsImageIndexing(taskId),maxFilesToIndex: BgTaskUtils.isRefreshTask(taskId) ? 100 : null,control: mlRunControl,diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_run_policy.dart b/mobile/apps/photos/lib/services/machine_learning/ml_run_policy.dartdeleted file mode 100644index f8154a7888..0000000000--- a/mobile/apps/photos/lib/services/machine_learning/ml_run_policy.dart+++ /dev/null@@ -1,12 +0,0 @@-import "dart:async";--class MlRunPolicy {- static final _remoteSyncOnlyKey = Object();-- static bool get remoteSyncOnly => Zone.current[_remoteSyncOnlyKey] == true;-- static Future<T> run<T>({- required bool remoteSyncOnly,- required Future<T> Function() action,- }) => runZoned(action, zoneValues: {_remoteSyncOnlyKey: remoteSyncOnly});-}diff --git a/mobile/apps/photos/lib/services/magic_cache_service.dart b/mobile/apps/photos/lib/services/magic_cache_service.dartindex d3d3326360..e662c9b488 100644--- a/mobile/apps/photos/lib/services/magic_cache_service.dart+++ b/mobile/apps/photos/lib/services/magic_cache_service.dart@@ -14,6 +14,7 @@ import "package:photos/db/offline_files_db.dart";import "package:photos/events/file_uploaded_event.dart";import "package:photos/events/magic_cache_updated_event.dart";import "package:photos/events/tab_changed_event.dart";+import "package:photos/main.dart" show isIOSBackgroundRefresh;import "package:photos/models/file/extensions/file_props.dart";import "package:photos/models/file/file.dart";import "package:photos/models/ml/discover/prompt.dart";@@ -23,7 +24,6 @@ import "package:photos/models/search/hierarchical/magic_filter.dart";import "package:photos/models/search/search_types.dart";import "package:photos/module/upload/service/file_uploader.dart";import "package:photos/service_locator.dart";-import "package:photos/services/machine_learning/ml_run_policy.dart";import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";import "package:photos/services/search_service.dart";import "package:photos/ui/viewer/search/result/magic_result_screen.dart";@@ -333,7 +333,7 @@ class MagicCacheService {bool forced = false,bool interactive = false,}) async {- if (MlRunPolicy.remoteSyncOnly) return;+ if (isIOSBackgroundRefresh) return;if (!enableDiscover) {return;}diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dartindex f98f976948..4a6a6e3a54 100644--- a/mobile/apps/photos/lib/services/memories_cache_service.dart+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart@@ -18,6 +18,7 @@ import "package:photos/events/memories_setting_changed.dart";import "package:photos/events/memory_seen_event.dart";import "package:photos/events/sync_status_update_event.dart";import "package:photos/locale.dart";+import "package:photos/main.dart" show isIOSBackgroundRefresh;import "package:photos/models/file/file.dart";import "package:photos/models/memories/memories_cache.dart";import "package:photos/models/memories/memory.dart";@@ -31,7 +32,6 @@ import "package:photos/services/language_service.dart";import "package:photos/services/machine_learning/face_ml/person/person_service.dart";import "package:photos/services/machine_learning/ml_model_download_service.dart";import "package:photos/services/machine_learning/ml_run_control.dart";-import "package:photos/services/machine_learning/ml_run_policy.dart";import "package:photos/services/memories/photo_selector.dart";import "package:photos/services/notification_service.dart";import "package:photos/services/search_service.dart";@@ -695,7 +695,6 @@ class MemoriesCacheService {}Future<void> _calculateRegularFillers() async {- if (MlRunPolicy.remoteSyncOnly) return;if (_cachedMemories == null) {_cachedMemories = await smartMemoriesService.calcSimpleMemories();Bus.instance.fire(MemoriesChangedEvent());@@ -906,7 +905,7 @@ class MemoriesCacheService {}Future<void> updateCache({bool forced = false, MlRunControl? control}) async {- if (MlRunPolicy.remoteSyncOnly) return;+ if (isIOSBackgroundRefresh) return;if (!showAnyMemories) {return;}