Merge pull request #323 from zibra/tprzysiwek/1minute-referesh-fix

fix: 1 minute refresh rate settings not being used

Author: dhermanns

nightguard/app/NightscoutData.swift

@@ -161,10 +161,10 @@ class NightscoutData : NSObject, Codable, NSSecureCoding {
 
     func isOlderThanYMinutes() -> Bool {
         if UserDefaultsRepository.checkBGEveryMinute.value == true {
-            isOlderThan1Minute()
-        } else {
-            isOlderThan5Minutes()
+            return isOlderThan1Minute()
         }
+        
+        return isOlderThan5Minutes()
     }
 
     func isOlderThan1Minute() -> Bool {

nightguard/external/NightscoutCacheService.swift

@@ -172,7 +172,7 @@ class NightscoutCacheService: NSObject {
         serialQueue.sync {
             todaysBgData = removeYesterdaysEntries(bgValues: todaysBgData)
 
-            if todaysBgData.count == 0 || currentNightscoutData.isOlderThan5Minutes()
+            if todaysBgData.count == 0 || currentNightscoutData.isOlderThanYMinutes()
                 || currentNightscoutWasFetchedInBackground(todaysBgData: todaysBgData) {
 
                 if let task = NightscoutService.singleton.readTodaysChartData(oldValues: todaysBgData, { [unowned self] (result: NightscoutRequestResult<[BloodSugar]>) in
@@ -292,7 +292,7 @@ class NightscoutCacheService: NSObject {
 
     fileprivate func checkIfRefreshIsNeeded(_ resultHandler : @escaping (NightscoutRequestResult<NightscoutData>?) -> Void, forceRefresh: Bool = false) {
 
-        guard forceRefresh || currentNightscoutData.isOlderThan5Minutes() else {
+        guard forceRefresh || currentNightscoutData.isOlderThanYMinutes() else {
             resultHandler(nil)
             return
         }