From 285f22f28fed47062b3db2c0294c4c4f13571458 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 24 Feb 2014 22:18:28 +0100
Subject: refactoring: do not duplicate code

---
 main/src/cgeo/geocaching/CacheDetailActivity.java  | 25 ++++---------------
 main/src/cgeo/geocaching/TrackableActivity.java    | 25 +------------------
 .../cgeo/geocaching/activity/AbstractActivity.java | 28 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 45 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 414fd13..7e8ab28 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -39,17 +39,14 @@ import cgeo.geocaching.ui.WeakReferenceHandler;
 import cgeo.geocaching.ui.dialog.Dialogs;
 import cgeo.geocaching.ui.logs.CacheLogsViewCreator;
 import cgeo.geocaching.utils.CancellableHandler;
-import cgeo.geocaching.utils.ClipboardUtils;
 import cgeo.geocaching.utils.CryptUtils;
 import cgeo.geocaching.utils.GeoDirHandler;
-import cgeo.geocaching.utils.HtmlUtils;
 import cgeo.geocaching.utils.ImageUtils;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.MatcherWrapper;
 import cgeo.geocaching.utils.SimpleCancellableHandler;
 import cgeo.geocaching.utils.SimpleHandler;
 import cgeo.geocaching.utils.TextUtils;
-import cgeo.geocaching.utils.TranslationUtils;
 import cgeo.geocaching.utils.UnknownTagsHandler;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -419,25 +416,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
+        if (onClipboardItemSelected(item, clickedItemText)) {
+            return true;
+        }
         switch (item.getItemId()) {
-        // detail fields
-            case R.id.menu_copy:
-                ClipboardUtils.copyToClipboard(clickedItemText);
-                showToast(res.getString(R.string.clipboard_copy_ok));
-                return true;
-            case R.id.menu_translate_to_sys_lang:
-                TranslationUtils.startActivityTranslate(this, Locale.getDefault().getLanguage(), HtmlUtils.extractText(clickedItemText));
-                return true;
-            case R.id.menu_translate_to_english:
-                TranslationUtils.startActivityTranslate(this, Locale.ENGLISH.getLanguage(), HtmlUtils.extractText(clickedItemText));
-                return true;
-            case R.id.menu_cache_share_field:
-                final Intent intent = new Intent(Intent.ACTION_SEND);
-                intent.setType("text/plain");
-                intent.putExtra(Intent.EXTRA_TEXT, clickedItemText.toString());
-                startActivity(Intent.createChooser(intent, res.getText(R.string.cache_share_field)));
-                return true;
-                // waypoints
+            // waypoints
             case R.id.menu_waypoint_edit:
                 if (selectedWaypoint != null) {
                     EditWaypointActivity.startActivityEditWaypoint(this, cache, selectedWaypoint.getId());
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 90b042e..948e668 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -18,10 +18,8 @@ import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.UserActionsClickListener;
 import cgeo.geocaching.ui.UserNameClickListener;
 import cgeo.geocaching.ui.logs.TrackableLogsViewCreator;
-import cgeo.geocaching.utils.ClipboardUtils;
 import cgeo.geocaching.utils.HtmlUtils;
 import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.TranslationUtils;
 import cgeo.geocaching.utils.UnknownTagsHandler;
 
 import org.apache.commons.lang3.StringUtils;
@@ -223,28 +221,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        // detail fields
-            case R.id.menu_copy:
-                ClipboardUtils.copyToClipboard(clickedItemText);
-                showToast(res.getString(R.string.clipboard_copy_ok));
-                return true;
-            case R.id.menu_translate_to_sys_lang:
-                TranslationUtils.startActivityTranslate(this, Locale.getDefault().getLanguage(), HtmlUtils.extractText(clickedItemText));
-                return true;
-            case R.id.menu_translate_to_english:
-                TranslationUtils.startActivityTranslate(this, Locale.ENGLISH.getLanguage(), HtmlUtils.extractText(clickedItemText));
-                return true;
-            case R.id.menu_cache_share_field:
-                final Intent intent = new Intent(Intent.ACTION_SEND);
-                intent.setType("text/plain");
-                intent.putExtra(Intent.EXTRA_TEXT, clickedItemText.toString());
-                startActivity(Intent.createChooser(intent, res.getText(R.string.cache_share_field)));
-                return true;
-            default:
-                break;
-        }
-        return onOptionsItemSelected(item);
+        return onClipboardItemSelected(item, clickedItemText) || onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 8aaf229..7127de4 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -7,14 +7,18 @@ import cgeo.geocaching.R;
 import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.utils.ClipboardUtils;
+import cgeo.geocaching.utils.HtmlUtils;
 import cgeo.geocaching.utils.TranslationUtils;
 
 import org.apache.commons.lang3.StringUtils;
 
+import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.view.ContextMenu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 
@@ -141,4 +145,28 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         final boolean localeIsEnglish = StringUtils.equals(Locale.getDefault().getLanguage(), Locale.ENGLISH.getLanguage());
         menu.findItem(R.id.menu_translate_to_english).setVisible(!copyOnly && !localeIsEnglish);
     }
+
+    protected boolean onClipboardItemSelected(final MenuItem item, final CharSequence clickedItemText) {
+        switch (item.getItemId()) {
+            // detail fields
+            case R.id.menu_copy:
+                ClipboardUtils.copyToClipboard(clickedItemText);
+                showToast(res.getString(R.string.clipboard_copy_ok));
+                return true;
+            case R.id.menu_translate_to_sys_lang:
+                TranslationUtils.startActivityTranslate(this, Locale.getDefault().getLanguage(), HtmlUtils.extractText(clickedItemText));
+                return true;
+            case R.id.menu_translate_to_english:
+                TranslationUtils.startActivityTranslate(this, Locale.ENGLISH.getLanguage(), HtmlUtils.extractText(clickedItemText));
+                return true;
+            case R.id.menu_cache_share_field:
+                final Intent intent = new Intent(Intent.ACTION_SEND);
+                intent.setType("text/plain");
+                intent.putExtra(Intent.EXTRA_TEXT, clickedItemText.toString());
+                startActivity(Intent.createChooser(intent, res.getText(R.string.cache_share_field)));
+                return true;
+            default:
+                return false;
+        }
+    }
 }
-- 
cgit v1.1