From 326bf1e20ca3053b65c3918a96623f37ef9c90c6 Mon Sep 17 00:00:00 2001
From: Michael Keppler <bananeweizen@gmx.de>
Date: Mon, 9 Jun 2014 08:18:28 +0200
Subject: fix #3951: remove cache beacon app

---
 main/res/values-ca/strings.xml                     |  1 -
 main/res/values-cs/strings.xml                     |  1 -
 main/res/values-de/strings.xml                     |  1 -
 main/res/values-fr/strings.xml                     |  1 -
 main/res/values-hu/strings.xml                     |  1 -
 main/res/values-it/strings.xml                     |  1 -
 main/res/values-ja/strings.xml                     |  1 -
 main/res/values-lt/strings.xml                     |  1 -
 main/res/values-nb/strings.xml                     |  1 -
 main/res/values-nl/strings.xml                     |  1 -
 main/res/values-pl/strings.xml                     |  1 -
 main/res/values-pt/strings.xml                     |  1 -
 main/res/values-ro/strings.xml                     |  1 -
 main/res/values-sk/strings.xml                     |  1 -
 main/res/values-sl/strings.xml                     |  1 -
 main/res/values-sv/strings.xml                     |  1 -
 main/res/values/preference_keys.xml                |  1 -
 main/res/values/strings.xml                        |  1 -
 main/res/xml/preferences.xml                       |  5 -----
 .../cgeo/geocaching/apps/cache/CacheBeaconApp.java | 18 ------------------
 .../apps/cache/navi/NavigationAppFactory.java      | 22 ++++++++++------------
 21 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 main/src/cgeo/geocaching/apps/cache/CacheBeaconApp.java

(limited to 'main')

diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index cc4d880..4cd90db 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -641,7 +641,6 @@
   <string name="cache_menu_move_list">Mou a una llista diferent</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Catxé de balisa</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 356b45d..e6d3c28 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -629,7 +629,6 @@
   <string name="cache_menu_move_list">Přesunout do jiného seznamu</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 98cfd60..69d1347 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -645,7 +645,6 @@
   <string name="cache_menu_move_list">Auf andere Liste verschieben</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble Smartwatch</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 0357e71..2bcbe1f 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -643,7 +643,6 @@
   <string name="cache_menu_move_list">Déplacer dans une autre liste</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_status">Statut</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 4861657..ca8a51e 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -454,7 +454,6 @@
   <string name="cache_menu_move_list">Mozgatás másik listára</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Geoláda jelzőbója</string>
   <string name="cache_status">Állapot</string>
   <string name="cache_status_offline_log">Mentett bejegyzés</string>
   <string name="cache_status_found">Megtalált</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index ebcbb2d..96b10eb 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -630,7 +630,6 @@
   <string name="cache_menu_move_list">Muovi in un\'altra lista</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_status">Stato</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 29a2199..16a7376 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -582,7 +582,6 @@
   <string name="cache_menu_move_list">他のリストに移動</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">キャッシュビーコン</string>
   <string name="cache_status">状態</string>
   <string name="cache_status_offline_log">保存済みのログ</string>
   <string name="cache_status_found">見つかった</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index 70967b0..b9a5940 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -642,7 +642,6 @@
   <string name="cache_menu_move_list">Perkelti į kitą sąrašą</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
   <string name="cache_status">Būsena</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index d5ff462..4a3404e 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -625,7 +625,6 @@
   <string name="cache_menu_move_list">Flytt til annen liste</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_status">Status</string>
   <string name="cache_status_offline_log">Logg lagret</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 91491ea..ea6c0fc 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -641,7 +641,6 @@
   <string name="cache_menu_move_list">Verplaats naar andere lijst</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache baken</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index bfaa215..9127437 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -637,7 +637,6 @@
   <string name="cache_menu_move_list">Przenieś do innej listy</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Zegarek Pebble</string>
   <string name="cache_status">Status</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index cf95378..60a9892 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -633,7 +633,6 @@
   <string name="cache_menu_move_list">Mover para outra lista</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Seixo</string>
   <string name="cache_status">Estado</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index c082efd..5580b63 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -634,7 +634,6 @@
   <string name="cache_menu_move_list">Mută în altă listă</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cutie Baliză</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Ceas \"Pebble\"</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index ecb86c3..612ef76 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -626,7 +626,6 @@
   <string name="cache_menu_move_list">Presunúť do iného zoznamu</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_status">Stav</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index 00195b4..381cb32 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -636,7 +636,6 @@
   <string name="cache_menu_move_list">Premakni v drug seznam</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_status">Status</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index ce42b71..d308966 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -641,7 +641,6 @@
   <string name="cache_menu_move_list">Flytta till annan lista</string>
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
-  <string name="cache_menu_cachebeacon">Cache Beacon</string>
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index e77cd79..797ff11 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -135,7 +135,6 @@
     <string name="pref_navigation_menu_google_walk">navigationGoogleWalk</string>
     <string name="pref_navigation_menu_google_bike">navigationGoogleBike</string>
     <string name="pref_navigation_menu_google_maps_directions">navigationMapsDirections</string>
-    <string name="pref_navigation_menu_cache_beacon">navigationCacheBeacon</string>
     <string name="pref_navigation_menu_where_you_go">navigationWhereYouGo</string>
     <string name="pref_navigation_menu_pebble">navigationPebble</string>
     <string name="pref_navigation_menu_mapswithme">navigationMapsWithMe</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index b1c7544..cd6dd3b 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -698,7 +698,6 @@
     <string name="cache_menu_move_list">Move to different list</string>
     <string name="cache_menu_whereyougo">WhereYouGo</string>
     <string name="cache_menu_oruxmaps">OruxMaps</string>
-    <string name="cache_menu_cachebeacon">Cache Beacon</string>
     <string name="cache_menu_navigon">Navigon</string>
     <string name="cache_menu_pebble">Pebble</string>
     <string name="cache_menu_mapswithme">MapsWithMe</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index 148c4aa..90911ae 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -663,11 +663,6 @@
                 <CheckBoxPreference
                     android:defaultValue="true"
                     android:enabled="false"
-                    android:key="@string/pref_navigation_menu_cache_beacon"
-                    android:title="@string/cache_menu_cachebeacon" />
-                <CheckBoxPreference
-                    android:defaultValue="true"
-                    android:enabled="false"
                     android:key="@string/pref_navigation_menu_where_you_go"
                     android:title="@string/cache_menu_whereyougo" />
                 <CheckBoxPreference
diff --git a/main/src/cgeo/geocaching/apps/cache/CacheBeaconApp.java b/main/src/cgeo/geocaching/apps/cache/CacheBeaconApp.java
deleted file mode 100644
index 34c9074..0000000
--- a/main/src/cgeo/geocaching/apps/cache/CacheBeaconApp.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cgeo.geocaching.apps.cache;
-
-import cgeo.geocaching.Geocache;
-import cgeo.geocaching.R;
-import cgeo.geocaching.enumerations.CacheAttribute;
-
-public class CacheBeaconApp extends AbstractGeneralApp {
-
-    public CacheBeaconApp() {
-        super(getString(R.string.cache_menu_cachebeacon), R.id.cache_app_cache_beacon, "de.fun2code.android.cachebeacon");
-    }
-
-    @Override
-    public boolean isEnabled(Geocache cache) {
-        return cache.hasAttribute(CacheAttribute.WIRELESSBEACON, true);
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index 1446d8a..6120116 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -7,7 +7,6 @@ import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.apps.AbstractAppFactory;
 import cgeo.geocaching.apps.App;
-import cgeo.geocaching.apps.cache.CacheBeaconApp;
 import cgeo.geocaching.apps.cache.WhereYouGoApp;
 import cgeo.geocaching.apps.cache.navi.GoogleNavigationApp.GoogleNavigationBikeApp;
 import cgeo.geocaching.apps.cache.navi.GoogleNavigationApp.GoogleNavigationDrivingApp;
@@ -68,7 +67,6 @@ public final class NavigationAppFactory extends AbstractAppFactory {
          */
         GOOGLE_MAPS_DIRECTIONS(new GoogleMapsDirectionApp(), 13, R.string.pref_navigation_menu_google_maps_directions),
 
-        CACHE_BEACON(new CacheBeaconApp(), 14, R.string.pref_navigation_menu_cache_beacon),
         WHERE_YOU_GO(new WhereYouGoApp(), 16, R.string.pref_navigation_menu_where_you_go),
         PEBBLE(new PebbleApp(), 17, R.string.pref_navigation_menu_pebble),
         MAPSWITHME(new MapsWithMeApp(), 22, R.string.pref_navigation_menu_mapswithme);
@@ -180,7 +178,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
         builder.setTitle(R.string.cache_menu_navigate);
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
-            public void onClick(DialogInterface dialog, int item) {
+            public void onClick(final DialogInterface dialog, final int item) {
                 final NavigationAppsEnum selectedItem = adapter.getItem(item);
                 invokeNavigation(activity, cache, waypoint, destination, selectedItem.app);
             }
@@ -228,27 +226,27 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      * @param cache
      * @return
      */
-    public static boolean onMenuItemSelected(final MenuItem item, Activity activity, Geocache cache) {
+    public static boolean onMenuItemSelected(final MenuItem item, final Activity activity, final Geocache cache) {
         final App menuItem = getAppFromMenuItem(item);
         navigateCache(activity, cache, menuItem);
         return menuItem != null;
     }
 
-    private static void navigateCache(Activity activity, Geocache cache, @Nullable App app) {
+    private static void navigateCache(final Activity activity, final Geocache cache, @Nullable final App app) {
         if (app instanceof CacheNavigationApp) {
             final CacheNavigationApp cacheApp = (CacheNavigationApp) app;
             cacheApp.navigate(activity, cache);
         }
     }
 
-    private static void navigateWaypoint(Activity activity, Waypoint waypoint, @Nullable App app) {
+    private static void navigateWaypoint(final Activity activity, final Waypoint waypoint, @Nullable final App app) {
         if (app instanceof WaypointNavigationApp) {
             final WaypointNavigationApp waypointApp = (WaypointNavigationApp) app;
             waypointApp.navigate(activity, waypoint);
         }
     }
 
-    private static void navigateGeopoint(Activity activity, Geopoint destination, App app) {
+    private static void navigateGeopoint(final Activity activity, final Geopoint destination, final App app) {
         if (app instanceof GeopointNavigationApp) {
             final GeopointNavigationApp geopointApp = (GeopointNavigationApp) app;
             geopointApp.navigate(activity, destination);
@@ -256,7 +254,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
     }
 
     @Nullable
-    private static App getAppFromMenuItem(MenuItem item) {
+    private static App getAppFromMenuItem(final MenuItem item) {
         final int id = item.getItemId();
         for (final NavigationAppsEnum navApp : NavigationAppsEnum.values()) {
             if (navApp.id == id) {
@@ -274,7 +272,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      * @param activity
      * @param cache
      */
-    public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, Geocache cache) {
+    public static void startDefaultNavigationApplication(final int defaultNavigation, final Activity activity, final Geocache cache) {
         if (cache == null || cache.getCoords() == null) {
             ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
@@ -283,7 +281,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
         navigateCache(activity, cache, getDefaultNavigationApplication(defaultNavigation));
     }
 
-    private static App getDefaultNavigationApplication(int defaultNavigation) {
+    private static App getDefaultNavigationApplication(final int defaultNavigation) {
         if (defaultNavigation == 2) {
             return getNavigationAppForId(Settings.getDefaultNavigationTool2());
         }
@@ -296,7 +294,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      * @param activity
      * @param waypoint
      */
-    public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, Waypoint waypoint) {
+    public static void startDefaultNavigationApplication(final int defaultNavigation, final Activity activity, final Waypoint waypoint) {
         if (waypoint == null || waypoint.getCoords() == null) {
             ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
@@ -310,7 +308,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      * @param activity
      * @param destination
      */
-    public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, final Geopoint destination) {
+    public static void startDefaultNavigationApplication(final int defaultNavigation, final Activity activity, final Geopoint destination) {
         if (destination == null) {
             ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
-- 
cgit v1.1