From b0c42f708199a3b02837fcc015ffb456fec6865f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 30 Nov 2017 00:59:54 +0100 Subject: [PATCH] Fix a java exception around the GPS stuff --- android/src/org/ppsspp/ppsspp/LocationHelper.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/src/org/ppsspp/ppsspp/LocationHelper.java b/android/src/org/ppsspp/ppsspp/LocationHelper.java index 9a7b231c8f..c6f4797d61 100644 --- a/android/src/org/ppsspp/ppsspp/LocationHelper.java +++ b/android/src/org/ppsspp/ppsspp/LocationHelper.java @@ -20,17 +20,18 @@ class LocationHelper implements LocationListener { void startLocationUpdates() { Log.d(TAG, "startLocationUpdates"); if (!mLocationEnable) { - boolean isGPSEnabled = mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); - boolean isNetworkEnabled = mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); - + boolean isGPSEnabled = false; + boolean isNetworkEnabled = false; try { + isGPSEnabled = mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); + isNetworkEnabled = mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 0, this); mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000, 0, this); mLocationEnable = true; } catch (SecurityException e) { Log.e(TAG, "Cannot start location updates: " + e.toString()); } - if(!isGPSEnabled && !isNetworkEnabled) { + if (!isGPSEnabled && !isNetworkEnabled) { Log.i(TAG, "No location provider found"); // TODO: notify user }