refactorings: preparations to make #1303 easier

8 files changed, 33 insertions, 23 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index bcfd273..a72173b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2487,4 +2487,11 @@ public class CacheDetailActivity extends AbstractActivity {
             return view;
         }
     }
+
+    public static void startActivity(final Context context, final String geocode, final String cacheName) {
+        final Intent cachesIntent = new Intent(context, CacheDetailActivity.class);
+        cachesIntent.putExtra("geocode", geocode);
+        cachesIntent.putExtra("name", cacheName);
+        context.startActivity(cachesIntent);
+    }
 }
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index d44ad86..6c0cf1a 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -874,9 +874,7 @@ public class cgeo extends AbstractActivity {
 
                 // invoke settings activity to insert login details
                 if (status == StatusCode.NO_LOGIN_INFO_STORED) {
-                    final Context context = cgeo.this;
-                    final Intent initIntent = new Intent(context, cgeoinit.class);
-                    context.startActivity(initIntent);
+                    cgeoinit.startActivity(cgeo.this);
                 }
             }
         }
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index c4c16d5..c1771eb 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.http.HttpResponse;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
@@ -897,4 +898,10 @@ public class cgeoinit extends AbstractActivity {
             initMapfileEdittext(true);
         }
     }
+
+    public static void startActivity(Context fromActivity) {
+        final Intent initIntent = new Intent(fromActivity, cgeoinit.class);
+        fromActivity.startActivity(initIntent);
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index 48f70c2..c1a5b01 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -16,6 +16,7 @@ import cgeo.geocaching.utils.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.net.Uri;
@@ -657,4 +658,10 @@ public class cgeopopup extends AbstractActivity {
         super.goManual(view);
         finish();
     }
+
+    public static void startActivity(final Context context, final String geocode) {
+        final Intent popupIntent = new Intent(context, cgeopopup.class);
+        popupIntent.putExtra("geocode", geocode);
+        context.startActivity(popupIntent);
+    }
 }
diff --git a/main/src/cgeo/geocaching/cgeowaypoint.java b/main/src/cgeo/geocaching/cgeowaypoint.java
index 940d61d..2c14601 100644
--- a/main/src/cgeo/geocaching/cgeowaypoint.java
+++ b/main/src/cgeo/geocaching/cgeowaypoint.java
@@ -9,6 +9,7 @@ import cgeo.geocaching.utils.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -383,4 +384,10 @@ public class cgeowaypoint extends AbstractActivity {
         }
         return NavigationAppFactory.onMenuItemSelected(item, geo, this, null, waypoint, null);
     }
+
+    public static void startActivity(final Context context, final int waypointId) {
+        Intent popupIntent = new Intent(context, cgeowaypoint.class);
+        popupIntent.putExtra("waypoint", waypointId);
+        context.startActivity(popupIntent);
+    }
 }
diff --git a/main/src/cgeo/geocaching/maps/CachesOverlay.java b/main/src/cgeo/geocaching/maps/CachesOverlay.java
index 2ff3d90..17c7c0f 100644
--- a/main/src/cgeo/geocaching/maps/CachesOverlay.java
+++ b/main/src/cgeo/geocaching/maps/CachesOverlay.java
@@ -18,7 +18,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
@@ -227,19 +226,11 @@ public class CachesOverlay extends AbstractItemizedOverlay {
             final IWaypoint coordinate = item.getCoord();
 
             if (StringUtils.isNotBlank(coordinate.getCoordType()) && coordinate.getCoordType().equalsIgnoreCase("cache") && StringUtils.isNotBlank(coordinate.getGeocode())) {
-                Intent popupIntent = new Intent(context, cgeopopup.class);
-
-                popupIntent.putExtra("geocode", coordinate.getGeocode());
-
                 CGeoMap.markCacheAsDirty(coordinate.getGeocode());
-                context.startActivity(popupIntent);
+                cgeopopup.startActivity(context, coordinate.getGeocode());
             } else if (coordinate.getCoordType() != null && coordinate.getCoordType().equalsIgnoreCase("waypoint") && coordinate.getId() > 0) {
-                Intent popupIntent = new Intent(context, cgeowaypoint.class);
-
-                popupIntent.putExtra("waypoint", coordinate.getId());
-
                 CGeoMap.markCacheAsDirty(coordinate.getGeocode());
-                context.startActivity(popupIntent);
+                cgeowaypoint.startActivity(context, coordinate.getId());
             } else {
                 waitDialog.dismiss();
                 return false;
diff --git a/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java
index cffbe77..6ca050e 100644
--- a/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java
+++ b/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java
@@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Canvas;
 
 import java.util.ArrayList;
@@ -134,9 +133,7 @@ public class OtherCachersOverlay extends AbstractItemizedOverlay {
 
         public void onClick(DialogInterface dialog, int id) {
             if (geocode != null) {
-                final Intent detailIntent = new Intent(context, CacheDetailActivity.class);
-                detailIntent.putExtra("geocode", geocode);
-                context.startActivity(detailIntent);
+                CacheDetailActivity.startActivity(context, geocode);
             }
 
             dialog.cancel();
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index 516ab4b..ee7a8b1 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -688,10 +687,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
             }
 
             // load cache details
-            Intent cachesIntent = new Intent(getContext(), CacheDetailActivity.class);
-            cachesIntent.putExtra("geocode", geocode);
-            cachesIntent.putExtra("name", name);
-            getContext().startActivity(cachesIntent);
+            CacheDetailActivity.startActivity(getContext(), geocode, name);
         }
 
         // long tap on item