From fbfb003235cca83cb76e226d4d70f1b074e3aa08 Mon Sep 17 00:00:00 2001 From: aTakeshiKominato Date: Wed, 13 Jun 2018 18:35:35 +0900 Subject: [PATCH] Fix callback for Location --- Source/PermissionTypes/Location.swift | 3 ++- Source/PermissionTypes/LocationAlways.swift | 3 ++- Source/PermissionTypes/LocationWhenInUse.swift | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/PermissionTypes/Location.swift b/Source/PermissionTypes/Location.swift index 6e6ffd4..fa7fc54 100644 --- a/Source/PermissionTypes/Location.swift +++ b/Source/PermissionTypes/Location.swift @@ -25,7 +25,7 @@ #if PERMISSION_LOCATION import CoreLocation -internal let LocationManager = CLLocationManager() +internal var LocationManager: CLLocationManager? private var requestedLocation = false private var triggerCallbacks = false @@ -51,6 +51,7 @@ extension CLLocationManager { delegate = permission requestedLocation = true + triggerCallbacks = false if case .locationAlways = permission.type { requestAlwaysAuthorization() diff --git a/Source/PermissionTypes/LocationAlways.swift b/Source/PermissionTypes/LocationAlways.swift index 898117a..99eca51 100644 --- a/Source/PermissionTypes/LocationAlways.swift +++ b/Source/PermissionTypes/LocationAlways.swift @@ -50,7 +50,8 @@ internal extension Permission { UserDefaults.standard.requestedLocationAlwaysWithWhenInUse = true } - LocationManager.request(self) + LocationManager = CLLocationManager() + LocationManager?.request(self) } } #endif diff --git a/Source/PermissionTypes/LocationWhenInUse.swift b/Source/PermissionTypes/LocationWhenInUse.swift index bbaaedc..82d72e2 100644 --- a/Source/PermissionTypes/LocationWhenInUse.swift +++ b/Source/PermissionTypes/LocationWhenInUse.swift @@ -44,7 +44,8 @@ internal extension Permission { return } - LocationManager.request(self) + LocationManager = CLLocationManager() + LocationManager?.request(self) } } #endif