Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Krunoslav Zaher 2016-03-17 11:15:53 +01:00
commit 20113e40b0

View File

@ -23,16 +23,15 @@ class GeolocationService {
private init() {
locationManager.distanceFilter = kCLDistanceFilterNone;
locationManager.desiredAccuracy = kCLLocationAccuracyBestForNavigation;
locationManager.distanceFilter = kCLDistanceFilterNone
locationManager.desiredAccuracy = kCLLocationAccuracyBestForNavigation
weak var weakLocationManager = self.locationManager
autorized = Observable.deferred {
autorized = Observable.deferred { [weak locationManager] in
let status = CLLocationManager.authorizationStatus()
guard let strongLocationManager = weakLocationManager else {
guard let locationManager = locationManager else {
return Observable.just(status)
}
return strongLocationManager
return locationManager
.rx_didChangeAuthorizationStatus
.startWith(status)
}