From 455909a65d110eca7f7b007a37a18278c4281f5a Mon Sep 17 00:00:00 2001 From: Ashish Date: Sat, 4 Aug 2018 12:48:52 +0530 Subject: [PATCH 1/2] added null check before initialising LatLng after receiving location permission --- .../fr/free/nrw/commons/location/LocationServiceManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java index cd1082ba5d..14adede7ab 100644 --- a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java +++ b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java @@ -106,6 +106,9 @@ public LatLng getLKL() { if (lastKL == null) { lastKL = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER); } + if (null == lastKL) { + return null; + } return LatLng.from(lastKL); } else { return null; From faaaae00485d50afdc1805d36f3475974494b88b Mon Sep 17 00:00:00 2001 From: Ashish Date: Sat, 4 Aug 2018 13:08:43 +0530 Subject: [PATCH 2/2] flipped null==lastKL with lastKL==null --- .../fr/free/nrw/commons/location/LocationServiceManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java index 14adede7ab..4a137beed3 100644 --- a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java +++ b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java @@ -106,7 +106,7 @@ public LatLng getLKL() { if (lastKL == null) { lastKL = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER); } - if (null == lastKL) { + if (lastKL == null) { return null; } return LatLng.from(lastKL);