Fix misleading location warning on pull to refresh. Fixes #474.

home-assistant · Feb 12, 2020 · c6cac5d · c6cac5d
1 parent 82ced4f
commit c6cac5d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/HomeAssistant/Views/WebViewController.swift b/HomeAssistant/Views/WebViewController.swift
@@ -342,10 +342,12 @@ class WebViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
         }
         firstly {
             HomeAssistantAPI.authenticatedAPIPromise
-        }.then { api in
-            api.GetAndSendLocation(trigger: .Manual)
-        }.done {_ in
-            Current.Log.verbose("Sending current location via button press")
+        }.then { api -> Promise<Void> in
+            if Current.settingsStore.locationEnabled {
+                return api.GetAndSendLocation(trigger: .Manual).asVoid()
+            } else {
+                return when(fulfilled: [api.UpdateSensors(.Manual).asVoid(), api.updateComplications().asVoid()])
+            }
         }.catch {error in
             self.showSwiftMessageError((error as NSError).localizedDescription)
 //            let message = L10n.ManualLocationUpdateFailedNotification.message(nserror.localizedDescription)