Fixed to determine the latest value in the cached list of values

janrpn · Jan 21, 2018 · d08849b · d08849b
1 parent cc71554
commit d08849b
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 11 deletions.
diff --git a/nightguard WatchKit App/Base.lproj/Interface.storyboard b/nightguard WatchKit App/Base.lproj/Interface.storyboard
@@ -16,7 +16,7 @@
                     <items>
                         <group width="1" height="50" alignment="left" id="1AH-d7-hZo">
                             <items>
-                                <label width="80" height="37" alignment="left" text="---" textAlignment="center" minimumScaleFactor="0.5" id="vdn-99-EwA">
+                                <label width="80" height="45" alignment="left" text="---" textAlignment="center" baselineAdjustment="alignCenters" minimumScaleFactor="0.40000000000000002" id="vdn-99-EwA">
                                     <fontDescription key="font" type="system" pointSize="46"/>
                                     <variation key="device=watch38mm" width="60">
                                         <fontDescription key="font" type="system" pointSize="38"/>

diff --git a/nightguard WatchKit App/Info.plist b/nightguard WatchKit App/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/nightguard WatchKit Extension/ExtensionDelegate.swift b/nightguard WatchKit Extension/ExtensionDelegate.swift
@@ -66,7 +66,7 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate, URLSessionDelegate {
                     case _ as WKApplicationRefreshBackgroundTask:
                         // this task is completed below, our app will then suspend while the download session runs
                         print("WKApplicationRefreshBackgroundTask received, start URL session")
-                        let _ = NightscoutCacheService.singleton.loadCurrentNightscoutDataInBackground()
+                        //let _ = NightscoutCacheService.singleton.loadCurrentNightscoutDataInBackground()
                         task.setTaskCompleted()
                     case let sessionTask as WKURLSessionRefreshBackgroundTask:
 

diff --git a/nightguard WatchKit Extension/Info.plist b/nightguard WatchKit Extension/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>CLKComplicationSupportedFamilies</key>

diff --git a/nightguard WatchKit Extension/NightscoutDataRepository.swift b/nightguard WatchKit Extension/NightscoutDataRepository.swift
@@ -26,6 +26,8 @@ class NightscoutDataRepository {
         defaults?.removeObject(forKey: Constants.todaysBgData)
         defaults?.removeObject(forKey: Constants.yesterdaysBgData)
         defaults?.removeObject(forKey: Constants.yesterdaysDayOfTheYear)
+        // this shouldn't be necessary anymore - remove it later
+        defaults?.synchronize()
     }
 
     func storeCurrentNightscoutData(_ bgData : NightscoutData) {
@@ -84,6 +86,8 @@ class NightscoutDataRepository {
 
     fileprivate func storeBgData(keyName : String, _ bgData : [BloodSugar]) {
 
+        print("Storing \(bgData.count) using key \(keyName)")
+
         let defaults = UserDefaults(suiteName: AppConstants.APP_GROUP_ID)
         defaults!.set(NSKeyedArchiver.archivedData(withRootObject: bgData), forKey: keyName)
     }

diff --git a/...codeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/xcdebugger/Expressions.xcexplist b/...codeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -137,10 +137,10 @@
                value = "bloodValues[index-2].value">
             </PersistentString>
             <PersistentString
-               value = "bloodValues[index-1].value">
+               value = "deltaAmount">
             </PersistentString>
             <PersistentString
-               value = "deltaAmount">
+               value = "bloodValues[index-1].value">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -340,6 +340,14 @@
       <ContextState
          contextName = "NightscoutCacheService.yesterdaysValuesAreOutdated():NightscoutCacheService.swift">
       </ContextState>
+      <ContextState
+         contextName = "static UserDefaultsRepository.readMaximumBloodGlucoseDisplayed():UserDefaultsRepository.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "defaults.float(forKey: &quot;maximumBloodGlucoseDisplayed&quot;)">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "ComplicationController.(getCurrentTimelineEntryForComplication(CLKComplication, withHandler : (CLKComplicationTimelineEntry?) -&gt; ()) -&gt; ()).(closure #1):ComplicationController.swift">
          <PersistentStrings>

diff --git a/nightguard/Info.plist b/nightguard/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/nightguard/MainViewController.swift b/nightguard/MainViewController.swift
@@ -273,7 +273,6 @@ class MainViewController: UIViewController {
             present(alertController, animated: true, completion: nil)
 
             UserDefaults.standard.set(true, forKey: "screenlockMessageShowed")
-            UserDefaults.standard.synchronize()
         }
     }
 

diff --git a/nightguard/NightscoutService.swift b/nightguard/NightscoutService.swift
@@ -224,7 +224,7 @@ class NightscoutService {
             return Date.init(timeIntervalSince1970: 0)
         }
 
-        return Date.init(timeIntervalSince1970: oldValues.first!.timestamp / 1000)
+        return Date.init(timeIntervalSince1970: oldValues.last!.timestamp / 1000)
     }
 
     func readDay(_ nrOfDaysAgo : Int, callbackHandler : @escaping (_ nrOfDay : Int, [BloodSugar]) -> Void) {

diff --git a/nightguardTests/Info.plist b/nightguardTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 </dict>
 </plist>
diff --git a/nightguardUITests/Info.plist b/nightguardUITests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 </dict>
 </plist>
-Original file line number
+Diff line change
@@ Expand Up / @@ -273,7 +273,6 @@ class MainViewController: UIViewController { @@
                 present(alertController, animated: true, completion: nil)
                 UserDefaults.standard.set(true, forKey: "screenlockMessageShowed")
-                UserDefaults.standard.synchronize()
             }
         }
@@ Expand Down @@