Refactoring: now that Geopoint is parcelable, use it in bundles

5 files changed, 14 insertions, 19 deletions

diff --git a/main/src/cgeo/geocaching/cgeoadvsearch.java b/main/src/cgeo/geocaching/cgeoadvsearch.java
index 62103b4..194fdbb 100644
--- a/main/src/cgeo/geocaching/cgeoadvsearch.java
+++ b/main/src/cgeo/geocaching/cgeoadvsearch.java
@@ -313,7 +313,7 @@ public class cgeoadvsearch extends AbstractActivity {
             }
         } else {
             try {
-                cgeocaches.startActivityCoordinates(this, GeopointParser.parseLatitude(latText), GeopointParser.parseLongitude(lonText));
+                cgeocaches.startActivityCoordinates(this, GeopointParser.parse(latText, lonText));
             } catch (GeopointParser.ParseException e) {
                 showToast(res.getString(e.resource));
             }
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index a25d1b4..23eeec4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -78,6 +78,7 @@ public class cgeocaches extends AbstractListActivity {
 
     private static final int MAX_LIST_ITEMS = 1000;
     private static final String EXTRAS_LIST_TYPE = "type";
+    private static final String EXTRAS_COORDS = "coords";
     private static final int MENU_REFRESH_STORED = 2;
     private static final int MENU_CACHE_DETAILS = 4;
     private static final int MENU_DROP_CACHES = 5;
@@ -483,7 +484,7 @@ public class cgeocaches extends AbstractListActivity {
         if (extras != null) {
             Object typeObject = extras.get(EXTRAS_LIST_TYPE);
             type = (typeObject instanceof CacheListType) ? (CacheListType) typeObject : CacheListType.OFFLINE;
-            coords = new Geopoint(extras.getDouble("latitude"), extras.getDouble("longitude"));
+            coords = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
             cacheType = Settings.getCacheType();
             keyword = extras.getString("keyword");
             address = extras.getString("address");
@@ -2127,8 +2128,7 @@ public class cgeocaches extends AbstractListActivity {
 
         Intent cachesIntent = new Intent(context, cachesActivity.getClass());
         cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.COORDINATE);
-        cachesIntent.putExtra("latitude", coords.getLatitude());
-        cachesIntent.putExtra("longitude", coords.getLongitude());
+        cachesIntent.putExtra(EXTRAS_COORDS, coords);
 
         context.startActivity(cachesIntent);
     }
@@ -2195,8 +2195,7 @@ public class cgeocaches extends AbstractListActivity {
     public static void startActivityNearest(final Context context, final Geopoint coordsNow) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.NEAREST);
-        cachesIntent.putExtra("latitude", coordsNow.getLatitude());
-        cachesIntent.putExtra("longitude", coordsNow.getLongitude());
+        cachesIntent.putExtra(EXTRAS_COORDS, coordsNow);
         context.startActivity(cachesIntent);
     }
 
@@ -2206,20 +2205,18 @@ public class cgeocaches extends AbstractListActivity {
         context.startActivity(cachesIntent);
     }
 
-    public static void startActivityAddress(Context context, double latitude, double longitude, String address) {
+    public static void startActivityAddress(final Context context, final Geopoint coords, final String address) {
         Intent addressIntent = new Intent(context, cgeocaches.class);
         addressIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.ADDRESS);
-        addressIntent.putExtra("latitude", latitude);
-        addressIntent.putExtra("longitude", longitude);
+        addressIntent.putExtra(EXTRAS_COORDS, coords);
         addressIntent.putExtra("address", address);
         context.startActivity(addressIntent);
     }
 
-    public static void startActivityCoordinates(final Context context, double latitude, double longitude) {
+    public static void startActivityCoordinates(final Context context, final Geopoint coords) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.COORDINATE);
-        cachesIntent.putExtra("latitude", latitude);
-        cachesIntent.putExtra("longitude", longitude);
+        cachesIntent.putExtra(EXTRAS_COORDS, coords);
         context.startActivity(cachesIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index d7ef655..869b9dd 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -26,8 +26,7 @@ import java.util.List;
 
 public class cgeonavigate extends AbstractActivity {
 
-    private static final String EXTRAS_LONGITUDE = "longitude";
-    private static final String EXTRAS_LATITUDE = "latitude";
+    private static final String EXTRAS_COORDS = "coords";
     private static final String EXTRAS_NAME = "name";
     private static final String EXTRAS_GEOCODE = "geocode";
     private static final List<IWaypoint> coordinates = new ArrayList<IWaypoint>();
@@ -88,7 +87,7 @@ public class cgeonavigate extends AbstractActivity {
             geocode = extras.getString(EXTRAS_GEOCODE);
             title = geocode;
             name = extras.getString(EXTRAS_NAME);
-            dstCoords = new Geopoint(extras.getDouble(EXTRAS_LATITUDE), extras.getDouble(EXTRAS_LONGITUDE));
+            dstCoords = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
 
             if (StringUtils.isNotBlank(name)) {
                 if (StringUtils.isNotBlank(title)) {
@@ -393,8 +392,7 @@ public class cgeonavigate extends AbstractActivity {
         }
 
         final Intent navigateIntent = new Intent(context, cgeonavigate.class);
-        navigateIntent.putExtra(EXTRAS_LATITUDE, coords.getLatitude());
-        navigateIntent.putExtra(EXTRAS_LONGITUDE, coords.getLongitude());
+        navigateIntent.putExtra(EXTRAS_COORDS, coords);
         navigateIntent.putExtra(EXTRAS_GEOCODE, geocode.toUpperCase());
         if (null != displayedName) {
             navigateIntent.putExtra(EXTRAS_NAME, displayedName);
diff --git a/main/src/cgeo/geocaching/cgeopoint.java b/main/src/cgeo/geocaching/cgeopoint.java
index 3f01f74..73c0b18 100644
--- a/main/src/cgeo/geocaching/cgeopoint.java
+++ b/main/src/cgeo/geocaching/cgeopoint.java
@@ -481,7 +481,7 @@ public class cgeopoint extends AbstractActivity {
             return;
         }
 
-        cgeocaches.startActivityCoordinates(this, coords.getLatitude(), coords.getLongitude());
+        cgeocaches.startActivityCoordinates(this, coords);
 
         finish();
     }
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index e557882..34e751f 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -56,7 +56,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
             @Override
             public void onClick(View v) {
                 Activity activity = (Activity) v.getContext();
-                cgeocaches.startActivityAddress(activity, address.getLatitude(), address.getLongitude(), StringUtils.defaultString(address.getAddressLine(0)));
+                cgeocaches.startActivityAddress(activity, new Geopoint(address.getLatitude(), address.getLongitude()), StringUtils.defaultString(address.getAddressLine(0)));
                 activity.finish();
             }
         });