fix #3907: duplicate share menu

22 files changed, 7 insertions, 41 deletions

diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index c250d27..13a0d35 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Quant al c:geo</string>
   <string name="latitude">Latitud</string>
   <string name="longitude">Longitud</string>
-  <string name="action_bar_share_title">Comparteix l\'enllaç al catxé</string>
   <string name="settings_titlebar">Opcions del c:geo</string>
   <string name="all_types">Tots </string>
   <string name="traditional">Tradicional</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 67b92f1..bd95e1a 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -8,7 +8,6 @@
   <string name="about">O aplikaci</string>
   <string name="latitude">Zeměpisná šířka</string>
   <string name="longitude">Zeměpisná délka</string>
-  <string name="action_bar_share_title">Sdílet odkaz ke keši</string>
   <string name="settings_titlebar">c:geo Nastavení</string>
   <string name="all_types">Všechny typy keší</string>
   <string name="traditional">Tradiční keš</string>
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index 94fd9cb..7b0be1b 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Om c:geo</string>
   <string name="latitude">Breddegrad</string>
   <string name="longitude">Længdegrad</string>
-  <string name="action_bar_share_title">Del link til cache</string>
   <string name="settings_titlebar">c:geo Indstillinger</string>
   <string name="all_types">Alle Cache typer</string>
   <string name="traditional">Traditionel cache</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index f0a8e34..a8ccc9b 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Über c:geo</string>
   <string name="latitude">Breitengrad</string>
   <string name="longitude">Längengrad</string>
-  <string name="action_bar_share_title">Link versenden</string>
   <string name="settings_titlebar">c:geo Einstellungen</string>
   <string name="all_types">Alle Caches</string>
   <string name="traditional">Traditional-Cache</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 7b63939..3607cc7 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Sobre c:geo</string>
   <string name="latitude">Latitud</string>
   <string name="longitude">Longitud</string>
-  <string name="action_bar_share_title">Compartir enlace a escondite</string>
   <string name="settings_titlebar">c:geo Ajustes</string>
   <string name="all_types">Todos los escondites</string>
   <string name="traditional">Tradicionales</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 83bb2fd..328be8d 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">À propos de c:geo</string>
   <string name="latitude">Latitude</string>
   <string name="longitude">Longitude</string>
-  <string name="action_bar_share_title">Partager le lien vers la cache</string>
   <string name="settings_titlebar">Paramètres c:geo</string>
   <string name="all_types">Tous les genres</string>
   <string name="traditional">Traditionnelles</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index e2c681f..e9c9d23 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">A c:geo-ról</string>
   <string name="latitude">Szélesség</string>
   <string name="longitude">Hosszúság</string>
-  <string name="action_bar_share_title">A láda linkjének megosztása</string>
   <string name="settings_titlebar">c:geo Beállítások</string>
   <string name="all_types">Minden láda típus</string>
   <string name="traditional">Hagyományos láda</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 564e891..f542e04 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Info c:geo</string>
   <string name="latitude">Latitudine</string>
   <string name="longitude">Longitudine</string>
-  <string name="action_bar_share_title">Condividi link al cache</string>
   <string name="settings_titlebar">Impostazioni di c:geo</string>
   <string name="all_types">Tutti i tipi di cache</string>
   <string name="traditional">Traditional cache</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index cebb919..55c7a0a 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">c:geoについて</string>
   <string name="latitude">緯度</string>
   <string name="longitude">経度</string>
-  <string name="action_bar_share_title">キャッシュのリンクを共有</string>
   <string name="settings_titlebar">c:geo 設定</string>
   <string name="all_types">全てのタイプのキャッシュ</string>
   <string name="traditional">トラディショナルキャッシュ</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index 2329d9e..80f381d 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -8,7 +8,6 @@
   <string name="about">Apie c:geo</string>
   <string name="latitude">Platuma</string>
   <string name="longitude">Ilguma</string>
-  <string name="action_bar_share_title">Dalintis nuoroda į slėptuvę</string>
   <string name="settings_titlebar">c:geo Nustatymai</string>
   <string name="all_types">Visos slėptuvių rūšys</string>
   <string name="traditional">Tradicinė slėptuvė</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index 97ee17e..0f46e12 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Om c:geo</string>
   <string name="latitude">Breddegrad</string>
   <string name="longitude">Lengdegrad</string>
-  <string name="action_bar_share_title">Del linken til cachen</string>
   <string name="settings_titlebar">c:geo-innstillinger</string>
   <string name="all_types">Alle cachetyper</string>
   <string name="traditional">Tradisjonell cache</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 507c8cd..eb33260 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Over c:geo</string>
   <string name="latitude">Breedtegraad</string>
   <string name="longitude">Lengtegraad</string>
-  <string name="action_bar_share_title">Deel link naar cache</string>
   <string name="settings_titlebar">c:geo Instellingen</string>
   <string name="all_types">Alle cache types</string>
   <string name="traditional">Traditionele cache</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 2bf5353..acc010c 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">O c:geo</string>
   <string name="latitude">Szerokość geograficzna</string>
   <string name="longitude">Długość geograficzna</string>
-  <string name="action_bar_share_title">Podziel się linkiem do skrzynki</string>
   <string name="settings_titlebar">c:geo Ustawienia</string>
   <string name="all_types">Wszystkie typy skrzynek</string>
   <string name="traditional">Tradycyjna</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index bdc6dcf..f423050 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Sobre c:geo</string>
   <string name="latitude">Latitude</string>
   <string name="longitude">Longitude</string>
-  <string name="action_bar_share_title">Partilhar ligação para a cache</string>
   <string name="settings_titlebar">c:geo Definições</string>
   <string name="all_types">Todos os tipos</string>
   <string name="traditional">Cache tradicional</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index ec690dc..f292d36 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Despre c:geo</string>
   <string name="latitude">Latitudine</string>
   <string name="longitude">Longitudine</string>
-  <string name="action_bar_share_title">Distribuie adresa cutiei</string>
   <string name="settings_titlebar">Configuraţii c:geo</string>
   <string name="all_types">Toate tipurile de cutii</string>
   <string name="traditional">Tradiţională</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 7038538..996b53c 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">O aplikácii</string>
   <string name="latitude">Zemepisná šírka</string>
   <string name="longitude">Zemepisná dĺžka</string>
-  <string name="action_bar_share_title">Zdieľať odkaz ku skrýši</string>
   <string name="settings_titlebar">c:geo Nastavenie</string>
   <string name="all_types">Všetky typy</string>
   <string name="traditional">Tradičná skrýša</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index a1b80de..1359c4b 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">O c:geo</string>
   <string name="latitude">Geog. širina</string>
   <string name="longitude">Geog. dolžina</string>
-  <string name="action_bar_share_title">Deli povezavo do zaklada</string>
   <string name="settings_titlebar">c:geo nastavitve</string>
   <string name="all_types">Vsi tipi zakladov</string>
   <string name="traditional">Tradicionalni zakladi</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 23e41d0..87a9496 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -9,7 +9,6 @@
   <string name="about">Om c:geo</string>
   <string name="latitude">Latitud</string>
   <string name="longitude">Longitud</string>
-  <string name="action_bar_share_title">Skicka cachens länk via</string>
   <string name="settings_titlebar">Inställningar för c:geo</string>
   <string name="all_types">Alla typer av cacher</string>
   <string name="traditional">Traditionell cache</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 401ef27..4e693ba 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -13,7 +13,6 @@
     <string name="longitude">Longitude</string>
 
     <!-- actionbar -->
-    <string name="action_bar_share_title">Share link to cache</string>
     <string name="settings_titlebar">c:geo Settings</string>
     
     <!-- caches -->
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 8c535a2..9e58edc 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -612,7 +612,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
                 menu.findItem(R.id.menu_refresh_stored_top).setTitle(R.string.caches_store_offline);
             }
 
-            final boolean hasSelection = adapter != null && adapter.getCheckedCount() > 0;
             final boolean isNonDefaultList = isConcrete && listId != StoredList.STANDARD_LIST_ID;
 
             if (isOffline || type == CacheListType.HISTORY) { // only offline list
diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index 5b0fdba..542f8ef 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -32,7 +32,7 @@ public class CacheMenuHandler extends AbstractUIFactory {
 
     }
 
-    public static boolean onMenuItemSelected(MenuItem item, CacheMenuHandler.ActivityInterface activityInterface, Geocache cache) {
+    public static boolean onMenuItemSelected(final MenuItem item, final CacheMenuHandler.ActivityInterface activityInterface, final Geocache cache) {
         assert activityInterface instanceof Activity || activityInterface instanceof Fragment;
         final Activity activity;
         if (activityInterface instanceof Activity) {
@@ -54,9 +54,6 @@ public class CacheMenuHandler extends AbstractUIFactory {
             case R.id.menu_show_in_browser:
                 cache.openInBrowser(activity);
                 return true;
-            case R.id.menu_share:
-                cache.shareCache(activity, res);
-                return true;
             case R.id.menu_calendar:
                 CalendarAddon.addToCalendarWithIntent(activity, cache);
                 return true;
@@ -66,7 +63,6 @@ public class CacheMenuHandler extends AbstractUIFactory {
     }
 
     public static void onPrepareOptionsMenu(final Menu menu, final Geocache cache) {
-        //
         if (cache == null) {
             return;
         }
@@ -79,21 +75,21 @@ public class CacheMenuHandler extends AbstractUIFactory {
 
         menu.findItem(R.id.menu_default_navigation).setTitle(NavigationAppFactory.getDefaultNavigationApplication().getName());
 
-        MenuItem shareItem = menu.findItem(R.id.menu_share);
-        ShareActionProvider shareActionProvider = (ShareActionProvider)
+        final MenuItem shareItem = menu.findItem(R.id.menu_share);
+        final ShareActionProvider shareActionProvider = (ShareActionProvider)
                 MenuItemCompat.getActionProvider(shareItem);
         if(shareActionProvider != null) {
-            shareActionProvider.setShareIntent(cache.getIntent());
+            shareActionProvider.setShareIntent(cache.getShareIntent());
         }
 
     }
 
-    public static void addMenuItems(MenuInflater inflater, Menu menu, Geocache cache) {
+    public static void addMenuItems(final MenuInflater inflater, final Menu menu, final Geocache cache) {
         inflater.inflate(R.menu.cache_options, menu);
         onPrepareOptionsMenu(menu, cache);
     }
 
-    public static void addMenuItems(Activity activity, Menu menu, Geocache cache) {
+    public static void addMenuItems(final Activity activity, final Menu menu, final Geocache cache) {
         addMenuItems(activity.getMenuInflater(), menu, cache);
     }
 }
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 193930c..14a1313 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -713,17 +713,7 @@ public class Geocache implements ICache, IWaypoint {
         return getConnector() instanceof ISearchByCenter;
     }
 
-    public void shareCache(final Activity fromActivity, final Resources res) {
-        if (geocode == null) {
-            return;
-        }
-
-        final Intent intent = getIntent();
-
-        fromActivity.startActivity(Intent.createChooser(intent, res.getText(R.string.action_bar_share_title)));
-    }
-
-    public Intent getIntent() {
+    public Intent getShareIntent() {
         final StringBuilder subject = new StringBuilder("Geocache ");
         subject.append(geocode);
         if (StringUtils.isNotBlank(name)) {