Manos Chorianopoulos

locationServices enable request fix

......@@ -116,32 +116,41 @@ import CoreMotion
// MARK: Actions
@IBAction private func tripButtonTapped(_ sender: UIButton) {
if (mIsTripStarted == true) {
DispatchQueue.global().async {
if (!self.locationServicesIsEnabled()) {
self.onLocationServicesIsDisabled();
return;
}
DispatchQueue.main.async {
if (self.mIsTripStarted == true) {
// Stop trip
stopTrip()
self.stopTrip()
} else {
// Start trip
if let limitText = accelerationLimitTextField.text, limitText.isEmpty {
if let limitText = self.accelerationLimitTextField.text, limitText.isEmpty {
// Handle empty limit field
return
}
// Disable UI elements
accelerationLimitTextField.isEnabled = false
sampleTimeTextField.isEnabled = false
self.accelerationLimitTextField.isEnabled = false
self.sampleTimeTextField.isEnabled = false
// Start location and sensor updates
requestLocationUpdates()
// registerSensor()
self.requestLocationUpdates()
// registerSensor()
mIsTripStarted = true
orientationCountLabel.text = "0"
touchCountLabel.text = "0"
tripButton.setTitle("Stop Trip", for: .normal)
mStartTimestamp = String(Int(Date().timeIntervalSince1970 * 1000)) // time in milliseconds since January 1, 1970
initializeOrientation()
startTimer()
self.mIsTripStarted = true
self.orientationCountLabel.text = "0"
self.touchCountLabel.text = "0"
self.tripButton.setTitle("Stop Trip", for: .normal)
self.mStartTimestamp = String(Int(Date().timeIntervalSince1970 * 1000)) // time in milliseconds since January 1, 1970
self.initializeOrientation()
self.startTimer()
}
}
}
}
......@@ -289,21 +298,25 @@ import CoreMotion
}
private func requestLocationUpdates() {
DispatchQueue.global().async {
if CLLocationManager.locationServicesEnabled() {
locationManager.desiredAccuracy = kCLLocationAccuracyBest
// locationManager.requestLocation()
self.locationManager.desiredAccuracy = kCLLocationAccuracyBest
// locationManager.requestLocation()
if (!locationServicesIsEnabled()) {
onLocationServicesIsDisabled();
if (!self.locationServicesIsEnabled()) {
self.onLocationServicesIsDisabled();
}
else if (authorizationStatusIsDenied(status: CLLocationManager.authorizationStatus())) {
onAuthorizationStatusIsDenied();
else if (self.authorizationStatusIsDenied(status: CLLocationManager.authorizationStatus())) {
self.onAuthorizationStatusIsDenied();
}
else if (authorizationStatusNeedRequest(status: CLLocationManager.authorizationStatus())) {
onAuthorizationStatusNeedRequest();
else if (self.authorizationStatusNeedRequest(status: CLLocationManager.authorizationStatus())) {
self.onAuthorizationStatusNeedRequest();
}
else if (authorizationStatusIsGranted(status: CLLocationManager.authorizationStatus())) {
onAuthorizationStatusIsGranted();
else if (self.authorizationStatusIsGranted(status: CLLocationManager.authorizationStatus())) {
self.onAuthorizationStatusIsGranted();
}
} else {
self.onLocationServicesIsDisabled();
}
}
}
......