lib-updates

update location report to new Apple format

Author: danny

macless_haystack/lib/accessory/accessory_model.dart

@@ -264,7 +264,7 @@ class Accessory {
   }
 
   void addLocationHistoryEntry(FindMyLocationReport report) {
-    var reportDate = report.timestamp ?? report.published!;
+    var reportDate = report.timestamp!;
     logger.d(
         'Adding report with timestamp $reportDate and ${report.longitude} - ${report.latitude}');
 

macless_haystack/lib/accessory/accessory_registry.dart

@@ -119,8 +119,7 @@ class AccessoryRegistry extends ChangeNotifier {
       if (reports.where((element) => !element.isEncrypted()).isNotEmpty) {
         var lastReport =
             reports.where((element) => !element.isEncrypted()).first;
-        var reportDate = (lastReport.timestamp ?? lastReport.published) ??
-            DateTime.fromMicrosecondsSinceEpoch(0);
+        var reportDate = lastReport.timestamp ?? DateTime.fromMicrosecondsSinceEpoch(0);
         if (accessory.datePublished != null &&
             reportDate.isAfter(accessory.datePublished!)) {
           accessory.datePublished = reportDate;
@@ -246,7 +245,7 @@ class AccessoryRegistry extends ChangeNotifier {
       var lastReport = decryptedReports[decryptedReports.length - 1];
       var oldTs = accessory.datePublished;
       var latestReportTS =
-          lastReport.timestamp ?? lastReport.published ?? DateTime(1971);
+          lastReport.timestamp ??  DateTime(1971);
 
       if (oldTs == null || oldTs.isBefore(latestReportTS)) {
         //only an actualization if oldTS is not set or is older than the latest of the new ones

macless_haystack/lib/findMy/decrypt_reports.dart

@@ -105,7 +105,6 @@ class DecryptReports {
         latitudeDec,
         longitudeDec,
         accuracy,
-        report.datePublished,
         report.timestamp,
         report.confidence,
         batteryStatus);

macless_haystack/lib/findMy/find_my_controller.dart

@@ -65,21 +65,15 @@ class FindMyController {
     List jsonResults = await ReportsFetcher.fetchLocationReports(
         hashedKeyKeyPairsMap.keys, daysToFetch, url, map['user'], map['pass']);
     FindMyLocationReport? latest;
-    DateTime latestDate = DateTime.fromMicrosecondsSinceEpoch(0);
     for (var result in jsonResults) {
-      DateTime currentDate =
-          DateTime.fromMillisecondsSinceEpoch(result['datePublished']);
       FindMyKeyPair keyPair =
           hashedKeyKeyPairsMap[result['id']] as FindMyKeyPair;
       var currentReport = FindMyLocationReport.decrypted(
         result,
         keyPair.getBase64PrivateKey(),
         keyPair.getHashedAdvertisementKey(),
       );
-      if (currentDate.isAfter(latestDate)) {
-        latest = currentReport;
-        latestDate = currentDate;
-      }
+      latest ??= currentReport;
       results.add(currentReport);
     }
     if (latest != null) {

macless_haystack/lib/findMy/models.dart

@@ -22,7 +22,6 @@ class FindMyLocationReport {
   double? latitude;
   double? longitude;
   int? accuracy;
-  DateTime? published;
   DateTime? timestamp;
   int? confidence;
   AccessoryBatteryStatus? batteryStatus;
@@ -34,7 +33,7 @@ class FindMyLocationReport {
   String? hash;
 
   FindMyLocationReport(this.latitude, this.longitude, this.accuracy,
-      this.published, this.timestamp, this.confidence, this.batteryStatus);
+       this.timestamp, this.confidence, this.batteryStatus);
 
   FindMyLocationReport.withHash(
       this.latitude, this.longitude, this.timestamp, this.hash) {
@@ -60,11 +59,7 @@ class FindMyLocationReport {
       await Future.delayed(const Duration(
           milliseconds: 1)); //Is needed otherwise is executed synchron
       if (isEncrypted()) {
-        final unixTimestampInMillis = result["datePublished"];
-        final datePublished =
-            DateTime.fromMillisecondsSinceEpoch(unixTimestampInMillis);
-        FindMyReport report = FindMyReport(datePublished,
-            base64Decode(result["payload"]), id!, result["statusCode"]);
+        FindMyReport report = FindMyReport(base64Decode(result["payload"]), id!, result["statusCode"]);
 
         FindMyLocationReport decryptedReport =
             await DecryptReports.decryptReport(
@@ -102,17 +97,16 @@ class Location {
 
 /// FindMy report returned by the FindMy Network
 class FindMyReport {
-  DateTime datePublished;
   Uint8List payload;
   String id;
   int statusCode;
 
   int? confidence;
   DateTime? timestamp;
 
-  FindMyReport(this.datePublished, this.payload, this.id, this.statusCode);
+  FindMyReport(this.payload, this.id, this.statusCode);
 
-  FindMyReport.completeInit(this.datePublished, this.payload, this.id,
+  FindMyReport.completeInit( this.payload, this.id,
       this.statusCode, this.confidence, this.timestamp);
 }
 

macless_haystack/pubspec.yaml

@@ -55,7 +55,7 @@ dependencies:
   # Storage
   shared_preferences: ^2.5.4
   flutter_secure_storage: ^10.0.0
-  file_picker: ^10.3.8
+  file_picker: ^10.3.10
 
   # Sharing
   share_plus: ^12.0.1
@@ -72,15 +72,15 @@ dependencies:
 
 dev_dependencies:
 
-  dependency_validator: ^5.0.3
+  dependency_validator: ^5.0.4
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^6.0.0 # Do not update
-  test: ^1.28.0
-  mockito: ^5.6.1
+  test: ^1.30.0
+  mockito: ^5.6.3
 
 # Configuration for flutter_launcher_icons
 flutter_icons: