π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Restore filename date precedence and stabilize sync cutoff
laurenspriemb1dcbdf9b48d
diff --git a/mobile/apps/photos/lib/module/metadata/asset_date_times.dart b/mobile/apps/photos/lib/module/metadata/asset_date_times.dartindex f4d9999612..bdb857898e 100644--- a/mobile/apps/photos/lib/module/metadata/asset_date_times.dart+++ b/mobile/apps/photos/lib/module/metadata/asset_date_times.dart@@ -16,10 +16,15 @@ const _minDateTimeSecondsSinceEpoch = -_maxDateTimeSecondsSinceEpoch;typedef AssetDateTimes = ({int creationTime, int modificationTime});/// Compares at the whole-second precision provided by photo_manager.-bool isAssetAtOrAfterSyncCutoff(AssetDateTimes dateTimes, int cutoffTime) {- final latestAssetTimeSecond =- max(dateTimes.creationTime, dateTimes.modificationTime) ~/- Duration.microsecondsPerSecond;+///+/// Uses the raw asset timestamps, counting invalid ones as epoch, so that+/// assets with broken dates are picked up during first import (cutoff 0) but+/// not re-flagged as updated on every incremental sync.+bool isAssetAtOrAfterSyncCutoff(AssetEntity asset, int cutoffTime) {+ final latestAssetTimeSecond = max(+ _validSecondsSinceEpoch(asset.createDateSecond) ?? 0,+ _validSecondsSinceEpoch(asset.modifiedDateSecond) ?? 0,+ );final cutoffTimeSecond = cutoffTime ~/ Duration.microsecondsPerSecond;return latestAssetTimeSecond >= cutoffTimeSecond;}@@ -31,49 +36,25 @@ AssetDateTimes resolveAssetDateTimes(AssetEntity asset) {asset.modifiedDateSecond,);- if (creationTime == null && modificationTime == null) {+ if (creationTime == null || modificationTime == null) {_logger.warning(- "Asset creation and modification times are invalid; using upload time",- );- return (creationTime: uploadTime, modificationTime: uploadTime);- }- if (creationTime == null) {- _logger.info(- "Asset creation time is invalid; resolving from modification time",- );- final resolvedCreationTime = _resolveCreationTime(- asset,- modificationTime!,- modificationTime,- uploadTime,- );- return (- creationTime: resolvedCreationTime,- modificationTime: modificationTime,- );- }- if (modificationTime == null) {- _logger.info("Asset modification time is invalid; using creation time");- final resolvedCreationTime = _resolveCreationTime(- asset,- creationTime,- creationTime,- uploadTime,- );- return (- creationTime: resolvedCreationTime,- modificationTime: resolvedCreationTime,+ "LocalID: ${asset.id} has invalid raw date(s) "+ "(createDateSecond: ${asset.createDateSecond}, "+ "modifiedDateSecond: ${asset.modifiedDateSecond}); using fallbacks",);}+ // A missing creation time is treated as pre-1981 so the filename and+ // modification-time fallbacks in _resolveCreationTime apply to it.+ final resolvedCreationTime = _resolveCreationTime(+ asset,+ creationTime ?? 0,+ modificationTime ?? 0,+ uploadTime,+ );return (- creationTime: _resolveCreationTime(- asset,- creationTime,- modificationTime,- uploadTime,- ),- modificationTime: modificationTime,+ creationTime: resolvedCreationTime,+ modificationTime: modificationTime ?? resolvedCreationTime,);}@@ -89,7 +70,7 @@ int _resolveCreationTime(// filesystem creation time. Embedded metadata may replace this on upload.if (modificationTime >= jan011981Time && modificationTime < creationTime) {_logger.info(- "Asset modification time is less than creation time. "+ "LocalID: ${asset.id} modification time is less than creation time. ""Using modification time as creation time",);resolvedCreationTime = modificationTime;@@ -110,11 +91,19 @@ int _resolveCreationTime(}}-int? _validMicrosecondsSinceEpoch(int? secondsSinceEpoch) {+int? _validSecondsSinceEpoch(int? secondsSinceEpoch) {if (secondsSinceEpoch == null ||secondsSinceEpoch < _minDateTimeSecondsSinceEpoch ||secondsSinceEpoch > _maxDateTimeSecondsSinceEpoch) {return null;}- return secondsSinceEpoch * Duration.microsecondsPerSecond;+ return secondsSinceEpoch;+}++int? _validMicrosecondsSinceEpoch(int? secondsSinceEpoch) {+ final validSeconds = _validSecondsSinceEpoch(secondsSinceEpoch);+ if (validSeconds == null) {+ return null;+ }+ return validSeconds * Duration.microsecondsPerSecond;}diff --git a/mobile/apps/photos/lib/module/metadata/local_file.dart b/mobile/apps/photos/lib/module/metadata/local_file.dartindex 68768625ce..5810eafb56 100644--- a/mobile/apps/photos/lib/module/metadata/local_file.dart+++ b/mobile/apps/photos/lib/module/metadata/local_file.dart@@ -8,12 +8,8 @@ import "package:photos/models/location/location.dart";import "package:photos/module/metadata/asset_date_times.dart";import "package:photos/module/metadata/exif.dart";-EnteFile fileFromAsset(- String deviceFolder,- AssetEntity asset, {- AssetDateTimes? dateTimes,-}) {- final resolvedDateTimes = dateTimes ?? resolveAssetDateTimes(asset);+EnteFile fileFromAsset(String deviceFolder, AssetEntity asset) {+ final resolvedDateTimes = resolveAssetDateTimes(asset);return EnteFile()..localID = asset.id..title = asset.titlediff --git a/mobile/apps/photos/lib/services/sync/import/local_assets.dart b/mobile/apps/photos/lib/services/sync/import/local_assets.dartindex 30a3009c1b..5aa9811ec7 100644--- a/mobile/apps/photos/lib/services/sync/import/local_assets.dart+++ b/mobile/apps/photos/lib/services/sync/import/local_assets.dart@@ -215,14 +215,13 @@ Tuple2<Set<String>, List<EnteFile>> _getLocalIDsAndFilesFromAssets(final Set<String> localIDs = {};for (AssetEntity entity in assetList) {localIDs.add(entity.id);- final dateTimes = resolveAssetDateTimes(entity);final bool assetCreatedOrUpdatedAfterGivenTime = isAssetAtOrAfterSyncCutoff(- dateTimes,+ entity,fromTime,);if (!alreadySeenLocalIDs.contains(entity.id) &&assetCreatedOrUpdatedAfterGivenTime) {- final file = fileFromAsset(pathEntity.name, entity, dateTimes: dateTimes);+ final file = fileFromAsset(pathEntity.name, entity);files.add(file);}}