From 5167e2246656a4af84f508467e316bbc618d684e Mon Sep 17 00:00:00 2001 From: Aditya-Sood Date: Mon, 12 Aug 2019 13:07:25 +0530 Subject: [PATCH] Refactor isLocationServicesEnabled() Revert to original implementation of the method --- .../local_file_transfer/LocalFileTransferActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java index d4af588c6..8223bde7b 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java @@ -318,20 +318,22 @@ public class LocalFileTransferActivity extends AppCompatActivity implements private boolean isLocationServicesEnabled() { LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE); + boolean gps_enabled = false; + boolean network_enabled = false; try { - return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); + gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); } catch (SecurityException | IllegalArgumentException ex) { ex.printStackTrace(); } try { - return locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); + network_enabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); } catch (SecurityException | IllegalArgumentException ex) { ex.printStackTrace(); } - return false; + return (gps_enabled || network_enabled); } private void requestEnableLocationServices() {