Fix warnings introduced by earlier commits

6 files changed, 5 insertions, 20 deletions

diff --git a/main/src/cgeo/geocaching/GeoDataProvider.java b/main/src/cgeo/geocaching/GeoDataProvider.java
index 5b103ea..58b0696 100644
--- a/main/src/cgeo/geocaching/GeoDataProvider.java
+++ b/main/src/cgeo/geocaching/GeoDataProvider.java
@@ -25,8 +25,8 @@ class GeoDataProvider extends MemorySubject<IGeoData> {
     private static final String LAST_LOCATION_PSEUDO_PROVIDER = "last";
     private final LocationManager geoManager;
     private final GpsStatus.Listener gpsStatusListener = new GpsStatusListener();
-    private final LocationData gpsLocation = new LocationData(LocationProviderType.GPS);
-    private final LocationData netLocation = new LocationData(LocationProviderType.NETWORK);
+    private final LocationData gpsLocation = new LocationData();
+    private final LocationData netLocation = new LocationData();
     private final Listener networkListener = new Listener(LocationManager.NETWORK_PROVIDER, netLocation);
     private final Listener gpsListener = new Listener(LocationManager.GPS_PROVIDER, gpsLocation);
     private final Unregisterer unregisterer = new Unregisterer();
@@ -36,13 +36,8 @@ class GeoDataProvider extends MemorySubject<IGeoData> {
 
     private static class LocationData {
         public Location location;
-        public LocationProviderType provider;
         public long timestamp = 0;
 
-        LocationData(final LocationProviderType provider) {
-            this.provider = provider;
-        }
-
         public void update(final Location location) {
             this.location = location;
             timestamp = System.currentTimeMillis();
@@ -74,7 +69,7 @@ class GeoDataProvider extends MemorySubject<IGeoData> {
             return this;
         }
 
-        private LocationProviderType getLocationProviderType(final String provider) {
+        private static LocationProviderType getLocationProviderType(final String provider) {
             if (provider.equals(LocationManager.GPS_PROVIDER)) {
                 return LocationProviderType.GPS;
             }
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 26585ce..234ceb8 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -28,7 +28,6 @@ import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.location.Address;
 import android.location.Geocoder;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -67,7 +66,6 @@ public class cgeo extends AbstractActivity {
     private boolean addressObtaining = false;
     private boolean initialized = false;
 
-    private LocationManager locationManager;
     final private UpdateLocation locationUpdater = new UpdateLocation();
 
     private Handler updateUserInfoHandler = new Handler() {
@@ -225,8 +223,6 @@ public class cgeo extends AbstractActivity {
             // nothing
         }
 
-        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-
         init();
     }
 
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index 68893c7..d0ee5c3 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -8,8 +8,8 @@ import cgeo.geocaching.enumerations.LoadFlags.RemoveFlag;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
-import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.IObserver;
+import cgeo.geocaching.utils.Log;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -34,7 +34,6 @@ public class cgeoapplication extends Application {
 
     private cgData storage = null;
     private String action = null;
-    private Geopoint lastCoords = null;
     private volatile GeoDataProvider geo;
     private cgDirection dir = null;
     private boolean dirInUse = false;
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 917db29..c10a596 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -107,7 +107,6 @@ public class cgeocaches extends AbstractListActivity implements IObserver<IGeoDa
     private static final int SUBMENU_MANAGE_LISTS = 55;
     private static final int SUBMENU_MANAGE_OFFLINE = 56;
     private static final int SUBMENU_SORT = 57;
-    private static final int SUBMENU_IMPORT = 59;
     private static final int SUBMENU_MANAGE_HISTORY = 60;
     private static final int MENU_SORT_DATE = 61;
     private static final int MENU_SORT_FINDS = 62;
diff --git a/main/src/cgeo/geocaching/cgeowaypointadd.java b/main/src/cgeo/geocaching/cgeowaypointadd.java
index ada098b..865a107 100644
--- a/main/src/cgeo/geocaching/cgeowaypointadd.java
+++ b/main/src/cgeo/geocaching/cgeowaypointadd.java
@@ -361,9 +361,8 @@ public class cgeowaypointadd extends AbstractActivity implements IObserver<IGeoD
                 if (geo.getCoords() == null) {
                     showToast(res.getString(R.string.err_point_curr_position_unavailable));
                     return;
-                } else {
-                    coords = geo.getCoords();
                 }
+                coords = geo.getCoords();
             }
 
             if (StringUtils.isNotBlank(bearingText) && StringUtils.isNotBlank(distanceText)) {
diff --git a/main/src/cgeo/geocaching/sorting/EventDateComparator.java b/main/src/cgeo/geocaching/sorting/EventDateComparator.java
index b4ba8e9..ac49e66 100644
--- a/main/src/cgeo/geocaching/sorting/EventDateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/EventDateComparator.java
@@ -1,8 +1,5 @@
 package cgeo.geocaching.sorting;
 
-import cgeo.geocaching.cgCache;
-
-
 /**
  * Compares caches by date. Used only for event caches.
  *