Possible fix for recent changes

wangwillian0 · Apr 14, 2024 · ec25a53 · ec25a53
1 parent c56e633
commit ec25a53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -11,6 +11,9 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - uses: subosito/flutter-action@v2
+      with:
+        channel: stable
+        flutter-version: 3.16.9
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: nightly

diff --git a/lib/findMy/decrypt_reports.dart b/lib/findMy/decrypt_reports.dart
@@ -17,7 +17,7 @@ class DecryptReports {
 
     final ephemeralKeys = reports.map((report) {
       final payloadData = report.payload;
-      final ephemeralKeyBytes = payloadData.sublist(5, 62);
+      final ephemeralKeyBytes = payloadData.sublist(payloadData.length - 16 - 10 - 57, payloadData.length - 16 - 10);
       return ephemeralKeyBytes;
     }).toList();
 
@@ -52,8 +52,8 @@ class DecryptReports {
       final derivedKey = _kdf(sharedKeys[index], ephemeralKeys[index]);
       final payloadData = report.payload;
       _decodeTimeAndConfidence(payloadData, report);
-      final encData = payloadData.sublist(62, 72);
-      final tag = payloadData.sublist(72, payloadData.length);
+      final encData = payloadData.sublist(payloadData.length - 16 - 10, payloadData.length - 16);
+      final tag = payloadData.sublist(payloadData.length - 16, payloadData.length);
       final decryptedPayload = _decryptPayload(encData, derivedKey, tag);
       final locationReport = _decodePayload(decryptedPayload, report);
       return locationReport;