Skip to content

Commit ec25a53

Browse files
committed
Possible fix for recent changes
1 parent c56e633 commit ec25a53

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/ubuntu.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111
distribution: 'zulu'
1212
java-version: '11'
1313
- uses: subosito/flutter-action@v2
14+
with:
15+
channel: stable
16+
flutter-version: 3.16.9
1417
- uses: actions-rs/toolchain@v1
1518
with:
1619
toolchain: nightly

lib/findMy/decrypt_reports.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DecryptReports {
1717

1818
final ephemeralKeys = reports.map((report) {
1919
final payloadData = report.payload;
20-
final ephemeralKeyBytes = payloadData.sublist(5, 62);
20+
final ephemeralKeyBytes = payloadData.sublist(payloadData.length - 16 - 10 - 57, payloadData.length - 16 - 10);
2121
return ephemeralKeyBytes;
2222
}).toList();
2323

@@ -52,8 +52,8 @@ class DecryptReports {
5252
final derivedKey = _kdf(sharedKeys[index], ephemeralKeys[index]);
5353
final payloadData = report.payload;
5454
_decodeTimeAndConfidence(payloadData, report);
55-
final encData = payloadData.sublist(62, 72);
56-
final tag = payloadData.sublist(72, payloadData.length);
55+
final encData = payloadData.sublist(payloadData.length - 16 - 10, payloadData.length - 16);
56+
final tag = payloadData.sublist(payloadData.length - 16, payloadData.length);
5757
final decryptedPayload = _decryptPayload(encData, derivedKey, tag);
5858
final locationReport = _decodePayload(decryptedPayload, report);
5959
return locationReport;

0 commit comments

Comments
 (0)