kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 03:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor isLocationServicesEnabled()

Browse Source
This commit is contained in:
Aditya-Sood 2019-08-08 11:39:35 +05:30
parent ba00ece2ca
commit cb944bb88f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -334,22 +334,14 @@ 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 {
gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
} catch (Exception ex) {
return (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER));
} catch (SecurityException | IllegalArgumentException ex) {
ex.printStackTrace();
}
try {
network_enabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
} catch (Exception ex) {
ex.printStackTrace();
}
return (gps_enabled || network_enabled);
return false;
}
private void requestEnableLocationServices() {
@ -391,12 +383,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
switch (requestCode) {
case REQUEST_ENABLE_LOCATION_SERVICES: {
LocationManager locationManager =
(LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
if (!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
|| locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) {
// If neither provider is enabled
if (!isLocationServicesEnabled()) {
showToast(this, R.string.permission_refused_location, Toast.LENGTH_LONG);
}
break;