Updating RileyLink frameworks

Cartfile

@@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3.5
 github "loudnate/xDripG5" ~> 0.5.0
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1
-github "ps2/rileylink_ios" ~> 0.6.0
+github "ps2/rileylink_ios" ~> 0.7.0
 github "amplitude/Amplitude-iOS" "mpurland-framework"

Cartfile.resolved

@@ -4,4 +4,4 @@ github "loudnate/LoopKit" "v0.3.5"
 github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
 github "mddub/dexcom-share-client-swift" "v0.1.3"
 github "loudnate/xDripG5" "0.5.0"
-github "ps2/rileylink_ios" "v0.6.0"
+github "ps2/rileylink_ios" "v0.7.0"

Loop.xcodeproj/project.pbxproj

@@ -577,7 +577,6 @@
 		43E344A01B9E144300C85C07 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				C51F56111D3B91CD004C46ED /* PumpModel.swift */,
 				4331E0771C85302200FBE832 /* CGPoint.swift */,
 				4346D1F51C78501000ABAFE3 /* ChartPoint.swift */,
 				43649A621C7A347F00523D7F /* CollectionType.swift */,
@@ -588,6 +587,7 @@
 				4398973A1CD2FC2000223065 /* NSDateFormatter.swift */,
 				439897341CD2F7DE00223065 /* NSTimeInterval.swift */,
 				43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */,
+				C51F56111D3B91CD004C46ED /* PumpModel.swift */,
 				43F41C361D3BF32400C11ED6 /* UIAlertController.swift */,
 				43DE92501C541832001FFDE1 /* UIColor.swift */,
 				437CEEE31CDE5C0A003C8C80 /* UIImage.swift */,

Loop/Extensions/PumpModel.swift

@@ -14,7 +14,7 @@ extension PumpModel {
         return Int(rawValue)! / 100
     }
 
-    var reservoirCapacity: Double {
+    var reservoirCapacity: Int {
         switch size {
         case 5:
             return 176

Loop/Managers/KeychainManager+Loop.swift

@@ -45,16 +45,16 @@ extension KeychainManager {
         }
     }
 
-    func setNightscoutURL(URL: NSURL?, secret: String?) throws {
-        do {
-            let credentials: InternetCredentials?
+    func setNightscoutURL(URL: NSURL?, secret: String?) {
+        let credentials: InternetCredentials?
 
-            if let URL = URL, secret = secret {
-                credentials = InternetCredentials(username: NightscoutAccount, password: secret, URL: URL)
-            } else {
-                credentials = nil
-            }
+        if let URL = URL, secret = secret {
+            credentials = InternetCredentials(username: NightscoutAccount, password: secret, URL: URL)
+        } else {
+            credentials = nil
+        }
 
+        do {
             try replaceInternetCredentials(credentials, forAccount: NightscoutAccount)
         } catch {
         }

Loop/Managers/RemoteDataManager.swift

@@ -19,7 +19,7 @@ class RemoteDataManager {
 
     var nightscoutService: NightscoutService {
         didSet {
-            try! keychain.setNightscoutURL(nightscoutService.siteURL, secret: nightscoutService.APISecret)
+            keychain.setNightscoutURL(nightscoutService.siteURL, secret: nightscoutService.APISecret)
         }
     }
 
@@ -57,7 +57,7 @@ class RemoteDataManager {
             APISecret = settings?["NightscoutAPISecret"],
             siteURL = NSURL(string: siteURLString)
         {
-            try! keychain.setNightscoutURL(siteURL, secret: APISecret)
+            keychain.setNightscoutURL(siteURL, secret: APISecret)
             nightscoutService = NightscoutService(siteURL: siteURL, APISecret: APISecret)
         } else {
             nightscoutService = NightscoutService(siteURL: nil, APISecret: nil)

Loop/Models/NightscoutService.swift

@@ -66,9 +66,17 @@ struct NightscoutService: ServiceAuthentication {
             return
         }
 
-        self.uploader = NightscoutUploader(siteURL: siteURL.absoluteString, APISecret: APISecret)
-        isAuthorized = true
-        completion(success: true, error: nil)
+        let uploader = NightscoutUploader(siteURL: siteURL, APISecret: APISecret)
+        uploader.checkAuth { (error) in
+            if let error = error {
+                self.isAuthorized = false
+                completion(success: false, error: error)
+            } else {
+                self.isAuthorized = true
+                completion(success: true, error: nil)
+            }
+        }
+        self.uploader = uploader
     }
 
     mutating func reset() {

Loop/View Controllers/StatusTableViewController.swift

@@ -209,7 +209,7 @@ class StatusTableViewController: UITableViewController, UIGestureRecognizerDeleg
 
             if let capacity = dataManager.pumpState?.pumpModel?.reservoirCapacity,
                 resVol = reservoirVolume {
-                reservoirLevel = min(1, max(0, Double(resVol / capacity)))
+                reservoirLevel = min(1, max(0, Double(resVol / Double(capacity))))
             }
 
             if let status = dataManager.latestPumpStatus {