Use GPS when compass is disabled or absent

Work on #4548.

3 files changed, 6 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 455954a..901bffc 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -3,10 +3,10 @@ package cgeo.geocaching.ui;
 import butterknife.InjectView;
 
 import cgeo.geocaching.CacheListActivity;
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.location.Units;
+import cgeo.geocaching.sensors.Sensors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
@@ -38,7 +38,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
     public AddressListAdapter(final Activity context) {
         super(context, 0);
         inflater = context.getLayoutInflater();
-        location = CgeoApplication.getInstance().currentGeo().getCoords();
+        location = Sensors.getInstance().currentGeo().getCoords();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 7dd3847..de954aa 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -2,13 +2,13 @@ package cgeo.geocaching.ui;
 
 import butterknife.ButterKnife;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.ICoordinates;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.location.Units;
+import cgeo.geocaching.sensors.Sensors;
 import cgeo.geocaching.utils.Formatter;
 
 import org.apache.commons.lang3.StringUtils;
@@ -118,7 +118,7 @@ public final class CacheDetailsCreator {
         if (target.getCoords() == null) {
             return null;
         }
-        return CgeoApplication.getInstance().currentGeo().getCoords().distanceTo(target);
+        return Sensors.getInstance().currentGeo().getCoords().distanceTo(target);
     }
 
     public void addRating(final Geocache cache) {
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index f080761..34cac01 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -3,7 +3,6 @@ package cgeo.geocaching.ui;
 import butterknife.InjectView;
 
 import cgeo.geocaching.CacheDetailActivity;
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.enumerations.CacheListType;
@@ -11,6 +10,7 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.filter.IFilter;
 import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.sensors.GeoData;
+import cgeo.geocaching.sensors.Sensors;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.sorting.CacheComparator;
 import cgeo.geocaching.sorting.DistanceComparator;
@@ -119,7 +119,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
 
     public CacheListAdapter(final Activity activity, final List<Geocache> list, final CacheListType cacheListType) {
         super(activity, 0, list);
-        final GeoData currentGeo = CgeoApplication.getInstance().currentGeo();
+        final GeoData currentGeo = Sensors.getInstance().currentGeo();
         coords = currentGeo.getCoords();
         this.res = activity.getResources();
         this.list = list;