Handle unavailable coarse location provider; fixes #42

bilde2910 · Oct 16, 2019 · 277a24b · 277a24b
1 parent c141707
commit 277a24b
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/android/app/src/main/java/info/varden/hauk/service/LocationPushService.java b/android/app/src/main/java/info/varden/hauk/service/LocationPushService.java
@@ -139,9 +139,7 @@ public void onLocationChanged(Location location) {
                     }
                 };
 
-                Log.i("Requesting location updates from device location services"); //NON-NLS
-                this.locMan.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, this.share.getSession().getIntervalMillis(), 0.0F, this.listenCoarse);
-                this.locMan.requestLocationUpdates(LocationManager.GPS_PROVIDER, this.share.getSession().getIntervalMillis(), 0.0F, this.listenFine);
+                attachToLocationServices();
             } else {
                 Log.e("Location permission that was granted earlier has been rejected - sharing aborted"); //NON-NLS
             }
@@ -163,6 +161,22 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+    /**
+     * Attaches the listeners to the location manager to request updates.
+     *
+     * @throws SecurityException If location permission is missing.
+     */
+    private void attachToLocationServices() throws SecurityException {
+        Log.i("Requesting location updates from device location services"); //NON-NLS
+        try {
+            this.locMan.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, this.share.getSession().getIntervalMillis(), 0.0F, this.listenCoarse);
+        } catch (IllegalArgumentException ex) {
+            Log.w("Coarse location provider does not exist!", ex); //NON-NLS
+            this.listenCoarse = null;
+        }
+        this.locMan.requestLocationUpdates(LocationManager.GPS_PROVIDER, this.share.getSession().getIntervalMillis(), 0.0F, this.listenFine);
+    }
+
     /**
      * Called when either the coarse or the fine location provider has received a location update.
      * Pushes the location update to the session backend.