Refactored GeocodeProviderBaseFactory and associated test

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/GeocodeProviderBaseFactoryTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013-2020 Federico Iosue (federico@iosue.it)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.feio.android.omninotes.helpers;
+
+
+import static org.junit.Assert.assertTrue;
+
+import it.feio.android.omninotes.BaseAndroidTestCase;
+import org.junit.Test;
+
+public class GeocodeProviderBaseFactoryTest extends BaseAndroidTestCase {
+
+  @Test
+  public void checkHighAccuracyLocationProvider () {
+    boolean highAccuracyLocationProviderEnabled= GeocodeProviderBaseFactory.checkHighAccuracyLocationProvider(testContext);
+    assertTrue(highAccuracyLocationProviderEnabled);
+  }
+
+}

omniNotes/src/main/java/it/feio/android/omninotes/helpers/GeocodeProviderBaseFactory.java

@@ -17,41 +17,36 @@
 
 package it.feio.android.omninotes.helpers;
 
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.location.LocationManager;
 import android.os.Build;
 import android.provider.Settings;
 import android.widget.Toast;
-
 import io.nlopez.smartlocation.location.LocationProvider;
 import io.nlopez.smartlocation.location.providers.LocationGooglePlayServicesWithFallbackProvider;
+import it.feio.android.omninotes.R;
+import it.feio.android.omninotes.utils.GeocodeHelper;
 
 public class GeocodeProviderBaseFactory {
 
-  protected GeocodeProviderBaseFactory() {
+  protected GeocodeProviderBaseFactory () {
     // hides public constructor
   }
 
   public static LocationProvider getProvider (Context context) {
-   if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT&&android.os.Build.VERSION.SDK_INT <Build.VERSION_CODES.P)
-    {
-      if(getLocationMode(context)!=3)
-      {
-        Toast.makeText(context, "Please set Location mode to high accuracy to continue", Toast.LENGTH_SHORT).show();
-        context.startActivity((new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)));
-      }
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
+        && android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.P
+        && checkHighAccuracyLocationProvider(context)) {
+      Toast.makeText(context, R.string.location_set_high_accuracy, Toast.LENGTH_SHORT).show();
+      context.startActivity((new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)));
     }
 
     return new LocationGooglePlayServicesWithFallbackProvider(context);
   }
-  public static int getLocationMode(Context context)  {
-    ContentResolver contentResolver=(ContentResolver)context.getContentResolver();
-    try {
-      return Settings.Secure.getInt(contentResolver, Settings.Secure.LOCATION_MODE);
-    } catch (Settings.SettingNotFoundException e) {
-      e.printStackTrace();
-    }
-    return -1;
+
+  public static boolean checkHighAccuracyLocationProvider (Context context) {
+    return GeocodeHelper.checkLocationProviderEnabled(context, LocationManager.GPS_PROVIDER);
   }
+
 }

omniNotes/src/main/java/it/feio/android/omninotes/utils/GeocodeHelper.java

@@ -25,6 +25,7 @@
 import android.location.Geocoder;
 import android.location.Location;
 import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.Bundle;
 import android.text.TextUtils;
 import io.nlopez.smartlocation.SmartLocation;
@@ -237,4 +238,13 @@ public static boolean areCoordinates (String string) {
     Matcher m = p.matcher(string);
     return m.matches();
   }
+
+  /**
+   * Checks for location provider between {@link android.location.LocationManager#GPS_PROVIDER} etc...
+   */
+  public static boolean checkLocationProviderEnabled(Context context, String provider) {
+    LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+    return locationManager.isProviderEnabled(provider);
+  }
+
 }

omniNotes/src/main/res/values/strings.xml

@@ -81,6 +81,7 @@
     <string name="delete_all_attachments">Delete all the attachments?</string>
     <string name="gallery">Gallery</string>
     <string name="location">Location</string>
+    <string name="location_set_high_accuracy">Please set Location mode to high accuracy to continue</string>
     <string name="timestamp">Timestamp</string>
     <string name="pushbullet">Pushbullet</string>
     <string name="remove_location">Remove location?</string>