v3.0.4

Author: niki-timofe

NarodMonMenubarApp/AppDelegate.swift

@@ -21,8 +21,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         locationManager!.desiredAccuracy = kCLLocationAccuracyHundredMeters
         locationManager!.distanceFilter = 1000
 
-        userDefaults.register(defaults: ["UpdateAfterWake": 15,
-                                         "UpdateSensorsValues": 7.5 * 60])
+        userDefaults.register(defaults: ["UpdateAfterWake": 15])
 
         controller = StatusMenuController()
 
@@ -59,6 +58,7 @@ extension AppDelegate: CLLocationManagerDelegate {
     }
 
     func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        locationManager!.stopUpdatingLocation()
         NSLog("\"locationManager\" error: \(error), calling controller's \"updateLocation\" with nil argument")
         controller!.updateLocation(location: nil)
     }

NarodMonMenubarApp/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>474</string>
+	<string>485</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.weather</string>
 	<key>LSMinimumSystemVersion</key>

NarodMonMenubarApp/NarodMonAPI.swift

@@ -92,11 +92,11 @@ public class NarodMonAPI {
     ///
     /// - Returns: generated or saved UUID
     private func uuid() -> String {
-        var uuid = keychain.get("UUID")
+        var uuid = keychain.get("NarodMon Widget UUID")
 
         if (uuid == nil) {
             uuid = UUID().uuidString
-            keychain.set(uuid!, forKey: "UUID", withAccess: .accessibleAlways)
+            keychain.set(uuid!, forKey: "NarodMon Widget UUID", withAccess: .accessibleAlways)
         }
 
         return MD5(string: uuid!)

NarodMonMenubarApp/StatusMenuController.swift

@@ -25,6 +25,7 @@ class StatusMenuController: NSObject {
     var location: CLLocation?
     var fetchTimer: Timer?
     var retryCount: Int = 0
+    var sensorsNearbyUpdateInterval: Double = 450
     var querySensors: [Int] = []
 
     var wake: Date? = nil
@@ -51,7 +52,7 @@ class StatusMenuController: NSObject {
         statusMenu.addItem(NSMenuItem.separator())
         statusMenu.addItem(withTitle: "Выйти", action: #selector(StatusMenuController.quitBtnPress(sender:)), keyEquivalent: "")
 
-        narodMon = NarodMonAPI(withAPIKey: "40MHsctSKi4y6")
+        narodMon = NarodMonAPI(withAPIKey: "4Pk1qAgMhSyPc")
 
         super.init()
 
@@ -101,7 +102,7 @@ class StatusMenuController: NSObject {
     }
 
     func requestSensorsValuesUpdate(force: Bool = true) {
-        if !(force || Date().timeIntervalSince(latestValues ?? Date(timeIntervalSince1970: 0)) > userDefaults.double(forKey: "UpdateSensorsValues")) {return}
+        if !(force || Date().timeIntervalSince(latestValues ?? Date(timeIntervalSince1970: 0)) > sensorsNearbyUpdateInterval) {return}
         narodMon.sensorsValues(sensors: self.querySensors)
     }
 
@@ -122,9 +123,10 @@ extension StatusMenuController: NarodMonAPIDelegate {
         if (app == nil) {
             goOffline()
 
-            NSLog("Will retry \"appInit\" #\(retryCount + 1)")
+            let retryInterval = TimeInterval(self.retryCount < 3 ? 10 : (10 * 60))
+            NSLog("Will retry \"appInit\" #\(retryCount + 1) in \(retryInterval)s")
             DispatchQueue.main.async {
-                Timer.scheduledTimer(withTimeInterval: self.retryCount < 3 ? 10 : (10 * 60), repeats: false, block: {_ in
+                Timer.scheduledTimer(withTimeInterval: retryInterval, repeats: false, block: {_ in
                     _ = self.requestAppInitUpdate()
                 })
             }
@@ -222,8 +224,7 @@ extension StatusMenuController: NarodMonAPIDelegate {
 
             if delta != 0.0 {
                 NSLog("\"sensorsValues\" interval: \(currentInterval)s, new interval: \(newInterval)s, delta: \(delta)")
-                userDefaults.set(newInterval, forKey: "UpdateSensorsValues")
-                userDefaults.synchronize()
+                sensorsNearbyUpdateInterval = newInterval
             }
         }
 
@@ -268,6 +269,7 @@ extension StatusMenuController: NarodMonAPIDelegate {
     func gotLocation(location: CLLocation?) {
         if location == nil {
             NSLog("Failed to get new location")
+            return
         }
 
         NSLog("Got new location: \(location!.debugDescription)")