Merge pull request #739 from LoopKit/dev

Release 1.5.6

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 1.5.5
-github "LoopKit/CGMBLEKit" ~> 2.0
+github "LoopKit/LoopKit" == 1.5.6
+github "LoopKit/CGMBLEKit" == 2.1
 github "i-schuetz/SwiftCharts" == 0.6.1
 github "mddub/dexcom-share-client-swift" == 0.4.1
 github "mddub/G4ShareSpy" == 0.3.3
 github "ps2/rileylink_ios" == 2.0.0
-github "amplitude/Amplitude-iOS" ~> 3.8.5
+github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,6 +1,6 @@
-github "LoopKit/CGMBLEKit" "v2.0"
-github "LoopKit/LoopKit" "v1.5.5"
-github "amplitude/Amplitude-iOS" "v3.14.1"
+github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
+github "LoopKit/CGMBLEKit" "v2.1.0"
+github "LoopKit/LoopKit" "v1.5.6"
 github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f"
 github "mddub/G4ShareSpy" "v0.3.3"
 github "mddub/dexcom-share-client-swift" "v0.4.1"

Common/Extensions/NSTimeInterval.swift

@@ -10,6 +10,10 @@ import Foundation
 
 
 extension TimeInterval {
+    static func seconds(_ seconds: Double) -> TimeInterval {
+        return seconds
+    }
+
     static func minutes(_ minutes: Double) -> TimeInterval {
         return TimeInterval(minutes: minutes)
     }

Common/Models/WatchContext.swift

@@ -56,14 +56,14 @@ final class WatchContext: NSObject, RawRepresentable {
         if let unitString = rawValue["gu"] as? String {
             let unit = HKUnit(from: unitString)
             preferredGlucoseUnit = unit
+        }
 
-            if let glucoseValue = rawValue["gv"] as? Double {
-                glucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
-            }
+        if let glucoseValue = rawValue["gv"] as? Double {
+            glucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter(), doubleValue: glucoseValue)
+        }
 
-            if let glucoseValue = rawValue["egv"] as? Double {
-                eventualGlucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
-            }
+        if let glucoseValue = rawValue["egv"] as? Double {
+            eventualGlucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter(), doubleValue: glucoseValue)
         }
 
         glucoseTrendRawValue = rawValue["gt"] as? Int
@@ -102,11 +102,10 @@ final class WatchContext: NSObject, RawRepresentable {
         raw["bp"] = batteryPercentage
         raw["cob"] = COB
 
-        if let unit = preferredGlucoseUnit {
-            raw["egv"] = eventualGlucose?.doubleValue(for: unit)
-            raw["gu"] = unit.unitString
-            raw["gv"] = glucose?.doubleValue(for: unit)
-        }
+        let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter()
+        raw["egv"] = eventualGlucose?.doubleValue(for: unit)
+        raw["gu"] = preferredGlucoseUnit?.unitString
+        raw["gv"] = glucose?.doubleValue(for: unit)
 
         raw["gt"] = glucoseTrendRawValue
         raw["gd"] = glucoseDate

DoseMathTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.4</string>
+	<string>1.5.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Loop Status Extension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.4</string>
+	<string>1.5.6</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>AppGroupIdentifier</key>

Loop.xcodeproj/project.pbxproj

@@ -2055,7 +2055,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 48;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2122,7 +2122,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 48;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2364,11 +2364,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 48;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 46;
+				DYLIB_CURRENT_VERSION = 48;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = LoopUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -2391,11 +2391,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 48;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 46;
+				DYLIB_CURRENT_VERSION = 48;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = LoopUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

Loop/Extensions/DoseStore.swift

@@ -18,7 +18,8 @@ extension LoopDataManager {
     func addPumpEvents(_ pumpEvents: [TimestampedHistoryEvent], from model: MinimedKit.PumpModel, completion: @escaping (_ error: DoseStore.DoseStoreError?) -> Void) {
         var events: [NewPumpEvent] = []
         var lastTempBasalAmount: DoseEntry?
-        var isRewound = false
+        // Always assume the sequence may have started rewound. LoopKit will ignore unmatched resume events.
+        var isRewound = true
         var title: String
 
         for event in pumpEvents {

Loop/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.4</string>
+	<string>1.5.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,6 +37,7 @@
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>dexcomg6</string>
 		<string>dexcomcgm</string>
 		<string>dexcomshare</string>
 	</array>
@@ -51,7 +52,7 @@ Glucose data from the Health database is used for graphing and momentum calculat
 	<string>Carbohydrate meal data entered in the app and on the watch is stored in the Health database.
 Glucose data retrieved from the CGM is stored securely in HealthKit.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>Face ID is used to authenticate insulin boluses.</string>
+	<string>Face ID is used to authenticate insulin bolus.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-central</string>