Merge branch 'loopandlearn:main' into Main

Author: shake73

.github/workflows/build_LoopFollow.yml

@@ -5,7 +5,7 @@ on: [workflow_call, workflow_dispatch]
 jobs:
   validate-access-token:
     name: Access
-    runs-on: macos-15
+    runs-on: ubuntu-latest
     env:
       GH_PAT: ${{ secrets.GH_PAT }}
       GH_TOKEN: ${{ secrets.GH_PAT }}
@@ -71,13 +71,6 @@ jobs:
             exit 2
           fi
   
-  validate-match-secrets:
-    name: Match-Secrets
-    needs: validate-access-token
-    runs-on: macos-15
-    env:
-      GH_TOKEN: ${{ secrets.GH_PAT }}
-    steps:
       - name: Validate Match-Secrets
         run: |
           # Validate Match-Secrets
@@ -111,7 +104,7 @@ jobs:
   
   validate-fastlane-secrets:
     name: Fastlane
-    needs: [validate-access-token, validate-match-secrets]
+    needs: [validate-access-token]
     runs-on: macos-15
     env:
       GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/validate_secrets.yml

@@ -6,4 +6,4 @@
 unique_id = ${DEVELOPMENT_TEAM}
 
 //Version (DEFAULT)
-LOOP_FOLLOW_MARKETING_VERSION = 4.1.0
+LOOP_FOLLOW_MARKETING_VERSION = 4.2.0

Config.xcconfig

@@ -17,6 +17,17 @@ struct MissedReadingCondition: AlarmCondition {
         // Skip if we have *no* readings
         guard let last = data.bgReadings.last else { return false }
 
+        guard let lastChecked = Storage.shared.lastBGChecked.value else {
+            // Never checked, so don't alarm.
+            return false
+        }
+
+        let checkedAgeSeconds = now.timeIntervalSince(lastChecked)
+        if checkedAgeSeconds > 360 { // 6 minutes
+            // The check itself is stale, so the data is unreliable. Don't alarm.
+            return false
+        }
+
         let secondsSinceLast = now.timeIntervalSince(last.date)
         return secondsSinceLast >= thresholdMinutes * 60
     }

LoopFollow/Alarm/AlarmCondition/MissedReadingCondition.swift

@@ -223,11 +223,23 @@ class BluetoothDevice: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate
 
     func centralManager(_: CBCentralManager, didDisconnectPeripheral _: CBPeripheral, error _: Error?) {
         timeStampLastStatusUpdate = Date()
-
         bluetoothDeviceDelegate?.didDisconnectFrom(bluetoothDevice: self)
+        cancelConnectionTimer()
+
+        guard let ownPeripheral = peripheral else { return }
 
-        if let ownPeripheral = peripheral {
-            centralManager?.connect(ownPeripheral, options: nil)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2) { [weak self] in
+            guard let self = self,
+                  let manager = self.centralManager,
+                  manager.state == .poweredOn else { return }
+
+            switch ownPeripheral.state {
+            case .connected, .connecting:
+                // Already (re)connecting; do nothing
+                break
+            default:
+                manager.connect(ownPeripheral, options: nil)
+            }
         }
     }
 

LoopFollow/BackgroundRefresh/BT/BluetoothDevice.swift

@@ -46,6 +46,7 @@ extension MainViewController {
     func webLoadNSBGData(dexData: [ShareGlucoseData] = []) {
         // This kicks it out in the instance where dexcom fails but they aren't using NS &&
         if !IsNightscoutEnabled() {
+            Storage.shared.lastBGChecked.value = Date()
             return
         }
 
@@ -109,6 +110,8 @@ extension MainViewController {
                 // if we have Dex data, use it
                 if !dexData.isEmpty {
                     self.ProcessDexBGData(data: dexData, sourceName: "Dexcom")
+                } else {
+                    Storage.shared.lastBGChecked.value = Date()
                 }
                 return
             }
@@ -121,6 +124,7 @@ extension MainViewController {
 
         guard !data.isEmpty else {
             LogManager.shared.log(category: .nightscout, message: "No bg data received. Skipping processing.", limitIdentifier: "No bg data received. Skipping processing.")
+            Storage.shared.lastBGChecked.value = Date()
             return
         }
 
@@ -221,7 +225,10 @@ extension MainViewController {
             TaskScheduler.shared.rescheduleTask(id: .minAgoUpdate, to: Date())
 
             let entries = self.bgData
-            if entries.count < 2 { return } // Protect index out of bounds
+            if entries.count < 2 { // Protect index out of bounds
+                Storage.shared.lastBGChecked.value = Date()
+                return
+            }
 
             self.updateBGGraph()
             self.updateStats()
@@ -264,6 +271,7 @@ extension MainViewController {
                         stale: Observable.shared.bgStale.value
                     )
             }
+            Storage.shared.lastBGChecked.value = Date()
         }
     }
 }

LoopFollow/Controllers/Nightscout/BGData.swift

@@ -7,15 +7,14 @@ import UIKit
 
 extension MainViewController {
     func webLoadNSDeviceStatus() {
-        Storage.shared.lastLoopingChecked.value = Date()
-
         let parameters = ["count": "1"]
         NightscoutUtils.executeDynamicRequest(eventType: .deviceStatus, parameters: parameters) { result in
             switch result {
             case let .success(json):
                 if let jsonDeviceStatus = json as? [[String: AnyObject]] {
                     DispatchQueue.main.async {
                         self.updateDeviceStatusDisplay(jsonDeviceStatus: jsonDeviceStatus)
+                        Storage.shared.lastLoopingChecked.value = Date()
                     }
                 } else {
                     self.handleDeviceStatusError()
@@ -29,6 +28,7 @@ extension MainViewController {
     private func handleDeviceStatusError() {
         LogManager.shared.log(category: .deviceStatus, message: "Device status fetch failed!", limitIdentifier: "Device status fetch failed!")
         DispatchQueue.main.async {
+            Storage.shared.lastLoopingChecked.value = Date()
             TaskScheduler.shared.rescheduleTask(id: .deviceStatus, to: Date().addingTimeInterval(10))
             self.evaluateNotLooping()
         }

LoopFollow/Controllers/Nightscout/DeviceStatus.swift

@@ -62,16 +62,15 @@ class RemoteSettingsViewModel: ObservableObject {
 
         // Determine if a comparison is needed and perform it.
         switch remoteType {
-        case .loopAPNS, .trc:
-            // For both Loop and TRC, the target Team ID is in the same storage location.
+        case .trc:
             // If the target ID is empty, there's nothing to compare.
             guard !targetTeamId.isEmpty else {
                 return false
             }
             // Return true if the IDs are different.
             return loopFollowTeamID != targetTeamId
 
-        case .none, .nightscout:
+        case .loopAPNS, .none, .nightscout:
             // For other remote types, this check is not applicable.
             return false
         }

LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift

@@ -160,6 +160,7 @@ class Storage {
     var persistentNotificationLastBGTime = StorageValue<Date>(key: "persistentNotificationLastBGTime", defaultValue: .distantPast)
 
     var lastLoopingChecked = StorageValue<Date?>(key: "lastLoopingChecked", defaultValue: nil)
+    var lastBGChecked = StorageValue<Date?>(key: "lastBGChecked", defaultValue: nil)
 
     var alarmsPosition = StorageValue<TabPosition>(key: "alarmsPosition", defaultValue: .position2)
     var remotePosition = StorageValue<TabPosition>(key: "remotePosition", defaultValue: .more)

LoopFollow/Storage/Storage.swift

@@ -59,18 +59,6 @@ platform :ios do
       ]
     )
 
-    previous_build_number = latest_testflight_build_number(
-      app_identifier: "com.#{TEAMID}.LoopFollow",
-      api_key: api_key,
-    )
-
-    current_build_number = previous_build_number + 1
-
-    increment_build_number(
-      xcodeproj: "#{GITHUB_WORKSPACE}/LoopFollow.xcodeproj",
-      build_number: current_build_number
-    )
-    
     mapping = Actions.lane_context[
       SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING
     ]