Recompute insulin effect if insulinEffectStartDate is earlier than last computation

Author: ps2

Loop/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NFCReaderUsageDescription</key>
-	<string>The app uses NFC to pair with diabetes devices.</string>
 	<key>AppGroupIdentifier</key>
 	<string>$(APP_GROUP_IDENTIFIER)</string>
 	<key>AppStoreURL</key>
@@ -57,6 +55,8 @@
 	<true/>
 	<key>LoopLocalCacheDurationDays</key>
 	<string>$(LOOP_LOCAL_CACHE_DURATION_DAYS)</string>
+	<key>NFCReaderUsageDescription</key>
+	<string>The app uses NFC to pair with diabetes devices.</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>The app needs to use Bluetooth to send and receive data from your diabetes devices.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

Loop/Managers/LoopDataManager.swift

@@ -999,7 +999,7 @@ extension LoopDataManager {
             }
         }
 
-        if insulinEffect == nil {
+        if insulinEffect == nil || insulinEffect?.first?.startDate ?? .distantFuture > insulinEffectStartDate {
             self.logger.debug("Recomputing insulin effects")
             updateGroup.enter()
             doseStore.getGlucoseEffects(start: insulinEffectStartDate, end: nil, basalDosingEnd: now()) { (result) -> Void in

Loop/View Controllers/RootNavigationController.swift

@@ -22,7 +22,7 @@ class RootNavigationController: UINavigationController {
         case .carbEntry:
             statusTableViewController.presentCarbEntryScreen(nil)
         case .preMeal:
-            statusTableViewController.presentPreMealMode()
+            statusTableViewController.togglePreMealMode()
         case .bolus:
             statusTableViewController.presentBolusScreen()
         case .customPresets:

Loop/View Controllers/StatusTableViewController.swift

@@ -1469,7 +1469,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
     }
 
     private func createPreMealButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
-        let item = UIBarButtonItem(image: UIImage.preMealImage(selected: selected), style: .plain, target: self, action: #selector(togglePreMealMode(_:)))
+        let item = UIBarButtonItem(image: UIImage.preMealImage(selected: selected), style: .plain, target: self, action: #selector(premealButtonTapped(_:)))
         item.accessibilityLabel = NSLocalizedString("Pre-Meal Targets", comment: "The label of the pre-meal mode toggle button")
 
         if selected {
@@ -1545,8 +1545,12 @@ final class StatusTableViewController: LoopChartsTableViewController {
 
         present(vc, animated: true, completion: nil)
     }
+
+    @IBAction func premealButtonTapped(_ sender: UIBarButtonItem) {
+        togglePreMealMode(confirm: false)
+    }
 
-    @IBAction func togglePreMealMode(_ sender: UIBarButtonItem) {
+    func togglePreMealMode(confirm: Bool = true) {
         if preMealMode == true {
             if confirm {
                 let alert = UIAlertController(title: "Disable Pre-Meal Preset?", message: "This will remove any currently applied pre-meal preset.", preferredStyle: .alert)
@@ -1592,10 +1596,6 @@ final class StatusTableViewController: LoopChartsTableViewController {
         present(vc, animated: true, completion: nil)
     }
 
-    @IBAction func togglePreMealMode(_ sender: UIBarButtonItem) {
-        presentPreMealMode(confirm: false)
-    }
-    
     func presentCustomPresets(confirm: Bool = true) {
         if workoutMode == true {
             if confirm {