ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix annoying plist reset

Browse Source
This commit is contained in:
Janez T
2026-03-07 20:00:32 +01:00
parent 1867f815d2
commit 5966ddfbc1
7 changed files with 633 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/providers/contacts_provider.dart
View File

@@ -416,19 +416,20 @@ class ContactsProvider with ChangeNotifier {
final previousTelemetry = contact.telemetry;
// Keep last valid GPS whenever current telemetry does not provide a
// valid GPS fix.
if (_shouldRetainLastValidGps(previousTelemetry, telemetry.gpsLocation)) {
debugPrint(
' ⚠️ Retaining last valid GPS. Incoming telemetry GPS is invalid/missing: $incomingGps',
);
final mergedTelemetry = _mergeTelemetryForContact(
existingTelemetry: previousTelemetry,
incomingTelemetry: telemetry,
);
if (mergedTelemetry != null) {
telemetry = mergedTelemetry;
final mergedTelemetry = _mergeTelemetryForContact(
existingTelemetry: previousTelemetry,
incomingTelemetry: telemetry,
);
if (mergedTelemetry != null) {
if (_shouldRetainLastValidGps(
previousTelemetry,
telemetry.gpsLocation,
)) {
debugPrint(
' ⚠️ Retaining last valid GPS. Incoming telemetry GPS is invalid/missing: $incomingGps',
);
}
telemetry = mergedTelemetry;
}
// Update contact with new telemetry AND last seen time
@@ -504,24 +505,28 @@ class ContactsProvider with ChangeNotifier {
}
final incomingGps = _getValidGpsOrNull(incomingTelemetry.gpsLocation);
if (incomingGps != null) {
return incomingTelemetry;
}
final previousGps = _getValidGpsOrNull(existingTelemetry?.gpsLocation);
if (previousGps == null) {
return incomingTelemetry;
}
final mergedExtraSensorData = <String, dynamic>{
...?existingTelemetry?.extraSensorData,
...?incomingTelemetry.extraSensorData,
};
return ContactTelemetry(
gpsLocation: previousGps,
batteryPercentage: incomingTelemetry.batteryPercentage,
batteryMilliVolts: incomingTelemetry.batteryMilliVolts,
temperature: incomingTelemetry.temperature,
gpsLocation: incomingGps ?? previousGps,
batteryPercentage:
incomingTelemetry.batteryPercentage ??
existingTelemetry?.batteryPercentage,
batteryMilliVolts:
incomingTelemetry.batteryMilliVolts ??
existingTelemetry?.batteryMilliVolts,
temperature:
incomingTelemetry.temperature ?? existingTelemetry?.temperature,
timestamp: incomingTelemetry.timestamp,
humidity: incomingTelemetry.humidity,
pressure: incomingTelemetry.pressure,
extraSensorData: incomingTelemetry.extraSensorData,
humidity: incomingTelemetry.humidity ?? existingTelemetry?.humidity,
pressure: incomingTelemetry.pressure ?? existingTelemetry?.pressure,
extraSensorData: mergedExtraSensorData.isEmpty
? null
: mergedExtraSensorData,
);
}