refactoring: move calendar addon code into a single class

3 files changed, 61 insertions, 49 deletions

diff --git a/main/src/cgeo/calendar/CalendarAddon.java b/main/src/cgeo/calendar/CalendarAddon.java
new file mode 100644
index 0000000..117fb9a
--- /dev/null
+++ b/main/src/cgeo/calendar/CalendarAddon.java
@@ -0,0 +1,58 @@
+package cgeo.calendar;
+
+import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
+import cgeo.geocaching.geopoint.GeopointFormatter;
+import cgeo.geocaching.network.Parameters;
+import cgeo.geocaching.ui.dialog.Dialogs;
+import cgeo.geocaching.utils.ProcessUtils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+
+import java.util.Date;
+
+public class CalendarAddon {
+    public static boolean isAvailable() {
+        return ProcessUtils.isIntentAvailable(ICalendar.INTENT, Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST));
+    }
+
+    public static void addToCalendarWithIntent(final Activity activity, final Geocache cache) {
+        final Resources res = activity.getResources();
+        if (CalendarAddon.isAvailable()) {
+            final Date hiddenDate = cache.getHiddenDate();
+            final Parameters params = new Parameters(
+                    ICalendar.PARAM_NAME, cache.getName(),
+                    ICalendar.PARAM_NOTE, StringUtils.defaultString(cache.getPersonalNote()),
+                    ICalendar.PARAM_HIDDEN_DATE, hiddenDate != null ? String.valueOf(hiddenDate.getTime()) : StringUtils.EMPTY,
+                    ICalendar.PARAM_URL, StringUtils.defaultString(cache.getUrl()),
+                    ICalendar.PARAM_COORDS, cache.getCoords() == null ? "" : cache.getCoords().format(GeopointFormatter.Format.LAT_LON_DECMINUTE_RAW),
+                    ICalendar.PARAM_LOCATION, StringUtils.defaultString(cache.getLocation()),
+                    ICalendar.PARAM_SHORT_DESC, StringUtils.defaultString(cache.getShortDescription()),
+                    ICalendar.PARAM_START_TIME_MINUTES, StringUtils.defaultString(cache.guessEventTimeMinutes())
+                    );
+
+            activity.startActivity(new Intent(ICalendar.INTENT,
+                    Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST + "?" + params.toString())));
+        } else {
+            // Inform user the calendar add-on is not installed and let them get it from Google Play
+            Dialogs.confirmYesNo(activity, R.string.addon_missing_title, new StringBuilder(res.getString(R.string.helper_calendar_missing))
+                    .append(' ')
+                    .append(res.getString(R.string.addon_download_prompt))
+                    .toString(), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int id) {
+                    final Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(ICalendar.CALENDAR_ADDON_URI));
+                    activity.startActivity(intent);
+                }
+            });
+        }
+    }
+
+}
diff --git a/main/src/cgeo/calendar/ICalendar.java b/main/src/cgeo/calendar/ICalendar.java
index 933d248..6ecb6d5 100644
--- a/main/src/cgeo/calendar/ICalendar.java
+++ b/main/src/cgeo/calendar/ICalendar.java
@@ -14,6 +14,6 @@ public interface ICalendar {
     static final String PARAM_NOTE = "note"; // personal note
     static final String PARAM_NAME = "name"; // cache name
     static final String PARAM_LOCATION = "location"; // cache location, or empty string
-    static final String PARAM_COORDS = "coords"; // cache coords, or empty string
+    static final String PARAM_COORDS = "coords"; // cache coordinates, or empty string
     static final String PARAM_START_TIME_MINUTES = "time"; // time of start
 }
diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index 84a08f5..5f67c57 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -1,24 +1,13 @@
 package cgeo.geocaching;
 
-import cgeo.calendar.ICalendar;
+import cgeo.calendar.CalendarAddon;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
-import cgeo.geocaching.geopoint.GeopointFormatter;
-import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.ui.AbstractUIFactory;
-import cgeo.geocaching.ui.dialog.Dialogs;
-import cgeo.geocaching.utils.ProcessUtils;
-
-import org.apache.commons.lang3.StringUtils;
 
 import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import java.util.Date;
-
 /**
  * Shared menu handling for all activities having menu items related to a cache.
  *
@@ -58,7 +47,7 @@ public class CacheMenuHandler extends AbstractUIFactory {
                 cache.shareCache(activity, res);
                 return true;
             case R.id.menu_calendar:
-                addToCalendarWithIntent(activity, cache);
+                CalendarAddon.addToCalendarWithIntent(activity, cache);
                 return true;
             default:
                 return false;
@@ -80,39 +69,4 @@ public class CacheMenuHandler extends AbstractUIFactory {
         activity.getMenuInflater().inflate(R.menu.cache_options, menu);
         onPrepareOptionsMenu(menu, cache);
     }
-
-    private static void addToCalendarWithIntent(final Activity activity, final Geocache cache) {
-        final boolean calendarAddOnAvailable = ProcessUtils.isIntentAvailable(ICalendar.INTENT, Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST));
-
-        if (calendarAddOnAvailable) {
-            final Date hiddenDate = cache.getHiddenDate();
-            final Parameters params = new Parameters(
-                    ICalendar.PARAM_NAME, cache.getName(),
-                    ICalendar.PARAM_NOTE, StringUtils.defaultString(cache.getPersonalNote()),
-                    ICalendar.PARAM_HIDDEN_DATE, hiddenDate != null ? String.valueOf(hiddenDate.getTime()) : StringUtils.EMPTY,
-                    ICalendar.PARAM_URL, StringUtils.defaultString(cache.getUrl()),
-                    ICalendar.PARAM_COORDS, cache.getCoords() == null ? "" : cache.getCoords().format(GeopointFormatter.Format.LAT_LON_DECMINUTE_RAW),
-                    ICalendar.PARAM_LOCATION, StringUtils.defaultString(cache.getLocation()),
-                    ICalendar.PARAM_SHORT_DESC, StringUtils.defaultString(cache.getShortDescription()),
-                    ICalendar.PARAM_START_TIME_MINUTES, StringUtils.defaultString(cache.guessEventTimeMinutes())
-                    );
-
-            activity.startActivity(new Intent(ICalendar.INTENT,
-                    Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST + "?" + params.toString())));
-        } else {
-            // Inform user the calendar add-on is not installed and let them get it from Google Play
-            Dialogs.confirmYesNo(activity, R.string.addon_missing_title, new StringBuilder(res.getString(R.string.helper_calendar_missing))
-                    .append(' ')
-                    .append(res.getString(R.string.addon_download_prompt))
-                    .toString(), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int id) {
-                    final Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setData(Uri.parse(ICalendar.CALENDAR_ADDON_URI));
-                    activity.startActivity(intent);
-                }
-            });
-        }
-    }
-
 }