From e026b59208097ed4dd0490e62582c651eb5c6bb9 Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Sat, 28 Oct 2023 09:46:00 +0200
Subject: [PATCH 1/2] Medtrum: Skip record if it fails

---
 .../interfaces/notifications/Notification.kt  |  1 +
 .../pump/medtrum/services/MedtrumService.kt   | 23 +++++++++++++++++--
 pump/medtrum/src/main/res/values/strings.xml  |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt
index f9eb549c7b..336b16afe5 100644
--- a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt
+++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt
@@ -139,6 +139,7 @@ open class Notification {
         const val PUMP_TIMEZONE_UPDATE_FAILED = 85
         const val BLUETOOTH_NOT_SUPPORTED = 86
         const val PUMP_WARNING = 87
+        const val PUMP_SYNC_ERROR = 88
 
         const val USER_MESSAGE = 1000
 
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
index 887c4c1a95..49a93bc68c 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
@@ -559,10 +559,29 @@ class MedtrumService : DaggerService(), BLECommCallback {
     private fun syncRecords(): Boolean {
         aapsLogger.debug(LTag.PUMP, "syncRecords: called!, syncedSequenceNumber: ${medtrumPump.syncedSequenceNumber}, currentSequenceNumber: ${medtrumPump.currentSequenceNumber}")
         var result = true
+        var failureCount = 0
         if (medtrumPump.syncedSequenceNumber < medtrumPump.currentSequenceNumber) {
             for (sequence in (medtrumPump.syncedSequenceNumber + 1)..medtrumPump.currentSequenceNumber) {
-                result = sendPacketAndGetResponse(GetRecordPacket(injector, sequence), COMMAND_SYNC_TIMEOUT_SEC)
-                if (!result) break
+                val packet = GetRecordPacket(injector, sequence)
+                result = sendPacketAndGetResponse(packet, COMMAND_SYNC_TIMEOUT_SEC)
+                if (!result && packet.failed) {
+                    // Record may be broken for unkown reasons, try the next packet if that fails abort
+                    failureCount++                    
+                    if (failureCount == 1) {
+                        // Show notification to alert user of failure
+                        uiInteraction.addNotificationWithSound(
+                            Notification.PUMP_SYNC_ERROR,
+                            rh.gs(R.string.pump_sync_error),
+                            Notification.URGENT,
+                            app.aaps.core.ui.R.raw.alarm
+                        )
+                    } else if (failureCount >= 2) {
+                        break
+                    }
+                } else if (!result) {
+                    // Communication timeout, try again
+                    break
+                }
             }
         }
         return result
diff --git a/pump/medtrum/src/main/res/values/strings.xml b/pump/medtrum/src/main/res/values/strings.xml
index f2a283e42f..10e4496dc8 100644
--- a/pump/medtrum/src/main/res/values/strings.xml
+++ b/pump/medtrum/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="pump_is_suspended_day_max">Pump is suspended due to daily max insulin exceeded</string>
     <string name="patch_not_active">Patch not activated</string>
     <string name="pump_setting_failed">Setting user settings to pump failed!</string>
+    <string name="pump_sync_error">Error while syncing history from pump, a record has been skipped. Check treatment tab to check if bolus is synced correctly. Snooze and if error keep coming back change patch or pumpbase.</string>
 
     <!-- overview fragment -->
     <string name="ble_status_label">BLE Status</string>

From 68d45aae4fd092959376d25f1d85560e20200afb Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Sun, 29 Oct 2023 06:57:43 +0100
Subject: [PATCH 2/2] Medtrum: Add log line

---
 .../info/nightscout/pump/medtrum/services/MedtrumService.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
index 49a93bc68c..4d9d52dd38 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
@@ -566,7 +566,8 @@ class MedtrumService : DaggerService(), BLECommCallback {
                 result = sendPacketAndGetResponse(packet, COMMAND_SYNC_TIMEOUT_SEC)
                 if (!result && packet.failed) {
                     // Record may be broken for unkown reasons, try the next packet if that fails abort
-                    failureCount++                    
+                    failureCount++
+                    aapsLogger.error(LTag.PUMPCOMM, "Failed to sync record $sequence, failureCount: $failureCount")
                     if (failureCount == 1) {
                         // Show notification to alert user of failure
                         uiInteraction.addNotificationWithSound(