fix: use adjustment time in iOS for hash reset

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -89,7 +89,10 @@ data class PlatformAsset (
   val height: Long? = null,
   val durationInSeconds: Long,
   val orientation: Long,
-  val isFavorite: Boolean
+  val isFavorite: Boolean,
+  val adjustmentTime: Long? = null,
+  val latitude: Double? = null,
+  val longitude: Double? = null
 )
  {
   companion object {
@@ -104,7 +107,10 @@ data class PlatformAsset (
       val durationInSeconds = pigeonVar_list[7] as Long
       val orientation = pigeonVar_list[8] as Long
       val isFavorite = pigeonVar_list[9] as Boolean
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite)
+      val adjustmentTime = pigeonVar_list[10] as Long?
+      val latitude = pigeonVar_list[11] as Double?
+      val longitude = pigeonVar_list[12] as Double?
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude)
     }
   }
   fun toList(): List<Any?> {
@@ -119,6 +125,9 @@ data class PlatformAsset (
       durationInSeconds,
       orientation,
       isFavorite,
+      adjustmentTime,
+      latitude,
+      longitude,
     )
   }
   override fun equals(other: Any?): Boolean {

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
-import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Base64

mobile/ios/Runner/Sync/Messages.g.swift

@@ -140,6 +140,9 @@ struct PlatformAsset: Hashable {
   var durationInSeconds: Int64
   var orientation: Int64
   var isFavorite: Bool
+  var adjustmentTime: Int64? = nil
+  var latitude: Double? = nil
+  var longitude: Double? = nil
 
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -154,6 +157,9 @@ struct PlatformAsset: Hashable {
     let durationInSeconds = pigeonVar_list[7] as! Int64
     let orientation = pigeonVar_list[8] as! Int64
     let isFavorite = pigeonVar_list[9] as! Bool
+    let adjustmentTime: Int64? = nilOrValue(pigeonVar_list[10])
+    let latitude: Double? = nilOrValue(pigeonVar_list[11])
+    let longitude: Double? = nilOrValue(pigeonVar_list[12])
 
     return PlatformAsset(
       id: id,
@@ -165,7 +171,10 @@ struct PlatformAsset: Hashable {
       height: height,
       durationInSeconds: durationInSeconds,
       orientation: orientation,
-      isFavorite: isFavorite
+      isFavorite: isFavorite,
+      adjustmentTime: adjustmentTime,
+      latitude: latitude,
+      longitude: longitude
     )
   }
   func toList() -> [Any?] {
@@ -180,6 +189,9 @@ struct PlatformAsset: Hashable {
       durationInSeconds,
       orientation,
       isFavorite,
+      adjustmentTime,
+      latitude,
+      longitude,
     ]
   }
   static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {

mobile/ios/Runner/Sync/PHAssetExtensions.swift

@@ -12,7 +12,10 @@ extension PHAsset {
       height: Int64(pixelHeight),
       durationInSeconds: Int64(duration),
       orientation: 0,
-      isFavorite: isFavorite
+      isFavorite: isFavorite,
+      adjustmentTime: adjustmentTimestamp,
+      latitude: location?.coordinate.latitude,
+      longitude: location?.coordinate.longitude
     )
   }
 
@@ -23,6 +26,13 @@ extension PHAsset {
   var filename: String? {
     return value(forKey: "filename") as? String
   }
+
+  var adjustmentTimestamp: Int64? {
+    if let date = value(forKey: "adjustmentTimestamp") as? Date {
+      return Int64(date.timeIntervalSince1970)
+    }
+    return nil
+  }
 
   // This method is expected to be slow as it goes through the asset resources to fetch the originalFilename
   var originalFilename: String? {

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -5,6 +5,10 @@ class LocalAsset extends BaseAsset {
   final String? remoteAssetId;
   final int orientation;
 
+  final DateTime? adjustmentTime;
+  final double? latitude;
+  final double? longitude;
+
   const LocalAsset({
     required this.id,
     String? remoteId,
@@ -19,6 +23,9 @@ class LocalAsset extends BaseAsset {
     super.isFavorite = false,
     super.livePhotoVideoId,
     this.orientation = 0,
+    this.adjustmentTime,
+    this.latitude,
+    this.longitude,
   }) : remoteAssetId = remoteId;
 
   @override
@@ -33,6 +40,8 @@ class LocalAsset extends BaseAsset {
   @override
   String get heroTag => '${id}_${remoteId ?? checksum}';
 
+  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
+
   @override
   String toString() {
     return '''LocalAsset {
@@ -47,6 +56,9 @@ class LocalAsset extends BaseAsset {
    remoteId: ${remoteId ?? "<NA>"}
    isFavorite: $isFavorite,
   orientation: $orientation,
+  adjustmentTime: $adjustmentTime,
+  latitude: ${latitude ?? "<NA>"},
+  longitude: ${longitude ?? "<NA>"},
  }''';
   }
 
@@ -55,11 +67,23 @@ class LocalAsset extends BaseAsset {
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
     if (identical(this, other)) return true;
-    return super == other && id == other.id && orientation == other.orientation;
+    return super == other &&
+        id == other.id &&
+        orientation == other.orientation &&
+        adjustmentTime == other.adjustmentTime &&
+        latitude == other.latitude &&
+        longitude == other.longitude;
   }
 
   @override
-  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
+  int get hashCode =>
+      super.hashCode ^
+      id.hashCode ^
+      remoteId.hashCode ^
+      orientation.hashCode ^
+      adjustmentTime.hashCode ^
+      latitude.hashCode ^
+      longitude.hashCode;
 
   LocalAsset copyWith({
     String? id,
@@ -74,6 +98,9 @@ class LocalAsset extends BaseAsset {
     int? durationInSeconds,
     bool? isFavorite,
     int? orientation,
+    DateTime? adjustmentTime,
+    double? latitude,
+    double? longitude,
   }) {
     return LocalAsset(
       id: id ?? this.id,
@@ -88,6 +115,9 @@ class LocalAsset extends BaseAsset {
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
+      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
+      latitude: latitude ?? this.latitude,
+      longitude: longitude ?? this.longitude,
     );
   }
 }

mobile/lib/domain/services/local_sync.service.dart

@@ -286,11 +286,23 @@ class LocalSyncService {
   }
 
   bool _assetsEqual(LocalAsset a, LocalAsset b) {
-    return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
+    if (CurrentPlatform.isAndroid) {
+      return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
+          a.createdAt.isAtSameMomentAs(b.createdAt) &&
+          a.width == b.width &&
+          a.height == b.height &&
+          a.durationInSeconds == b.durationInSeconds;
+    }
+
+    final firstAdjustment = a.adjustmentTime?.millisecondsSinceEpoch ?? 0;
+    final secondAdjustment = b.adjustmentTime?.millisecondsSinceEpoch ?? 0;
+    return firstAdjustment == secondAdjustment &&
         a.createdAt.isAtSameMomentAs(b.createdAt) &&
         a.width == b.width &&
         a.height == b.height &&
-        a.durationInSeconds == b.durationInSeconds;
+        a.durationInSeconds == b.durationInSeconds &&
+        a.latitude == b.latitude &&
+        a.longitude == b.longitude;
   }
 
   bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
@@ -376,5 +388,8 @@ extension PlatformToLocalAsset on PlatformAsset {
     durationInSeconds: durationInSeconds,
     isFavorite: isFavorite,
     orientation: orientation,
+    adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
+    latitude: latitude,
+    longitude: longitude,
   );
 }

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -16,6 +16,12 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
 
   IntColumn get orientation => integer().withDefault(const Constant(0))();
 
+  DateTimeColumn get adjustmentTime => dateTime().nullable()();
+
+  RealColumn get latitude => real().nullable()();
+
+  RealColumn get longitude => real().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -34,5 +40,8 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     width: width,
     remoteId: remoteId,
     orientation: orientation,
+    adjustmentTime: adjustmentTime,
+    latitude: latitude,
+    longitude: longitude,
   );
 }