Submit a oneshot location during background fetch only if location is…

… enabled, otherwise do a simple device identify
home-assistant · Apr 21, 2017 · abe1d5e · abe1d5e
1 parent 9091df6
commit abe1d5e
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/HomeAssistant/AppDelegate.swift b/HomeAssistant/AppDelegate.swift
@@ -171,16 +171,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                                       deviceID: keychain["deviceID"])
             }
         }
-        HomeAssistantAPI.sharedInstance.sendOneshotLocation().then { success -> Void in
-            if success == true {
+        if HomeAssistantAPI.sharedInstance.locationEnabled {
+            HomeAssistantAPI.sharedInstance.sendOneshotLocation().then { success -> Void in
+                if success == true {
+                    completionHandler(UIBackgroundFetchResult.newData)
+                } else {
+                    completionHandler(UIBackgroundFetchResult.failed)
+                }
+                }.catch {error in
+                    print("Error when attempting to submit location update during background fetch")
+                    Crashlytics.sharedInstance().recordError(error)
+                    completionHandler(UIBackgroundFetchResult.failed)
+            }
+        } else {
+            HomeAssistantAPI.sharedInstance.identifyDevice().then { _ -> Void in
                 completionHandler(UIBackgroundFetchResult.newData)
-            } else {
+            }.catch {error in
+                print("Error when attempting to identify device during background fetch")
+                Crashlytics.sharedInstance().recordError(error)
                 completionHandler(UIBackgroundFetchResult.failed)
             }
-        }.catch {error in
-            print("Error when attempting to submit location update")
-            Crashlytics.sharedInstance().recordError(error)
-            completionHandler(UIBackgroundFetchResult.failed)
         }
     }