Priority to GPS (+logging)

vdeconinck · May 3, 2023 · c5055fd · c5055fd
1 parent 73cadd2
commit c5055fd
Showing 1 changed file with 29 additions and 26 deletions.
diff --git a/Main/src/main/java/info/deconinck/inclinometer/GpsTracker.java b/Main/src/main/java/info/deconinck/inclinometer/GpsTracker.java
@@ -19,7 +19,7 @@
 import androidx.core.app.ActivityCompat;
 
 /**
- * Taken from sample at https://www.howtodoandroid.com/get-current-location-android/
+ * Taken from sample at <a href="https://www.howtodoandroid.com/get-current-location-android/">https://www.howtodoandroid.com/get-current-location-android/</a>
  */
 public class GpsTracker extends Service implements LocationListener {
 
@@ -68,28 +68,6 @@ public Location getLocation() {
                 // no network provider is enabled
             } else {
                 this.canGetLocation = true;
-                // First get location from Network Provider
-                if (isNetworkEnabled) {
-                    //check the network permission
-                    if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                        ActivityCompat.requestPermissions((Activity) mContext, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, 101);
-                    }
-                    locationManager.requestLocationUpdates(
-                            LocationManager.NETWORK_PROVIDER,
-                            MIN_TIME_BW_UPDATES,
-                            MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
-
-                    Log.d(TAG, "Network");
-                    if (locationManager != null) {
-                        location = locationManager
-                                .getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-
-                        if (location != null) {
-                            latitude = location.getLatitude();
-                            longitude = location.getLongitude();
-                        }
-                    }
-                }
 
                 // if GPS Enabled get lat/long using GPS Services
                 if (isGPSEnabled) {
@@ -115,10 +93,35 @@ public Location getLocation() {
                         }
                     }
                 }
-            }
+                else {
+                    // Note: if app is to be used indoors, might be better to enable network location updates even if GPS is enabled
+                    // get location from Network Provider
+                    if (isNetworkEnabled) {
+                        //check the network permission
+                        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                            ActivityCompat.requestPermissions((Activity) mContext, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, 101);
+                        }
+                        locationManager.requestLocationUpdates(
+                                LocationManager.NETWORK_PROVIDER,
+                                MIN_TIME_BW_UPDATES,
+                                MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
 
-        } catch (Exception e) {
-            e.printStackTrace();
+                        Log.d(TAG, "Network");
+                        if (locationManager != null) {
+                            location = locationManager
+                                    .getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+
+                            if (location != null) {
+                                latitude = location.getLatitude();
+                                longitude = location.getLongitude();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception e) {
+            Log.e(TAG, "getLocation: ", e);
         }
 
         return location;