π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Limit ML decryption records to 100 files
laurenspriem84e3169980e1
diff --git a/mobile/apps/photos/changes/ml-decryption-records.md b/mobile/apps/photos/changes/ml-decryption-records.mdnew file mode 100644index 0000000000..9ec5924934--- /dev/null+++ b/mobile/apps/photos/changes/ml-decryption-records.md@@ -0,0 +1 @@+- Limited machine learning processing diagnostics to 100 file IDs to prevent excessive storage and repeated writes when many files cannot be decrypted.diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_decryption_record_store.dart b/mobile/apps/photos/lib/services/machine_learning/ml_decryption_record_store.dartindex 641912b357..7db5080dbf 100644--- a/mobile/apps/photos/lib/services/machine_learning/ml_decryption_record_store.dart+++ b/mobile/apps/photos/lib/services/machine_learning/ml_decryption_record_store.dart@@ -4,6 +4,7 @@ import "package:synchronized/synchronized.dart";class MlDecryptionRecordStore {static const _preferenceKey = "ml_decryption_record_file_ids";+ static const maxRecords = 100;final SharedPreferences _preferences;final Lock _lock = Lock();@@ -13,9 +14,9 @@ class MlDecryptionRecordStore {List<int> get fileIDs {final result = <int>{};- for (final value- in _preferences.getStringList(_preferenceKey) ?? const []) {- final fileID = int.tryParse(value);+ final values = _preferences.get(_preferenceKey) as List<Object?>?;+ for (final value in values?.take(maxRecords) ?? const []) {+ final fileID = value is String ? int.tryParse(value) : null;if (fileID != null) {result.add(fileID);}@@ -25,10 +26,16 @@ class MlDecryptionRecordStore {int get count => fileIDs.length;+ bool get _hasOversizedRecords =>+ ((_preferences.get(_preferenceKey) as List<Object?>?)?.length ?? 0) >+ maxRecords;+Future<void> add(int fileID) async {await _lock.synchronized(() async {final updatedFileIDs = fileIDs.toSet();- if (!updatedFileIDs.add(fileID)) {+ final added =+ updatedFileIDs.length < maxRecords && updatedFileIDs.add(fileID);+ if (!added && !_hasOversizedRecords) {return;}await _store(@@ -40,12 +47,11 @@ class MlDecryptionRecordStore {Future<void> removeAll(Iterable<int> fileIDs) async {final fileIDsToRemove = fileIDs.toSet();- if (fileIDsToRemove.isEmpty) return;await _lock.synchronized(() async {final updatedFileIDs = this.fileIDs.toSet();final previousCount = updatedFileIDs.length;updatedFileIDs.removeAll(fileIDsToRemove);- if (updatedFileIDs.length == previousCount) {+ if (updatedFileIDs.length == previousCount && !_hasOversizedRecords) {return;}await _store(updatedFileIDs, "Failed to prune ML decryption records");diff --git a/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart b/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dartindex cda81b0eb0..77ef2d62a3 100644--- a/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart+++ b/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart@@ -69,6 +69,7 @@ class _MachineLearningSettingsPageStateFuture<void> _pruneMlDecryptionRecords() async {final recordedFileIDs = mlDecryptionRecordStore.fileIDs;try {+ final staleFileIDs = <int>{};if (recordedFileIDs.isNotEmpty) {await MLDataDB.instance.pruneResolvedFaceErrorResults(recordedFileIDs);final existingFiles = await FilesDB.instance.getFileIDToFileFromIDs(@@ -76,15 +77,15 @@ class _MachineLearningSettingsPageState);final errorResultFileIDs = await MLDataDB.instance.getFileIDsWithErrorResults(recordedFileIDs);- final staleFileIDs = recordedFileIDs- .where(- (fileID) =>- !existingFiles.containsKey(fileID) ||- !errorResultFileIDs.contains(fileID),- )- .toSet();- await mlDecryptionRecordStore.removeAll(staleFileIDs);+ staleFileIDs.addAll(+ recordedFileIDs.where(+ (fileID) =>+ !existingFiles.containsKey(fileID) ||+ !errorResultFileIDs.contains(fileID),+ ),+ );}+ await mlDecryptionRecordStore.removeAll(staleFileIDs);} catch (error, stackTrace) {_logger.warning("Failed to prune ML decryption records",