From 53bf82297323dc43ddb5eefc9a7e453a1013ab4a Mon Sep 17 00:00:00 2001
From: SammysHP <sven@sammyshp.de>
Date: Mon, 25 Mar 2013 21:05:37 +0100
Subject: Remove unused translations

---
 main/res/values-cs/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'main')

diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 5ea6fdd..caf0a17 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -409,7 +409,6 @@
   <string name="init_offline_wp">Ukládat statické mapy k bodům trasy pro offline použití</string>
   <string name="init_save_log_img">Ukládat obrázky z logů</string>
   <string name="init_units">Používat imperiální jednotky vzdálenosti</string>
-  <string name="init_nav">Používat Google Navigaci</string>
   <string name="init_log_offline">Povolit Offline logování\n(Při logování nezobrazovat online logovací obrazovku a neodesílat Log na server)</string>
   <string name="init_choose_list">Ptát se na seznam pro uložení keše</string>
   <string name="init_livelist">Zobrazovat směr v seznamu keší</string>
@@ -1062,7 +1061,6 @@
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">Stránka c:geo</a></string>
   <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string>
   <string name="nutshellmanual">Návod: <a href="http://manual.cgeo.org/">c:geo v Nutshell</a></string>
-  <string name="about_go4cache">Služba <b>Go 4 Cache</b> zobrazuje ostatní geokačery na mapě (v <b>c:geo</b> nebo v prohlížeči) v reálném čase. Může zobrazovat - na příklad - jakou keš zrovna hledají. Připojením se k <b>Go 4 Cache</b> získá aplikace <b>c:geo</b> povolení zveřejňovat tvou polohu při geocachingu (pouze když je <b>c:geo</b> spuštěno).</string>
   <string name="about_twitter">Má <b>c:geo</b> publikovat nový status na Twitteru vždy, když zaloguješ keš?</string>
   <string name="about_auth_1">Následující proces dovoluje aplikaci <b>c:geo</b> přístup na Twitter - pokud budeš souhlasit.</string>
   <string name="about_auth_2">Klepnutím na tlačítko \"Zahájit autorizaci\" bude proces zahájen. Tento proces otevře webový prohlížeč s Twitterem. Přihlaš se na této stránce a povol <b>c:geu</b> přístup k tvému účtu. Pokud je to povoleno, Twitter ti ukáže číselný PIN kód. Tento PIN kód musíš zadat do <b>c:geo</b> a potvrdit. To je vše.</string>
-- 
cgit v1.1


From d2500fe31f90a9aedcde5676f1b02da9f58e88ef Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Wed, 27 Mar 2013 20:48:27 +0100
Subject: more checks in static maps test

---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 25 +++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index cd88071..8f89340 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -49,7 +49,7 @@ public class StaticMapsProvider {
         downloadMap(geocode, 11, ROADMAP, markerUrl, prefix + '5', "", latlonMap, edge, edge, waypoints);
     }
 
-    private static void downloadMap(String geocode, int zoom, String mapType, String markerUrl, String prefix, String shadow, String latlonMap, int width, int height, final Parameters waypoints) {
+    private static DownloadState downloadMap(String geocode, int zoom, String mapType, String markerUrl, String prefix, String shadow, String latlonMap, int width, int height, final Parameters waypoints) {
         final Parameters params = new Parameters(
                 "center", latlonMap,
                 "zoom", String.valueOf(zoom),
@@ -64,11 +64,11 @@ public class StaticMapsProvider {
 
         if (httpResponse == null) {
             Log.e("StaticMapsProvider.downloadMap: httpResponse is null");
-            return;
+            return DownloadState.REQUEST_FAILED;
         }
         if (httpResponse.getStatusLine().getStatusCode() != 200) {
             Log.d("StaticMapsProvider.downloadMap: httpResponseCode = " + httpResponse.getStatusLine().getStatusCode());
-            return;
+            return DownloadState.STATUS_CODE_NOK;
         }
         final File file = getMapFile(geocode, prefix, true);
         if (LocalStorage.saveEntityToFile(httpResponse, file)) {
@@ -76,8 +76,11 @@ public class StaticMapsProvider {
             final long fileSize = file.length();
             if (fileSize < MIN_MAP_IMAGE_BYTES) {
                 file.delete();
+                return DownloadState.FILE_TOO_SMALL;
             }
+            return DownloadState.OK;
         }
+        return DownloadState.NOT_SAVED;
     }
 
     public static void downloadMaps(Geocache cache) {
@@ -166,10 +169,10 @@ public class StaticMapsProvider {
         downloadMaps(cache.getGeocode(), cacheMarkerUrl, "", latlonMap, edge, waypoints, waitForResult);
     }
 
-    public static void storeCachePreviewMap(final Geocache cache) {
+    public static DownloadState storeCachePreviewMap(final Geocache cache) {
         if (cache == null) {
             Log.e("storeCachePreviewMap - missing input parameter cache");
-            return;
+            return DownloadState.FAILED;
         }
         final String latlonMap = cache.getCoords().format(Format.LAT_LON_DECDEGREE_COMMA);
         final Display display = ((WindowManager) cgeoapplication.getInstance().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
@@ -178,7 +181,8 @@ public class StaticMapsProvider {
         final int width = metrics.widthPixels;
         final int height = (int) (110 * metrics.density);
         final String markerUrl = MARKERS_URL + "my_location_mdpi.png";
-        downloadMap(cache.getGeocode(), 15, ROADMAP, markerUrl, PREFIX_PREVIEW, "shadow:false|", latlonMap, width, height, null);
+        DownloadState state = downloadMap(cache.getGeocode(), 15, ROADMAP, markerUrl, PREFIX_PREVIEW, "shadow:false|", latlonMap, width, height, null);
+        return state;
     }
 
     private static int guessMaxDisplaySide() {
@@ -245,7 +249,7 @@ public class StaticMapsProvider {
 
     /**
      * Check if at least one map file exists for the given cache.
-     * 
+     *
      * @param cache
      * @return <code>true</code> if at least one map file exists; <code>false</code> otherwise
      */
@@ -268,7 +272,7 @@ public class StaticMapsProvider {
 
     /**
      * Checks if at least one map file exists for the given geocode and waypoint ID.
-     * 
+     *
      * @param geocode
      * @param waypoint
      * @return <code>true</code> if at least one map file exists; <code>false</code> otherwise
@@ -287,7 +291,7 @@ public class StaticMapsProvider {
 
     /**
      * Checks if all map files exist for the given geocode and waypoint ID.
-     * 
+     *
      * @param geocode
      * @param waypoint
      * @return <code>true</code> if all map files exist; <code>false</code> otherwise
@@ -327,4 +331,7 @@ public class StaticMapsProvider {
         return null;
     }
 
+    public enum DownloadState {
+        OK, REQUEST_FAILED, STATUS_CODE_NOK, FILE_TOO_SMALL, NOT_SAVED, FAILED
+    }
 }
-- 
cgit v1.1


From 016ac19e28f8cd672f7b9f512fe9b55c766a08e0 Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Wed, 27 Mar 2013 21:03:42 +0100
Subject: remove StaticMapsProvider changes

---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 8f89340..69f5cc4 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -49,7 +49,7 @@ public class StaticMapsProvider {
         downloadMap(geocode, 11, ROADMAP, markerUrl, prefix + '5', "", latlonMap, edge, edge, waypoints);
     }
 
-    private static DownloadState downloadMap(String geocode, int zoom, String mapType, String markerUrl, String prefix, String shadow, String latlonMap, int width, int height, final Parameters waypoints) {
+    private static void downloadMap(String geocode, int zoom, String mapType, String markerUrl, String prefix, String shadow, String latlonMap, int width, int height, final Parameters waypoints) {
         final Parameters params = new Parameters(
                 "center", latlonMap,
                 "zoom", String.valueOf(zoom),
@@ -64,11 +64,11 @@ public class StaticMapsProvider {
 
         if (httpResponse == null) {
             Log.e("StaticMapsProvider.downloadMap: httpResponse is null");
-            return DownloadState.REQUEST_FAILED;
+            return;
         }
         if (httpResponse.getStatusLine().getStatusCode() != 200) {
             Log.d("StaticMapsProvider.downloadMap: httpResponseCode = " + httpResponse.getStatusLine().getStatusCode());
-            return DownloadState.STATUS_CODE_NOK;
+            return;
         }
         final File file = getMapFile(geocode, prefix, true);
         if (LocalStorage.saveEntityToFile(httpResponse, file)) {
@@ -76,11 +76,11 @@ public class StaticMapsProvider {
             final long fileSize = file.length();
             if (fileSize < MIN_MAP_IMAGE_BYTES) {
                 file.delete();
-                return DownloadState.FILE_TOO_SMALL;
+                return;
             }
-            return DownloadState.OK;
+            return;
         }
-        return DownloadState.NOT_SAVED;
+        return;
     }
 
     public static void downloadMaps(Geocache cache) {
@@ -169,10 +169,10 @@ public class StaticMapsProvider {
         downloadMaps(cache.getGeocode(), cacheMarkerUrl, "", latlonMap, edge, waypoints, waitForResult);
     }
 
-    public static DownloadState storeCachePreviewMap(final Geocache cache) {
+    public static void storeCachePreviewMap(final Geocache cache) {
         if (cache == null) {
             Log.e("storeCachePreviewMap - missing input parameter cache");
-            return DownloadState.FAILED;
+            return;
         }
         final String latlonMap = cache.getCoords().format(Format.LAT_LON_DECDEGREE_COMMA);
         final Display display = ((WindowManager) cgeoapplication.getInstance().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
@@ -181,8 +181,7 @@ public class StaticMapsProvider {
         final int width = metrics.widthPixels;
         final int height = (int) (110 * metrics.density);
         final String markerUrl = MARKERS_URL + "my_location_mdpi.png";
-        DownloadState state = downloadMap(cache.getGeocode(), 15, ROADMAP, markerUrl, PREFIX_PREVIEW, "shadow:false|", latlonMap, width, height, null);
-        return state;
+        downloadMap(cache.getGeocode(), 15, ROADMAP, markerUrl, PREFIX_PREVIEW, "shadow:false|", latlonMap, width, height, null);
     }
 
     private static int guessMaxDisplaySide() {
@@ -330,8 +329,4 @@ public class StaticMapsProvider {
         }
         return null;
     }
-
-    public enum DownloadState {
-        OK, REQUEST_FAILED, STATUS_CODE_NOK, FILE_TOO_SMALL, NOT_SAVED, FAILED
-    }
 }
-- 
cgit v1.1


From b3c74231b10ad15ed00b4107cf9f456c74978d51 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Thu, 28 Mar 2013 21:46:09 +0100
Subject: fix #2583: coordinates format switching for waypoints

---
 main/src/cgeo/geocaching/CacheDetailActivity.java  | 20 ++----------
 .../geocaching/ui/CoordinatesFormatSwitcher.java   | 38 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 main/src/cgeo/geocaching/ui/CoordinatesFormatSwitcher.java

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 43ce65f..ea8794f 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -21,6 +21,7 @@ import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.ui.CacheDetailsCreator;
+import cgeo.geocaching.ui.CoordinatesFormatSwitcher;
 import cgeo.geocaching.ui.DecryptTextClickListener;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.ImagesList;
@@ -1202,23 +1203,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             // cache coordinates
             if (cache.getCoords() != null) {
                 TextView valueView = details.add(R.string.cache_coordinates, cache.getCoords().toString());
-                valueView.setOnClickListener(new View.OnClickListener() {
-                    private int position = 0;
-                    private GeopointFormatter.Format[] availableFormats = new GeopointFormatter.Format[] {
-                            GeopointFormatter.Format.LAT_LON_DECMINUTE,
-                            GeopointFormatter.Format.LAT_LON_DECSECOND,
-                            GeopointFormatter.Format.LAT_LON_DECDEGREE
-                    };
-
-                    // rotate coordinate formats on click
-                    @Override
-                    public void onClick(View view) {
-                        position = (position + 1) % availableFormats.length;
-
-                        final TextView valueView = (TextView) view.findViewById(R.id.value);
-                        valueView.setText(cache.getCoords().format(availableFormats[position]));
-                    }
-                });
+                valueView.setOnClickListener(new CoordinatesFormatSwitcher(cache.getCoords()));
                 registerForContextMenu(valueView);
             }
 
@@ -2206,6 +2191,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 // coordinates
                 if (null != wpt.getCoords()) {
                     final TextView coordinatesView = (TextView) waypointView.findViewById(R.id.coordinates);
+                    coordinatesView.setOnClickListener(new CoordinatesFormatSwitcher(wpt.getCoords()));
                     coordinatesView.setText(wpt.getCoords().toString());
                     coordinatesView.setVisibility(View.VISIBLE);
                 }
diff --git a/main/src/cgeo/geocaching/ui/CoordinatesFormatSwitcher.java b/main/src/cgeo/geocaching/ui/CoordinatesFormatSwitcher.java
new file mode 100644
index 0000000..afadb33
--- /dev/null
+++ b/main/src/cgeo/geocaching/ui/CoordinatesFormatSwitcher.java
@@ -0,0 +1,38 @@
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.geopoint.GeopointFormatter;
+
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+
+/**
+ * view click listener to automatically switch different coordinate formats
+ * 
+ */
+public class CoordinatesFormatSwitcher implements OnClickListener {
+
+    private static GeopointFormatter.Format[] availableFormats = new GeopointFormatter.Format[] {
+            GeopointFormatter.Format.LAT_LON_DECMINUTE,
+            GeopointFormatter.Format.LAT_LON_DECSECOND,
+            GeopointFormatter.Format.LAT_LON_DECDEGREE
+    };
+
+    private int position = 0;
+
+    private final Geopoint coordinates;
+
+    public CoordinatesFormatSwitcher(final Geopoint coordinates) {
+        this.coordinates = coordinates;
+    }
+
+    @Override
+    public void onClick(View view) {
+        position = (position + 1) % availableFormats.length;
+        TextView textView = (TextView) view;
+        // rotate coordinate formats on click
+        textView.setText(coordinates.format(availableFormats[position]));
+    }
+
+}
\ No newline at end of file
-- 
cgit v1.1


From fc32c233b8a4f52e948d6d09c029a73c4a7a7a15 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Fri, 29 Mar 2013 10:02:08 +0100
Subject: #1798: refactoring, extract common asynctask with progress

---
 .../src/cgeo/geocaching/export/AbstractExport.java |  7 +-
 .../cgeo/geocaching/export/FieldnoteExport.java    | 23 ++-----
 main/src/cgeo/geocaching/export/GpxExport.java     | 25 ++-----
 .../geocaching/utils/AsyncTaskWithProgress.java    | 80 ++++++++++++++++++++++
 4 files changed, 98 insertions(+), 37 deletions(-)
 create mode 100644 main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/export/AbstractExport.java b/main/src/cgeo/geocaching/export/AbstractExport.java
index 72ea544..e4ba5f0 100644
--- a/main/src/cgeo/geocaching/export/AbstractExport.java
+++ b/main/src/cgeo/geocaching/export/AbstractExport.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.export;
 
+import cgeo.geocaching.R;
 import cgeo.geocaching.cgeoapplication;
 
 abstract class AbstractExport implements Export {
@@ -27,7 +28,7 @@ abstract class AbstractExport implements Export {
 
     /**
      * Generates a localized string from a resource id.
-     * 
+     *
      * @param resourceId
      *            the resource id of the string
      * @param params
@@ -43,4 +44,8 @@ abstract class AbstractExport implements Export {
         // used in the array adapter of the dialog showing the exports
         return getName();
     }
+
+    protected String getProgressTitle() {
+        return getString(R.string.export) + ": " + getName();
+    }
 }
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index 5e1805a..eadcb77 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -5,11 +5,11 @@ import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.network.Parameters;
+import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.IOUtils;
 import cgeo.geocaching.utils.Log;
 
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.os.AsyncTask;
 import android.os.Environment;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -102,18 +101,17 @@ class FieldnoteExport extends AbstractExport {
         return builder.create();
     }
 
-    private class ExportTask extends AsyncTask<Void, Integer, Boolean> {
+    private class ExportTask extends AsyncTaskWithProgress<Void, Boolean> {
         private final List<Geocache> caches;
         private final Activity activity;
         private final boolean upload;
         private final boolean onlyNew;
-        private final Progress progress = new Progress();
         private File exportFile;
 
         private static final int STATUS_UPLOAD = -1;
 
         /**
-         * Instantiates and configurates the task for exporting field notes.
+         * Instantiates and configures the task for exporting field notes.
          *
          * @param caches
          *            The {@link List} of {@link cgeo.geocaching.Geocache} to be exported
@@ -125,6 +123,7 @@ class FieldnoteExport extends AbstractExport {
          *            Upload/export only new logs since last export
          */
         public ExportTask(final List<Geocache> caches, final Activity activity, final boolean upload, final boolean onlyNew) {
+            super(activity, getProgressTitle(), getString(R.string.export_fieldnotes_creating));
             this.caches = caches;
             this.activity = activity;
             this.upload = upload;
@@ -132,13 +131,6 @@ class FieldnoteExport extends AbstractExport {
         }
 
         @Override
-        protected void onPreExecute() {
-            if (null != activity) {
-                progress.show(activity, getString(R.string.export) + ": " + getName(), getString(R.string.export_fieldnotes_creating), true, null);
-            }
-        }
-
-        @Override
         protected Boolean doInBackground(Void... params) {
             final StringBuilder fieldNoteBuffer = new StringBuilder();
             try {
@@ -228,9 +220,8 @@ class FieldnoteExport extends AbstractExport {
 
         @Override
         protected void onPostExecute(Boolean result) {
+            super.onPostExecute(result);
             if (null != activity) {
-                progress.dismiss();
-
                 if (result) {
                     //                    if (onlyNew) {
                     //                        // update last export time in settings when doing it ourself (currently we use the date check from gc.com)
@@ -251,9 +242,9 @@ class FieldnoteExport extends AbstractExport {
         protected void onProgressUpdate(Integer... status) {
             if (null != activity) {
                 if (STATUS_UPLOAD == status[0]) {
-                    progress.setMessage(getString(R.string.export_fieldnotes_uploading));
+                    setMessage(getString(R.string.export_fieldnotes_uploading));
                 } else {
-                    progress.setMessage(getString(R.string.export_fieldnotes_creating) + " (" + status[0] + ')');
+                    setMessage(getString(R.string.export_fieldnotes_creating) + " (" + status[0] + ')');
                 }
             }
         }
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index c4060fe..0ae9037 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -6,11 +6,12 @@ import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.cgData;
+import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.enumerations.CacheAttribute;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.BaseUtils;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.XmlUtils;
@@ -21,11 +22,9 @@ import org.xmlpull.v1.XmlSerializer;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Environment;
 import android.util.Xml;
 import android.view.ContextThemeWrapper;
@@ -98,10 +97,9 @@ class GpxExport extends AbstractExport {
         return builder.create();
     }
 
-    private class ExportTask extends AsyncTask<Void, Integer, File> {
+    private class ExportTask extends AsyncTaskWithProgress<Void, File> {
         private final List<Geocache> caches;
         private final Activity activity;
-        private final Progress progress = new Progress();
 
         /**
          * Instantiates and configures the task for exporting field notes.
@@ -112,19 +110,12 @@ class GpxExport extends AbstractExport {
          *            optional: Show a progress bar and toasts
          */
         public ExportTask(final List<Geocache> caches, final Activity activity) {
+            super(activity, caches.size(), getProgressTitle(), cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, caches.size(), caches.size()));
             this.caches = caches;
             this.activity = activity;
         }
 
         @Override
-        protected void onPreExecute() {
-            if (null != activity) {
-                progress.show(activity, null, getString(R.string.export) + ": " + getName(), ProgressDialog.STYLE_HORIZONTAL, null);
-                progress.setMaxProgressAndReset(caches.size());
-            }
-        }
-
-        @Override
         protected File doInBackground(Void... params) {
             // quick check for being able to write the GPX file
             if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
@@ -344,8 +335,8 @@ class GpxExport extends AbstractExport {
 
         @Override
         protected void onPostExecute(final File exportFile) {
+            super.onPostExecute(exportFile);
             if (null != activity) {
-                progress.dismiss();
                 if (exportFile != null) {
                     ActivityMixin.showToast(activity, getName() + ' ' + getString(R.string.export_exportedto) + ": " + exportFile.toString());
                     if (Settings.getShareAfterExport()) {
@@ -361,11 +352,5 @@ class GpxExport extends AbstractExport {
             }
         }
 
-        @Override
-        protected void onProgressUpdate(Integer... status) {
-            if (null != activity) {
-                progress.setProgress(status[0]);
-            }
-        }
     }
 }
diff --git a/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java b/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java
new file mode 100644
index 0000000..b23fa9d
--- /dev/null
+++ b/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java
@@ -0,0 +1,80 @@
+package cgeo.geocaching.utils;
+
+import cgeo.geocaching.activity.Progress;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.os.AsyncTask;
+
+/**
+ * AsyncTask which automatically shows a progress dialog. Use it like the {@code AsyncTask} class, but leave away the
+ * middle template parameter.
+ *
+ * @param <Params>
+ * @param <Result>
+ */
+public abstract class AsyncTaskWithProgress<Params, Result> extends AsyncTask<Params, Integer, Result> {
+
+    private final Progress progress = new Progress();
+    private final Activity activity;
+    private final int maxProgress;
+    private final String progressTitle;
+    private final String progressMessage;
+
+    /**
+     * Creates an AsyncTask with progress dialog, where the maximum is set to the given maxProgress.
+     * 
+     * @param activity
+     * @param maxProgress
+     * @param progressTitle
+     * @param progressMessage
+     */
+    public AsyncTaskWithProgress(final Activity activity, final int maxProgress, final String progressTitle, final String progressMessage) {
+        this.activity = activity;
+        this.maxProgress = maxProgress;
+        this.progressTitle = progressTitle;
+        this.progressMessage = progressMessage;
+    }
+
+    /**
+     * Creates an AsyncTask with progress dialog, where the maximum is set to indeterminate.
+     * 
+     * @param activity
+     * @param progressTitle
+     * @param progressMessage
+     */
+    public AsyncTaskWithProgress(final Activity activity, final String progressTitle, final String progressMessage) {
+        this(activity, 0, progressTitle, progressMessage);
+    }
+
+    @Override
+    protected void onPreExecute() {
+        if (null != activity) {
+            if (maxProgress <= 0) {
+                progress.show(activity, progressTitle, progressMessage, true, null);
+            }
+            else {
+                progress.show(activity, progressTitle, progressMessage, ProgressDialog.STYLE_HORIZONTAL, null);
+            }
+            progress.setMaxProgressAndReset(maxProgress);
+        }
+    }
+
+    @Override
+    protected void onPostExecute(Result result) {
+        if (null != activity) {
+            progress.dismiss();
+        }
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... status) {
+        if (null != activity) {
+            progress.setProgress(status[0]);
+        }
+    }
+
+    protected void setMessage(final String message) {
+        progress.setMessage(message);
+    }
+}
-- 
cgit v1.1


From 163cd60d56714f853790a89918e0a2804d1e5b47 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Fri, 29 Mar 2013 19:48:29 +0100
Subject: refactoring: improve performance of GPX export

* load batches of caches instead of single caches
* do not load all caches to avoid huge memory usage
---
 main/src/cgeo/geocaching/export/GpxExport.java | 146 +++++++++++++++----------
 1 file changed, 88 insertions(+), 58 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 36c8ca7..19b8518 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -38,8 +38,11 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 class GpxExport extends AbstractExport {
     private static final SimpleDateFormat dateFormatZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
@@ -47,6 +50,11 @@ class GpxExport extends AbstractExport {
     public static final String PREFIX_GPX = "http://www.topografix.com/GPX/1/0";
     public static final String PREFIX_GROUNDSPEAK = "http://www.groundspeak.com/cache/1/0";
 
+    /**
+     * During the export, only this number of geocaches is fully loaded into memory.
+     */
+    public static final int CACHES_PER_BATCH = 100;
+
     protected GpxExport() {
         super(getString(R.string.export_gpx));
     }
@@ -98,8 +106,9 @@ class GpxExport extends AbstractExport {
     }
 
     private class ExportTask extends AsyncTaskWithProgress<Void, File> {
-        private final List<Geocache> caches;
+        private final Set<String> allGeocodes = new HashSet<String>();
         private final Activity activity;
+        private int countExported = 0;
 
         /**
          * Instantiates and configures the task for exporting field notes.
@@ -111,7 +120,11 @@ class GpxExport extends AbstractExport {
          */
         public ExportTask(final List<Geocache> caches, final Activity activity) {
             super(activity, caches.size(), getProgressTitle(), cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, caches.size(), caches.size()));
-            this.caches = caches;
+
+            // get rid of the (half loaded) caches, we will reload them as full caches during the export
+            for (Geocache geocache : caches) {
+                allGeocodes.add(geocache.getGeocode());
+            }
             this.activity = activity;
         }
 
@@ -144,68 +157,24 @@ class GpxExport extends AbstractExport {
                         PREFIX_GPX + " http://www.topografix.com/GPX/1/0/gpx.xsd " +
                                 PREFIX_GROUNDSPEAK + " http://www.groundspeak.com/cache/1/0/1/cache.xsd");
 
-                for (int i = 0; i < caches.size(); i++) {
-                    final Geocache cache = cgData.loadCache(caches.get(i).getGeocode(), LoadFlags.LOAD_ALL_DB_ONLY);
+                // Split the overall set of geocodes into small chunks. That is a compromise between memory efficiency (because
+                // we don't load all caches fully into memory) and speed (because we don't query each cache separately).
 
-                    gpx.startTag(PREFIX_GPX, "wpt");
-                    gpx.attribute("", "lat", Double.toString(cache.getCoords().getLatitude()));
-                    gpx.attribute("", "lon", Double.toString(cache.getCoords().getLongitude()));
-
-                    final Date hiddenDate = cache.getHiddenDate();
-                    if (hiddenDate != null) {
-                        XmlUtils.simpleText(gpx, PREFIX_GPX, "time", dateFormatZ.format(hiddenDate));
+                while (!allGeocodes.isEmpty()) {
+                    int cachesInBatch = 0;
+                    HashSet<String> geocodesOfBatch = new HashSet<String>(CACHES_PER_BATCH);
+                    for (Iterator<String> iterator = allGeocodes.iterator(); iterator.hasNext() && cachesInBatch < CACHES_PER_BATCH;) {
+                        final String geocode = iterator.next();
+                        geocodesOfBatch.add(geocode);
+                        cachesInBatch++;
                     }
-
-                    XmlUtils.multipleTexts(gpx, PREFIX_GPX,
-                            "name", cache.getGeocode(),
-                            "desc", cache.getName(),
-                            "url", cache.getUrl(),
-                            "urlname", cache.getName(),
-                            "sym", cache.isFound() ? "Geocache Found" : "Geocache",
-                            "type", "Geocache|" + cache.getType().pattern);
-
-                    gpx.startTag(PREFIX_GROUNDSPEAK, "cache");
-                    gpx.attribute("", "id", cache.getCacheId());
-                    gpx.attribute("", "available", !cache.isDisabled() ? "True" : "False");
-                    gpx.attribute("", "archives", cache.isArchived() ? "True" : "False");
-
-                    XmlUtils.multipleTexts(gpx, PREFIX_GROUNDSPEAK,
-                            "name", cache.getName(),
-                            "placed_by", cache.getOwnerDisplayName(),
-                            "owner", cache.getOwnerUserId(),
-                            "type", cache.getType().pattern,
-                            "container", cache.getSize().id,
-                            "difficulty", Float.toString(cache.getDifficulty()),
-                            "terrain", Float.toString(cache.getTerrain()),
-                            "country", cache.getLocation(),
-                            "state", "",
-                            "encoded_hints", cache.getHint());
-
-                    writeAttributes(gpx, cache);
-
-                    gpx.startTag(PREFIX_GROUNDSPEAK, "short_description");
-                    gpx.attribute("", "html", BaseUtils.containsHtml(cache.getShortDescription()) ? "True" : "False");
-                    gpx.text(cache.getShortDescription());
-                    gpx.endTag(PREFIX_GROUNDSPEAK, "short_description");
-
-                    gpx.startTag(PREFIX_GROUNDSPEAK, "long_description");
-                    gpx.attribute("", "html", BaseUtils.containsHtml(cache.getDescription()) ? "True" : "False");
-                    gpx.text(cache.getDescription());
-                    gpx.endTag(PREFIX_GROUNDSPEAK, "long_description");
-
-                    writeLogs(gpx, cache);
-
-                    gpx.endTag(PREFIX_GROUNDSPEAK, "cache");
-                    gpx.endTag(PREFIX_GPX, "wpt");
-
-                    writeWaypoints(gpx, cache);
-
-                    publishProgress(i + 1);
+                    allGeocodes.removeAll(geocodesOfBatch);
+                    exportBatch(gpx, geocodesOfBatch);
                 }
 
                 gpx.endTag(PREFIX_GPX, "gpx");
                 gpx.endDocument();
-            } catch (final IOException e) {
+            } catch (final Exception e) {
                 Log.e("GpxExport.ExportTask export", e);
 
                 if (writer != null) {
@@ -226,6 +195,67 @@ class GpxExport extends AbstractExport {
             return exportFile;
         }
 
+        private void exportBatch(final XmlSerializer gpx, HashSet<String> geocodesOfBatch) throws IOException {
+            Set<Geocache> caches = cgData.loadCaches(geocodesOfBatch, LoadFlags.LOAD_ALL_DB_ONLY);
+            for (Geocache cache : caches) {
+                gpx.startTag(PREFIX_GPX, "wpt");
+                gpx.attribute("", "lat", Double.toString(cache.getCoords().getLatitude()));
+                gpx.attribute("", "lon", Double.toString(cache.getCoords().getLongitude()));
+
+                final Date hiddenDate = cache.getHiddenDate();
+                if (hiddenDate != null) {
+                    XmlUtils.simpleText(gpx, PREFIX_GPX, "time", dateFormatZ.format(hiddenDate));
+                }
+
+                XmlUtils.multipleTexts(gpx, PREFIX_GPX,
+                        "name", cache.getGeocode(),
+                        "desc", cache.getName(),
+                        "url", cache.getUrl(),
+                        "urlname", cache.getName(),
+                        "sym", cache.isFound() ? "Geocache Found" : "Geocache",
+                        "type", "Geocache|" + cache.getType().pattern);
+
+                gpx.startTag(PREFIX_GROUNDSPEAK, "cache");
+                gpx.attribute("", "id", cache.getCacheId());
+                gpx.attribute("", "available", !cache.isDisabled() ? "True" : "False");
+                gpx.attribute("", "archives", cache.isArchived() ? "True" : "False");
+
+                XmlUtils.multipleTexts(gpx, PREFIX_GROUNDSPEAK,
+                        "name", cache.getName(),
+                        "placed_by", cache.getOwnerDisplayName(),
+                        "owner", cache.getOwnerUserId(),
+                        "type", cache.getType().pattern,
+                        "container", cache.getSize().id,
+                        "difficulty", Float.toString(cache.getDifficulty()),
+                        "terrain", Float.toString(cache.getTerrain()),
+                        "country", cache.getLocation(),
+                        "state", "",
+                        "encoded_hints", cache.getHint());
+
+                writeAttributes(gpx, cache);
+
+                gpx.startTag(PREFIX_GROUNDSPEAK, "short_description");
+                gpx.attribute("", "html", BaseUtils.containsHtml(cache.getShortDescription()) ? "True" : "False");
+                gpx.text(cache.getShortDescription());
+                gpx.endTag(PREFIX_GROUNDSPEAK, "short_description");
+
+                gpx.startTag(PREFIX_GROUNDSPEAK, "long_description");
+                gpx.attribute("", "html", BaseUtils.containsHtml(cache.getDescription()) ? "True" : "False");
+                gpx.text(cache.getDescription());
+                gpx.endTag(PREFIX_GROUNDSPEAK, "long_description");
+
+                writeLogs(gpx, cache);
+
+                gpx.endTag(PREFIX_GROUNDSPEAK, "cache");
+                gpx.endTag(PREFIX_GPX, "wpt");
+
+                writeWaypoints(gpx, cache);
+
+                countExported++;
+                publishProgress(countExported);
+            }
+        }
+
         private void writeWaypoints(final XmlSerializer gpx, final Geocache cache) throws IOException {
             List<Waypoint> waypoints = cache.getWaypoints();
             List<Waypoint> ownWaypoints = new ArrayList<Waypoint>(waypoints.size());
-- 
cgit v1.1


From bd66d5eeb4ea95325630dae58aaf7f1043085781 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Sat, 30 Mar 2013 09:26:49 +0100
Subject: #2613: log error if image cannot be decoded

---
 main/src/cgeo/geocaching/network/HtmlImage.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index a409750..b08d36d 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -193,7 +193,11 @@ public class HtmlImage implements Html.ImageGetter {
         if (file.exists()) {
             if (listId >= StoredList.STANDARD_LIST_ID || file.lastModified() > (new Date().getTime() - (24 * 60 * 60 * 1000)) || forceKeep) {
                 setSampleSize(file);
-                return BitmapFactory.decodeFile(file.getPath(), bfOptions);
+                final Bitmap image = BitmapFactory.decodeFile(file.getPath(), bfOptions);
+                if (image == null) {
+                    Log.e("Cannot decode bitmap from " + file.getPath());
+                }
+                return image;
             }
         }
         return null;
-- 
cgit v1.1


From 32460d132a0906fd39e92c1ce1c5088920ddf23c Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Sat, 30 Mar 2013 20:21:01 +0100
Subject: refactoring of cache logging code

* simplify control flow
* move sanity checks into GCVote and twitter methods
---
 main/src/cgeo/geocaching/VisitCacheActivity.java   | 32 ++++++++--------------
 .../src/cgeo/geocaching/connector/gc/GCParser.java |  5 ++++
 main/src/cgeo/geocaching/gcvote/GCVote.java        |  7 +++--
 main/src/cgeo/geocaching/twitter/Twitter.java      |  6 ++++
 4 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index d95f6df..8f47606 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -571,18 +571,16 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     }
 
     public StatusCode postLogFn(String log) {
-
         StatusCode result = StatusCode.LOG_POST_ERROR;
 
         try {
 
-            final ImmutablePair<StatusCode, String> logResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
+            final ImmutablePair<StatusCode, String> postResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
                     date.get(Calendar.YEAR), (date.get(Calendar.MONTH) + 1), date.get(Calendar.DATE),
                     log, trackables);
+            result = postResult.left;
 
-            result = logResult.left;
-
-            if (logResult.left == StatusCode.NO_ERROR) {
+            if (result == StatusCode.NO_ERROR) {
                 final LogEntry logNow = new LogEntry(date, typeSelected, log);
 
                 cache.getLogs().add(0, logNow);
@@ -592,24 +590,18 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
                 }
 
                 cgData.saveChangedCache(cache);
-            }
-
-            if (logResult.left == StatusCode.NO_ERROR) {
                 cgData.clearLogOffline(geocode);
-            }
 
-            if (logResult.left == StatusCode.NO_ERROR && typeSelected == LogType.FOUND_IT && Settings.isUseTwitter()
-                    && Settings.isTwitterLoginValid()
-                    && tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
-                Twitter.postTweetCache(geocode);
-            }
-
-            if (logResult.left == StatusCode.NO_ERROR && typeSelected == LogType.FOUND_IT && Settings.isGCvoteLogin()) {
-                GCVote.setRating(cache, rating);
-            }
+                if (typeSelected == LogType.FOUND_IT) {
+                    if (tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
+                        Twitter.postTweetCache(geocode);
+                    }
+                    GCVote.setRating(cache, rating);
+                }
 
-            if (logResult.left == StatusCode.NO_ERROR && StringUtils.isNotBlank(imageUri.getPath())) {
-                result = GCParser.uploadLogImage(logResult.right, imageCaption, imageDescription, imageUri);
+                if (StringUtils.isNotBlank(imageUri.getPath())) {
+                    result = GCParser.uploadLogImage(postResult.right, imageCaption, imageDescription, imageUri);
+                }
             }
 
             return result;
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 9af9953..76351c1 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1100,6 +1100,11 @@ public abstract class GCParser {
         return StatusCode.LOGIMAGE_POST_ERROR;
     }
 
+    /**
+     * Post a log to GC.com.
+     *
+     * @return status code of the upload and ID of the log
+     */
     public static StatusCode postLogTrackable(final String tbid, final String trackingCode, final String[] viewstates,
             final LogType logType, final int year, final int month, final int day, final String log) {
         if (Login.isEmpty(viewstates)) {
diff --git a/main/src/cgeo/geocaching/gcvote/GCVote.java b/main/src/cgeo/geocaching/gcvote/GCVote.java
index a053f31..f6cfb84 100644
--- a/main/src/cgeo/geocaching/gcvote/GCVote.java
+++ b/main/src/cgeo/geocaching/gcvote/GCVote.java
@@ -173,12 +173,15 @@ public final class GCVote {
 
     /**
      * Transmit user vote to gcvote.com
-     *
+     * 
      * @param cache
      * @param vote
-     * @return
+     * @return {@code true} if the rating was submitted successfully
      */
     public static boolean setRating(Geocache cache, double vote) {
+        if (!Settings.isGCvoteLogin()) {
+            return false;
+        }
         if (!cache.supportsGCVote()) {
             return false;
         }
diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index f30830e..d3b2718 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -56,6 +56,12 @@ public final class Twitter {
     }
 
     public static void postTweetCache(String geocode) {
+        if (!Settings.isUseTwitter()) {
+            return;
+        }
+        if (!Settings.isTwitterLoginValid()) {
+            return;
+        }
         final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
         String status;
         final String url = cache.getUrl();
-- 
cgit v1.1


From e70deaf2c8a5ffbee0bfdd4caea78c7e795f287b Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Sat, 30 Mar 2013 21:31:11 +0100
Subject: fix #2532: attach log image to log entry locally

---
 main/src/cgeo/geocaching/VisitCacheActivity.java       |  8 +++++++-
 main/src/cgeo/geocaching/connector/gc/GCConstants.java |  2 +-
 main/src/cgeo/geocaching/connector/gc/GCParser.java    | 14 +++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 8f47606..b4eb82a 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -600,7 +600,13 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
                 }
 
                 if (StringUtils.isNotBlank(imageUri.getPath())) {
-                    result = GCParser.uploadLogImage(postResult.right, imageCaption, imageDescription, imageUri);
+                    ImmutablePair<StatusCode, String> imageResult = GCParser.uploadLogImage(postResult.right, imageCaption, imageDescription, imageUri);
+                    final String uploadedImageUrl = imageResult.right;
+                    if (StringUtils.isNotEmpty(uploadedImageUrl)) {
+                        logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
+                        cgData.saveChangedCache(cache);
+                    }
+                    result = imageResult.left;
                 }
             }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index 4d27617..d8711cf 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -149,7 +149,7 @@ public final class GCConstants {
     public final static Pattern PATTERN_MAINTENANCE = Pattern.compile("<span id=\"ctl00_ContentBody_LogBookPanel1_lbConfirm\"[^>]*>([^<]*<font[^>]*>)?([^<]+)(</font>[^<]*)?</span>", Pattern.CASE_INSENSITIVE);
     public final static Pattern PATTERN_OK1 = Pattern.compile("<h2[^>]*>[^<]*<span id=\"ctl00_ContentBody_lbHeading\"[^>]*>[^<]*</span>[^<]*</h2>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     public final static Pattern PATTERN_OK2 = Pattern.compile("<div id=[\"|']ctl00_ContentBody_LogBookPanel1_ViewLogPanel[\"|']>", Pattern.CASE_INSENSITIVE);
-    public final static Pattern PATTERN_OK_IMAGEUPLOAD = Pattern.compile("<div id=[\"|']ctl00_ContentBody_ImageUploadControl1_uxUploadDonePanel[\"|']>", Pattern.CASE_INSENSITIVE);
+    public final static Pattern PATTERN_IMAGE_UPLOAD_URL = Pattern.compile("title=\"Click for Larger Image\"\\s*src=\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     public final static Pattern PATTERN_VIEWSTATEFIELDCOUNT = Pattern.compile("id=\"__VIEWSTATEFIELDCOUNT\"[^(value)]+value=\"(\\d+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     public final static Pattern PATTERN_VIEWSTATES = Pattern.compile("id=\"__VIEWSTATE(\\d*)\"[^(value)]+value=\"([^\"]+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     public final static Pattern PATTERN_USERTOKEN = Pattern.compile("userToken\\s*=\\s*'([^']+)'");
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 76351c1..4b5d7b9 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1059,7 +1059,7 @@ public abstract class GCParser {
      *            the URI for the image to be uploaded
      * @return status code to indicate success or failure
      */
-    public static StatusCode uploadLogImage(final String logId, final String caption, final String description, final Uri imageUri) {
+    public static ImmutablePair<StatusCode, String> uploadLogImage(final String logId, final String caption, final String description, final Uri imageUri) {
         final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/upload.aspx").encodedQuery("LID=" + logId).build().toString();
 
         String page = Network.getResponseData(Network.getRequest(uri));
@@ -1071,7 +1071,7 @@ public abstract class GCParser {
                 page = Network.getResponseData(Network.getRequest(uri));
             } else {
                 Log.e("Image upload: No login (error: " + loginState + ')');
-                return StatusCode.NOT_LOGGED_IN;
+                return ImmutablePair.of(StatusCode.NOT_LOGGED_IN, null);
             }
         }
 
@@ -1088,16 +1088,16 @@ public abstract class GCParser {
         final File image = new File(imageUri.getPath());
         final String response = Network.getResponseData(Network.postRequest(uri, uploadParams, "ctl00$ContentBody$ImageUploadControl1$uxFileUpload", "image/jpeg", image));
 
-        MatcherWrapper matcherOK = new MatcherWrapper(GCConstants.PATTERN_OK_IMAGEUPLOAD, response);
+        MatcherWrapper matcherUrl = new MatcherWrapper(GCConstants.PATTERN_IMAGE_UPLOAD_URL, response);
 
-        if (matcherOK.find()) {
+        if (matcherUrl.find()) {
             Log.i("Logimage successfully uploaded.");
-
-            return StatusCode.NO_ERROR;
+            final String uploadedImageUrl = matcherUrl.group(1);
+            return ImmutablePair.of(StatusCode.NO_ERROR, uploadedImageUrl);
         }
         Log.e("GCParser.uploadLogIMage: Failed to upload image because of unknown error");
 
-        return StatusCode.LOGIMAGE_POST_ERROR;
+        return ImmutablePair.of(StatusCode.LOGIMAGE_POST_ERROR, null);
     }
 
     /**
-- 
cgit v1.1


From ce094d31c0b234648cf38d1fa8d360cfed37a4f7 Mon Sep 17 00:00:00 2001
From: TriakCZ <kunc88@gmail.com>
Date: Sun, 31 Mar 2013 20:40:16 +0200
Subject: Displaying distance to waypoint on map popup

---
 main/src/cgeo/geocaching/AbstractPopupActivity.java |  5 +++++
 main/src/cgeo/geocaching/WaypointPopup.java         | 12 ++++++++++++
 .../src/cgeo/geocaching/ui/CacheDetailsCreator.java | 21 +++++++++++++++++++++
 3 files changed, 38 insertions(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index f903d00..a7d1107 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -67,12 +67,17 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
                     cacheDistance.setText(Units.getDistanceFromKilometers(geo.getCoords().distanceTo(cache.getCoords())));
                     cacheDistance.bringToFront();
                 }
+                onUpdateGeoData(geo);
             } catch (Exception e) {
                 Log.w("Failed to UpdateLocation location.");
             }
         }
     };
 
+    public void onUpdateGeoData(final IGeoData geo) {
+
+    }
+
     protected AbstractPopupActivity(String helpTopic, int layout) {
         super(helpTopic);
         this.layout = layout;
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 766d43d..9ccad48 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -2,6 +2,7 @@ package cgeo.geocaching;
 
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.geopoint.Units;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.utils.Log;
 
@@ -19,6 +20,7 @@ import android.widget.TextView;
 public class WaypointPopup extends AbstractPopupActivity {
     private int waypointId = 0;
     private Waypoint waypoint = null;
+    private TextView waypointDistance = null;
 
     public WaypointPopup() {
         super("c:geo-waypoint-info", R.layout.waypoint_popup);
@@ -35,6 +37,14 @@ public class WaypointPopup extends AbstractPopupActivity {
     }
 
     @Override
+    public void onUpdateGeoData(IGeoData geo) {
+        if (geo.getCoords() != null && waypoint != null && waypoint.getCoords() != null) {
+            waypointDistance.setText(Units.getDistanceFromKilometers(geo.getCoords().distanceTo(waypoint.getCoords())));
+            waypointDistance.bringToFront();
+        }
+    }
+
+    @Override
     protected void init() {
         super.init();
         waypoint = cgData.loadWaypoint(waypointId);
@@ -53,6 +63,8 @@ public class WaypointPopup extends AbstractPopupActivity {
 
             //Waypoint geocode
             details.add(R.string.cache_geocode, waypoint.getPrefix() + waypoint.getGeocode().substring(2));
+            details.addDistance(waypoint, waypointDistance);
+            waypointDistance = details.getValueView();
 
             // Edit Button
             final Button buttonEdit = (Button) findViewById(R.id.edit);
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index e98bd77..80f01e2 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -2,6 +2,7 @@ package cgeo.geocaching.ui;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
+import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
@@ -154,4 +155,24 @@ public final class CacheDetailsCreator {
         }
         add(R.string.cache_distance, text);
     }
+
+    public void addDistance(final Waypoint wpt, final TextView waypointDistanceView) {
+        Float distance = null;
+        if (wpt.getCoords() != null) {
+            final Geopoint currentCoords = cgeoapplication.getInstance().currentGeo().getCoords();
+            if (currentCoords != null) {
+                distance = currentCoords.distanceTo(wpt);
+            }
+        }
+        String text = "--";
+        if (distance != null) {
+            text = Units.getDistanceFromKilometers(distance);
+        }
+        else if (waypointDistanceView != null) {
+            // if there is already a distance in waypointDistance, use it instead of resetting to default.
+            // this prevents displaying "--" while waiting for a new position update (See bug #1468)
+            text = waypointDistanceView.getText().toString();
+        }
+        add(R.string.cache_distance, text);
+    }
 }
-- 
cgit v1.1


From 9a36d2207c8ef09f4294b638685280bd6f4de719 Mon Sep 17 00:00:00 2001
From: TriakCZ <kunc88@gmail.com>
Date: Sun, 31 Mar 2013 20:44:48 +0200
Subject: Displaying note of waypoint on wpt popup

---
 main/src/cgeo/geocaching/WaypointPopup.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 9ccad48..43a758f 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -65,6 +65,7 @@ public class WaypointPopup extends AbstractPopupActivity {
             details.add(R.string.cache_geocode, waypoint.getPrefix() + waypoint.getGeocode().substring(2));
             details.addDistance(waypoint, waypointDistance);
             waypointDistance = details.getValueView();
+            details.add(R.string.waypoint_note, waypoint.getNote());
 
             // Edit Button
             final Button buttonEdit = (Button) findViewById(R.id.edit);
-- 
cgit v1.1


From e9b425637d12d682c365ec511d68f2f79538e0c7 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 1 Apr 2013 19:36:13 +0200
Subject: fix #2619: Clicking link in log decrypts log

---
 main/src/cgeo/geocaching/ui/DecryptTextClickListener.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java b/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
index 4ba88ae..f10e13a 100644
--- a/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
+++ b/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
@@ -16,6 +16,12 @@ public class DecryptTextClickListener implements View.OnClickListener {
 
         try {
             final TextView logView = (TextView) view;
+
+            // do not run the click listener if a link was clicked
+            if (logView.getSelectionStart() != -1 || logView.getSelectionEnd() != -1) {
+                return;
+            }
+
             CharSequence text = logView.getText();
             if (text instanceof Spannable) {
                 Spannable span = (Spannable) text;
-- 
cgit v1.1


From e703540659c2ba6480583d9819d96120d7b95a06 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 1 Apr 2013 20:13:10 +0200
Subject: improve display of log texts for OC

* remove even more unneeded whitespace
---
 .../geocaching/connector/oc/OC11XMLParser.java     | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index 621032f..d03062f 100644
--- a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
+++ b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
@@ -48,6 +48,8 @@ public class OC11XMLParser {
     private static Pattern LOCAL_URL = Pattern.compile("href=\"(.*)\"");
     private static final int CACHE_PARSE_LIMIT = 250;
     private static final Resources res = cgeoapplication.getInstance().getResources();
+    private static final Pattern WHITESPACE = Pattern.compile("<p>(\\s|&nbsp;)*</p>");
+
 
     private static ImageHolder imageHolder = null;
 
@@ -513,7 +515,7 @@ public class OC11XMLParser {
             @Override
             public void end(String body) {
                 final String content = body.trim();
-                descHolder.shortDesc = linkify(stripMarkup(content));
+                descHolder.shortDesc = linkify(stripEmptyText(content));
             }
         });
 
@@ -523,7 +525,7 @@ public class OC11XMLParser {
             @Override
             public void end(String body) {
                 final String content = body.trim();
-                descHolder.desc = linkify(stripMarkup(content));
+                descHolder.desc = linkify(stripEmptyText(content));
             }
         });
 
@@ -626,7 +628,7 @@ public class OC11XMLParser {
 
             @Override
             public void end(String logText) {
-                logHolder.logEntry.log = stripMarkup(logText);
+                logHolder.logEntry.log = stripEmptyText(logText);
             }
         });
 
@@ -728,14 +730,20 @@ public class OC11XMLParser {
     }
 
     /**
-     * Removes unneeded markup. Log texts are typically encapsulated in paragraph tags which lead to more empty space on
-     * rendering.
+     * Removes some unneeded markup and whitespace. Log texts are typically encapsulated in paragraph tags which lead to
+     * more empty space on rendering.
      */
-    protected static String stripMarkup(String input) {
-        if (!StringUtils.startsWith(input, "<")) {
-            return input;
+    protected static String stripEmptyText(String input) {
+        final Matcher matcher = WHITESPACE.matcher(input);
+        String result = matcher.replaceAll("").trim();
+        if (!StringUtils.startsWith(result, "<")) {
+            return result;
         }
-        String result = input.trim();
+        return stripMarkup(result);
+    }
+
+    private static String stripMarkup(final String input) {
+        String result = input;
         for (String tagName : MARKUP) {
             final String startTag = "<" + tagName + ">";
             if (StringUtils.startsWith(result, startTag)) {
-- 
cgit v1.1


From 1f98bf8a77a25510aefdf4219814d9a432f04810 Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Mon, 1 Apr 2013 22:19:48 +0300
Subject: Change log reset (master only)

---
 main/res/values/strings_not_translatable.xml | 33 +++++-----------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

(limited to 'main')

diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index b082e39..8de1483 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -82,36 +82,15 @@
   <string name="changelog" translatable="false">\n
     <b>Next release</b>\n\n
     <b>New Features/Functions:</b>\n
-    · Support of attaching pictures to logs\n
-    · Support of opencaching.de online API in live map and nearby search\n
-    · Support for searching opencaching.nl caches\n
-    · Alphabetical sorting of OSM:Offline maps in map selection\n 
-    · Color markers also in trackable logbook\n
-    · Edit cache type filter by clicking on filter bar\n
-    · Inverse sorting of cache lists (hit the same menu again)\n
-    · View pager for trackable activity\n
-    · Menu item to delete past events\n
-    · Settings: Option to ask for list to store caches\n
-    · Change list in cache details\n
-    · Ability to select \"All\" list from main screen\n
-    · Default log type for event caches will be \"Attended\" if \"Will attend\" was logged before\n
-    · Improved and extended cache type detection on live map\n
-    · Waypoints can be marked as visited\n
-    · Possibility to delete offline logs in lists\n
-    · Support of language specific characters in log text equally to the website\n
+    · ...\n
     \n
     <b>Bugfixing:</b>\n
-    · Final flag icon lost when updating cache with self defined final\n
-    · Bad selection in directory chooser\n
-    · Log type \"Retract Listing\" now parsed correctly\n
-    · Active cache detail page now remembered when rotating device\n
-    · Replaced the term \"GC-Code\" by \"Geocode\"\n
-    · Improvements for light theme\n
-    · Share function uses short URL again\n
-    · Offline log marker now shown after autosave of log\n
-    · GPX export no longer exports waypoints without coordinates\n
+    · Do not apply encryption/decryption when clicking on a link in a log\n
+    · Also show a picture attached to a log locally after sending the log\n
+    · Improved display of log text for OC-caches\n
+    · Improved performance of GPX exports\n
      \n
-    <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\n
+    <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=17&amp;state=closed">Detailed list of all changes</a>\n
     \n
     <b>Known Limitations/Bugs:</b>\n
     · Live map:\n
-- 
cgit v1.1


From 05e241cd5741c5c5baec64c7c3fbdb7e2c07844d Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Tue, 2 Apr 2013 22:18:06 +0200
Subject: #556: refactor to prepare customization of twitter text

---
 main/src/cgeo/geocaching/twitter/Twitter.java | 60 ++++++++++++++-------------
 1 file changed, 31 insertions(+), 29 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index d3b2718..6b427e0 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -15,7 +15,10 @@ import cgeo.geocaching.utils.Log;
 
 import ch.boye.httpclientandroidlib.HttpResponse;
 
+import org.apache.commons.lang3.StringUtils;
+
 public final class Twitter {
+    private static final String HASH_PREFIX_WITH_BLANK = " #";
     public static final int MAX_TWEET_SIZE = 140;
 
     public static void postTweet(final cgeoapplication app, final String status, final Geopoint coords) {
@@ -47,12 +50,10 @@ public final class Twitter {
         }
     }
 
-    public static String appendHashTag(final String status, final String tag) {
-        String result = status;
-        if (result.length() + 2 + tag.length() <= 140) {
-            result += " #" + tag;
+    public static void appendHashTag(final StringBuilder status, final String tag) {
+        if (status.length() + HASH_PREFIX_WITH_BLANK.length() + tag.length() <= MAX_TWEET_SIZE) {
+            status.append(HASH_PREFIX_WITH_BLANK).append(tag);
         }
-        return result;
     }
 
     public static void postTweetCache(String geocode) {
@@ -63,39 +64,40 @@ public final class Twitter {
             return;
         }
         final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
-        String status;
-        final String url = cache.getUrl();
-        if (url.length() >= 100) {
-            status = "I found " + url;
-        }
-        else {
-            String name = cache.getName();
-            status = "I found " + name + " (" + url + ")";
-            if (status.length() > MAX_TWEET_SIZE) {
-                name = name.substring(0, name.length() - (status.length() - MAX_TWEET_SIZE) - 1) + '…';
+        postTweet(cgeoapplication.getInstance(), getStatusMessage(cache), null);
+    }
+
+    static String getStatusMessage(Geocache cache) {
+        String name = cache.getName();
+        if (name.length() > 100) {
+            name = name.substring(0, 100) + '…';
             }
-            status = "I found " + name + " (" + url + ")";
-            status = appendHashTag(status, "cgeo");
-            status = appendHashTag(status, "geocaching");
-        }
+        final String url = StringUtils.defaultString(cache.getUrl());
+        String status = "I found [NAME] ([URL])";
+        return fillTemplate(status, name, url);
+    }
 
-        postTweet(cgeoapplication.getInstance(), status, null);
+    private static String fillTemplate(String template, String name, final String url) {
+        String result = StringUtils.replace(template, "[NAME]", name);
+        result = StringUtils.replace(result, "[URL]", url);
+        StringBuilder builder = new StringBuilder(result);
+        appendHashTag(builder, "cgeo");
+        appendHashTag(builder, "geocaching");
+        return builder.toString();
     }
 
     public static void postTweetTrackable(String geocode) {
         final Trackable trackable = cgData.loadTrackable(geocode);
+        postTweet(cgeoapplication.getInstance(), getStatusMessage(trackable), null);
+    }
+
+    static String getStatusMessage(Trackable trackable) {
         String name = trackable.getName();
         if (name.length() > 82) {
             name = name.substring(0, 81) + '…';
         }
-        StringBuilder builder = new StringBuilder("I touched ");
-        builder.append(name);
-        if (trackable.getUrl() != null) {
-            builder.append(" (").append(trackable.getUrl()).append(')');
-        }
-        builder.append('!');
-        String status = appendHashTag(builder.toString(), "cgeo");
-        status = appendHashTag(status, "geocaching");
-        postTweet(cgeoapplication.getInstance(), status, null);
+        String url = StringUtils.defaultString(trackable.getUrl());
+        String status = "I touched [NAME] ([URL])!";
+        return fillTemplate(status, name, url);
     }
 }
-- 
cgit v1.1


From 10110e6b83850b449ae559d06220e1d1faab3745 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 4 Apr 2013 20:16:17 +0200
Subject: #556: avoid duplicate tags when appending our tags

---
 main/src/cgeo/geocaching/Settings.java        | 15 +++++++++++++++
 main/src/cgeo/geocaching/twitter/Twitter.java | 10 ++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 0c157e1..93bfa9b 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -149,6 +149,7 @@ public final class Settings {
 
     // maps
     private static MapProvider mapProvider = null;
+    private static String cacheTwitterMessage = "I found [NAME] ([URL])";
 
     private Settings() {
         // this class is not to be instantiated;
@@ -1424,4 +1425,18 @@ public final class Settings {
             }
         });
     }
+
+    public static String getCacheTwitterMessage() {
+        // TODO make customizable from UI
+        return cacheTwitterMessage;
+    }
+
+    public static String getTrackableTwitterMessage() {
+        // TODO make customizable from UI
+        return "I touched [NAME] ([URL])!";
+    }
+
+    public static void setCacheTwitterMessage(final String message) {
+        cacheTwitterMessage = message;
+    }
 }
diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index 6b427e0..e3d3f77 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -52,7 +52,10 @@ public final class Twitter {
 
     public static void appendHashTag(final StringBuilder status, final String tag) {
         if (status.length() + HASH_PREFIX_WITH_BLANK.length() + tag.length() <= MAX_TWEET_SIZE) {
-            status.append(HASH_PREFIX_WITH_BLANK).append(tag);
+            final String tagWithPrefix = HASH_PREFIX_WITH_BLANK + tag;
+            if (status.indexOf(tagWithPrefix, 0) == -1) {
+                status.append(tagWithPrefix);
+            }
         }
     }
 
@@ -73,8 +76,7 @@ public final class Twitter {
             name = name.substring(0, 100) + '…';
             }
         final String url = StringUtils.defaultString(cache.getUrl());
-        String status = "I found [NAME] ([URL])";
-        return fillTemplate(status, name, url);
+        return fillTemplate(Settings.getCacheTwitterMessage(), name, url);
     }
 
     private static String fillTemplate(String template, String name, final String url) {
@@ -97,7 +99,7 @@ public final class Twitter {
             name = name.substring(0, 81) + '…';
         }
         String url = StringUtils.defaultString(trackable.getUrl());
-        String status = "I touched [NAME] ([URL])!";
+        String status = Settings.getTrackableTwitterMessage();
         return fillTemplate(status, name, url);
     }
 }
-- 
cgit v1.1


From 0856587453f4df9379cda95891b9a785f3673095 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 6 Apr 2013 15:43:28 +0200
Subject: fix #2555: try to detect waypoint type in personal note

---
 main/src/cgeo/geocaching/Geocache.java | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 9a8325d..96bb2fe 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -49,6 +49,7 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -1360,6 +1361,9 @@ public class Geocache implements ICache, IWaypoint {
         return null;
     }
 
+    /**
+     * Detect coordinates in the personal note and convert them to user defined waypoints. Works by rule of thumb.
+     */
     public void parseWaypointsFromNote() {
         try {
             if (StringUtils.isBlank(getPersonalNote())) {
@@ -1375,7 +1379,8 @@ public class Geocache implements ICache, IWaypoint {
                     // coords must have non zero latitude and longitude and at least one part shall have fractional degrees
                     if (point.getLatitudeE6() != 0 && point.getLongitudeE6() != 0 && ((point.getLatitudeE6() % 1000) != 0 || (point.getLongitudeE6() % 1000) != 0)) {
                         final String name = cgeoapplication.getInstance().getString(R.string.cache_personal_note) + " " + count;
-                        final Waypoint waypoint = new Waypoint(name, WaypointType.WAYPOINT, false);
+                        final String potentialWaypointType = note.substring(Math.max(0, matcher.start() - 15));
+                        final Waypoint waypoint = new Waypoint(name, parseWaypointType(potentialWaypointType), false);
                         waypoint.setCoords(point);
                         addOrChangeWaypoint(waypoint, false);
                         count++;
@@ -1392,6 +1397,25 @@ public class Geocache implements ICache, IWaypoint {
         }
     }
 
+    /**
+     * Detect waypoint types in the personal note text. It works by rule of thumb only.
+     */
+    private static WaypointType parseWaypointType(final String input) {
+        final String lowerInput = StringUtils.substring(input, 0, 20).toLowerCase(Locale.getDefault());
+        for (WaypointType wpType : WaypointType.values()) {
+            if (lowerInput.contains(wpType.getL10n().toLowerCase(Locale.getDefault()))) {
+                return wpType;
+            }
+            if (lowerInput.contains(wpType.id)) {
+                return wpType;
+            }
+            if (lowerInput.contains(wpType.name().toLowerCase(Locale.US))) {
+                return wpType;
+            }
+        }
+        return WaypointType.WAYPOINT;
+    }
+
     /*
      * For working in the debugger
      * (non-Javadoc)
-- 
cgit v1.1


From e46b4a46ff6c3ab07ad3172f3c39c8c98202ed46 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 16:22:40 +0200
Subject: fix #2598: personal note editing layout problem

---
 main/res/layout/fragment_edit_note.xml             | 15 +++++
 main/src/cgeo/geocaching/CacheDetailActivity.java  | 37 +++++++-----
 main/src/cgeo/geocaching/ui/EditNoteDialog.java    | 65 ++++++++++++++++++++++
 .../cgeo/geocaching/ui/dialog/EditorDialog.java    | 60 --------------------
 4 files changed, 102 insertions(+), 75 deletions(-)
 create mode 100644 main/res/layout/fragment_edit_note.xml
 create mode 100644 main/src/cgeo/geocaching/ui/EditNoteDialog.java
 delete mode 100644 main/src/cgeo/geocaching/ui/dialog/EditorDialog.java

(limited to 'main')

diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml
new file mode 100644
index 0000000..68e2b2c
--- /dev/null
+++ b/main/res/layout/fragment_edit_note.xml
@@ -0,0 +1,15 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/edit_note"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical">
+
+  <EditText
+      android:id="@+id/note"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:inputType="text"
+      android:imeOptions="actionDone"/>
+</LinearLayout>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 43ce65f..a521ab9 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -22,12 +22,13 @@ import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.ui.DecryptTextClickListener;
+import cgeo.geocaching.ui.EditNoteDialog;
+import cgeo.geocaching.ui.EditNoteDialog.EditNoteDialogListener;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.ImagesList;
 import cgeo.geocaching.ui.ImagesList.ImageType;
 import cgeo.geocaching.ui.LoggingUI;
 import cgeo.geocaching.ui.WeakReferenceHandler;
-import cgeo.geocaching.ui.dialog.EditorDialog;
 import cgeo.geocaching.utils.BaseUtils;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.ClipboardUtils;
@@ -65,6 +66,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.support.v4.app.FragmentManager;
 import android.text.Editable;
 import android.text.Html;
 import android.text.Spannable;
@@ -112,7 +114,8 @@ import java.util.regex.Pattern;
  *
  * e.g. details, description, logs, waypoints, inventory...
  */
-public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailActivity.Page> {
+public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailActivity.Page>
+    implements EditNoteDialogListener {
 
     private static final int MENU_FIELD_COPY = 1;
     private static final int MENU_FIELD_TRANSLATE = 2;
@@ -139,6 +142,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     private final Progress progress = new Progress();
     private SearchResult search;
 
+    private EditNoteDialogListener editNoteDialogListener;
+
     private final GeoDirHandler locationUpdater = new GeoDirHandler() {
         @Override
         public void updateGeoData(final IGeoData geo) {
@@ -1794,16 +1799,16 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 personalNoteEdit.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        EditorDialog editor = new EditorDialog(CacheDetailActivity.this, personalNoteView.getText());
-                        editor.setOnEditorUpdate(new EditorDialog.EditorUpdate() {
+                        editNoteDialogListener = new EditNoteDialogListener() {
                             @Override
-                            public void update(CharSequence editorText) {
-                                cache.setPersonalNote(editorText.toString());
+                            public void onFinishEditNoteDialog(final String note) {
+                                cache.setPersonalNote(note);
                                 setPersonalNote(personalNoteView);
-                                cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
-                            }
-                        });
-                        editor.show();
+                                cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));                            }
+                        };
+                        final FragmentManager fm = getSupportFragmentManager();
+                        final EditNoteDialog dialog = new EditNoteDialog(cache.getPersonalNote());
+                        dialog.show(fm, "fragment_edit_note");
                     }
                 });
             } else {
@@ -1866,13 +1871,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             personalNoteView.setText(personalNote, TextView.BufferType.SPANNABLE);
             if (StringUtils.isNotBlank(personalNote)) {
                 personalNoteView.setVisibility(View.VISIBLE);
-            }
-            else {
+            } else {
                 personalNoteView.setVisibility(View.GONE);
             }
-        }
-
-        private void loadLongDescription() {
+        }private void loadLongDescription() {
             Button showDesc = (Button) view.findViewById(R.id.show_description);
             showDesc.setVisibility(View.GONE);
             showDesc.setOnClickListener(null);
@@ -1884,6 +1886,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     }
 
+    @Override
+    public void onFinishEditNoteDialog(final String note) {
+        editNoteDialogListener.onFinishEditNoteDialog(note);
+    }
+
     private static class HtmlImageCounter implements Html.ImageGetter {
 
         private int imageCount = 0;
diff --git a/main/src/cgeo/geocaching/ui/EditNoteDialog.java b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
new file mode 100644
index 0000000..23e57f2
--- /dev/null
+++ b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
@@ -0,0 +1,65 @@
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.R;
+import cgeo.geocaching.R.string;
+
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager.LayoutParams;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+public class EditNoteDialog extends DialogFragment implements OnEditorActionListener {
+
+    public interface EditNoteDialogListener {
+        void onFinishEditNoteDialog(final String inputText);
+    }
+
+    private EditText mEditText;
+    private String initialNote;
+
+    public EditNoteDialog() {
+        // Empty constructor required for DialogFragment
+    }
+
+    public EditNoteDialog(final String initialNote) {
+        this.initialNote = initialNote;
+    }
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+                             final Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_edit_note, container);
+        mEditText = (EditText) view.findViewById(R.id.note);
+        if (initialNote != null) {
+            mEditText.setText(initialNote);
+            initialNote = null;
+        }
+        getDialog().setTitle(string.cache_personal_note);
+        mEditText.requestFocus();
+        getDialog().getWindow().setSoftInputMode(
+                LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        mEditText.setOnEditorActionListener(this);
+
+        return view;
+    }
+
+    @Override
+    public boolean onEditorAction(final TextView v, final int actionId, final KeyEvent event) {
+        if (EditorInfo.IME_ACTION_DONE == actionId) {
+            final EditNoteDialogListener activity = (EditNoteDialogListener) getActivity();
+            activity.onFinishEditNoteDialog(mEditText.getText().toString());
+            dismiss();
+            return true;
+        }
+        return false;
+    }
+
+
+}
diff --git a/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java b/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java
deleted file mode 100644
index 4db69e5..0000000
--- a/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cgeo.geocaching.ui.dialog;
-
-import cgeo.geocaching.CacheDetailActivity;
-import cgeo.geocaching.R;
-import cgeo.geocaching.activity.ActivityMixin;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.EditText;
-
-public class EditorDialog extends Dialog {
-
-    private CharSequence editorText;
-    private EditorUpdate editorUpdate;
-
-    public EditorDialog(CacheDetailActivity cacheDetailActivity, CharSequence editable) {
-        super(cacheDetailActivity, ActivityMixin.getTheme());
-        this.editorText = editable;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.editor);
-
-        final EditText editText = (EditText) findViewById(R.id.editorEditText);
-        editText.setText(editorText);
-
-        final Button buttonSave = (Button) findViewById(R.id.editorSave);
-        buttonSave.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                editorUpdate.update(editText.getEditableText());
-                EditorDialog.this.hide();
-            }
-        });
-    }
-
-    public interface EditorUpdate {
-        public void update(CharSequence editorText);
-    }
-
-    public void setOnEditorUpdate(EditorUpdate editorUpdate) {
-        this.editorUpdate = editorUpdate;
-
-    }
-
-    @Override
-    public void show() {
-        super.show();
-        getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-    }
-
-}
-- 
cgit v1.1


From 97d8e10554b704b6d07b92c8d4820715cf305b87 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 16:50:05 +0200
Subject: refactoring: do not create explicit arrays to call varargs methods

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 9347db9..daeb14e 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2087,7 +2087,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                         if (imageCounter.getImageCount() > 0) {
                             // Complete view: parse again with loading images - if necessary ! If there are any images causing problems the user can see at least the preview
                             LogImageLoader loader = new LogImageLoader(holder);
-                            loader.execute(new String[] { logText });
+                            loader.execute(logText);
                         }
                     }
                     else {
-- 
cgit v1.1


From f322663f075021cdaf5b28229a8a4d053fc4e4f9 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 16:50:55 +0200
Subject: refactoring: use Java-style array declaration

---
 main/src/cgeo/geocaching/cgeocaches.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 61a32f1..1006628 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1144,7 +1144,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
     public void removeFromHistory() {
         final List<Geocache> caches = adapter.getCheckedOrAllCaches();
-        final String geocodes[] = new String[caches.size()];
+        final String[] geocodes = new String[caches.size()];
         for (int i = 0; i < geocodes.length; i++) {
             geocodes[i] = caches.get(i).getGeocode();
         }
-- 
cgit v1.1


From 62cd11e0d4a3c557eda4c010b7bc3d66c70a00a8 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 16:51:55 +0200
Subject: refactoring: simplify expression

---
 main/src/cgeo/geocaching/Waypoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index 48c9bc5..6112986 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -275,7 +275,7 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> {
         if (coords != null) {
             hash = coords.hashCode();
         }
-        hash = hash ^ waypointType.markerId;
+        hash ^= waypointType.markerId;
         return (int) hash;
     }
 }
-- 
cgit v1.1


From 7211a93bef651f37f58cfa0049d4762272195d95 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:19:30 +0200
Subject: refactoring: narrow scope of variable

---
 main/src/cgeo/geocaching/cgeocaches.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 1006628..a8e798f 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1725,11 +1725,11 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
     @Override
     public Loader<SearchResult> onCreateLoader(int type, Bundle extras) {
-        AbstractSearchLoader loader = null;
         if (type >= CacheListLoaderType.values().length) {
             throw new IllegalArgumentException("invalid loader type " + type);
         }
         CacheListLoaderType enumType = CacheListLoaderType.values()[type];
+        AbstractSearchLoader loader = null;
         switch (enumType) {
             case OFFLINE:
                 listId = Settings.getLastList();
-- 
cgit v1.1


From 7b8bc42e0ab05a2dbe5cbea64c16d325f04a8b16 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:20:00 +0200
Subject: refactoring: simplify data flow

---
 main/src/cgeo/geocaching/VisitCacheActivity.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index b4eb82a..f8232af 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -571,16 +571,12 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     }
 
     public StatusCode postLogFn(String log) {
-        StatusCode result = StatusCode.LOG_POST_ERROR;
-
         try {
-
             final ImmutablePair<StatusCode, String> postResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
                     date.get(Calendar.YEAR), (date.get(Calendar.MONTH) + 1), date.get(Calendar.DATE),
                     log, trackables);
-            result = postResult.left;
 
-            if (result == StatusCode.NO_ERROR) {
+            if (postResult.left == StatusCode.NO_ERROR) {
                 final LogEntry logNow = new LogEntry(date, typeSelected, log);
 
                 cache.getLogs().add(0, logNow);
@@ -606,11 +602,11 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
                         logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
                         cgData.saveChangedCache(cache);
                     }
-                    result = imageResult.left;
+                    return imageResult.left;
                 }
             }
 
-            return result;
+            return postResult.left;
         } catch (Exception e) {
             Log.e("cgeovisit.postLogFn", e);
         }
-- 
cgit v1.1


From 60a9cc4e0c29c8728c310dd08d4368b171859ca4 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:24:47 +0200
Subject: refactoring: remove redundant return statements

---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 69f5cc4..18ecf27 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -76,11 +76,8 @@ public class StaticMapsProvider {
             final long fileSize = file.length();
             if (fileSize < MIN_MAP_IMAGE_BYTES) {
                 file.delete();
-                return;
             }
-            return;
         }
-        return;
     }
 
     public static void downloadMaps(Geocache cache) {
-- 
cgit v1.1


From f09e2a09ad31f2190d6184fd8fd441fa8c95d6ca Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:09:52 +0200
Subject: refactoring: simplify batch export of geocaches

By using list-backed sublists, the code to export geocaches in batch can
be simplified.

Also, there are places where a more generic Collection type can be used
in formal parameters to avoid influencing the type of actual arguments.
---
 main/src/cgeo/geocaching/cgData.java           |  3 ++-
 main/src/cgeo/geocaching/export/GpxExport.java | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 28485a5..86821fb 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -33,6 +33,7 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.EnumSet;
@@ -1396,7 +1397,7 @@ public class cgData {
      * @param geocodes
      * @return Set of loaded caches. Never null.
      */
-    public static Set<Geocache> loadCaches(final Set<String> geocodes, final EnumSet<LoadFlag> loadFlags) {
+    public static Set<Geocache> loadCaches(final Collection<String> geocodes, final EnumSet<LoadFlag> loadFlags) {
         if (CollectionUtils.isEmpty(geocodes)) {
             return new HashSet<Geocache>();
         }
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 19b8518..4c5d1e2 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -5,9 +5,9 @@ import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.Waypoint;
+import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgeoapplication;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.enumerations.CacheAttribute;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
@@ -37,9 +37,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -106,7 +105,7 @@ class GpxExport extends AbstractExport {
     }
 
     private class ExportTask extends AsyncTaskWithProgress<Void, File> {
-        private final Set<String> allGeocodes = new HashSet<String>();
+        private final List<String> allGeocodes;
         private final Activity activity;
         private int countExported = 0;
 
@@ -122,7 +121,8 @@ class GpxExport extends AbstractExport {
             super(activity, caches.size(), getProgressTitle(), cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, caches.size(), caches.size()));
 
             // get rid of the (half loaded) caches, we will reload them as full caches during the export
-            for (Geocache geocache : caches) {
+            allGeocodes = new ArrayList<String>(caches.size());
+            for (final Geocache geocache : caches) {
                 allGeocodes.add(geocache.getGeocode());
             }
             this.activity = activity;
@@ -159,17 +159,10 @@ class GpxExport extends AbstractExport {
 
                 // Split the overall set of geocodes into small chunks. That is a compromise between memory efficiency (because
                 // we don't load all caches fully into memory) and speed (because we don't query each cache separately).
-
                 while (!allGeocodes.isEmpty()) {
-                    int cachesInBatch = 0;
-                    HashSet<String> geocodesOfBatch = new HashSet<String>(CACHES_PER_BATCH);
-                    for (Iterator<String> iterator = allGeocodes.iterator(); iterator.hasNext() && cachesInBatch < CACHES_PER_BATCH;) {
-                        final String geocode = iterator.next();
-                        geocodesOfBatch.add(geocode);
-                        cachesInBatch++;
-                    }
-                    allGeocodes.removeAll(geocodesOfBatch);
-                    exportBatch(gpx, geocodesOfBatch);
+                    final List<String> batch = allGeocodes.subList(0, Math.min(CACHES_PER_BATCH, allGeocodes.size()));
+                    exportBatch(gpx, batch);
+                    batch.clear();
                 }
 
                 gpx.endTag(PREFIX_GPX, "gpx");
@@ -195,7 +188,7 @@ class GpxExport extends AbstractExport {
             return exportFile;
         }
 
-        private void exportBatch(final XmlSerializer gpx, HashSet<String> geocodesOfBatch) throws IOException {
+        private void exportBatch(final XmlSerializer gpx, Collection<String> geocodesOfBatch) throws IOException {
             Set<Geocache> caches = cgData.loadCaches(geocodesOfBatch, LoadFlags.LOAD_ALL_DB_ONLY);
             for (Geocache cache : caches) {
                 gpx.startTag(PREFIX_GPX, "wpt");
-- 
cgit v1.1


From 953905039962a657b678fb043dbe56d3c8649e43 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:53:31 +0200
Subject: refactoring: make sure downloadMaps doesn't get a null cache

If downloadMaps cannot get a null cache in the first place, the null
check is no longer needed.
---
 main/src/cgeo/geocaching/StaticMapsProvider.java |  4 ----
 main/src/cgeo/geocaching/files/GPXImporter.java  | 12 ++++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 18ecf27..48f1e48 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -81,10 +81,6 @@ public class StaticMapsProvider {
     }
 
     public static void downloadMaps(Geocache cache) {
-        if (cache == null) {
-            Log.e("downloadMaps - missing input parameter cache");
-            return;
-        }
         if ((!Settings.isStoreOfflineMaps() && !Settings.isStoreOfflineWpMaps()) || StringUtils.isBlank(cache.getGeocode())) {
             return;
         }
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index b8dcbb3..6329b64 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -171,10 +171,14 @@ public class GPXImporter {
 
         private boolean importStaticMaps(final SearchResult importedCaches) {
             int storedCacheMaps = 0;
-            for (String geocode : importedCaches.getGeocodes()) {
-                Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
-                Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);
-                StaticMapsProvider.downloadMaps(cache);
+            for (final String geocode : importedCaches.getGeocodes()) {
+                final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
+                if (cache != null) {
+                    Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);
+                    StaticMapsProvider.downloadMaps(cache);
+                } else {
+                    Log.d("GPXImporter.ImportThread.importStaticMaps: no data found for " + geocode);
+                }
                 storedCacheMaps++;
                 if (progressHandler.isCancelled()) {
                     return false;
-- 
cgit v1.1


From 596f9711b739ab74d19516a4466d288f90e220f9 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:54:52 +0200
Subject: refactoring: use Unix line ending

---
 main/src/cgeo/geocaching/files/GPXImporter.java | 924 ++++++++++++------------
 1 file changed, 462 insertions(+), 462 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index 6329b64..ff81fe1 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -1,462 +1,462 @@
-package cgeo.geocaching.files;
-
-import cgeo.geocaching.Geocache;
-import cgeo.geocaching.R;
-import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.Settings;
-import cgeo.geocaching.StaticMapsProvider;
-import cgeo.geocaching.cgData;
-import cgeo.geocaching.activity.IAbstractActivity;
-import cgeo.geocaching.activity.Progress;
-import cgeo.geocaching.enumerations.LoadFlags;
-import cgeo.geocaching.utils.CancellableHandler;
-import cgeo.geocaching.utils.Log;
-
-import org.apache.commons.lang3.StringUtils;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CancellationException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class GPXImporter {
-    static final int IMPORT_STEP_START = 0;
-    static final int IMPORT_STEP_READ_FILE = 1;
-    static final int IMPORT_STEP_READ_WPT_FILE = 2;
-    static final int IMPORT_STEP_STORE_STATIC_MAPS = 4;
-    static final int IMPORT_STEP_FINISHED = 5;
-    static final int IMPORT_STEP_FINISHED_WITH_ERROR = 6;
-    static final int IMPORT_STEP_CANCEL = 7;
-    static final int IMPORT_STEP_CANCELED = 8;
-    static final int IMPORT_STEP_STATIC_MAPS_SKIPPED = 9;
-
-    public static final String GPX_FILE_EXTENSION = ".gpx";
-    public static final String ZIP_FILE_EXTENSION = ".zip";
-    public static final String WAYPOINTS_FILE_SUFFIX = "-wpts";
-    public static final String WAYPOINTS_FILE_SUFFIX_AND_EXTENSION = WAYPOINTS_FILE_SUFFIX + GPX_FILE_EXTENSION;
-
-    private static final List<String> GPX_MIME_TYPES = Arrays.asList("text/xml", "application/xml");
-    private static final List<String> ZIP_MIME_TYPES = Arrays.asList("application/zip", "application/x-compressed", "application/x-zip-compressed", "application/x-zip", "application/octet-stream");
-
-    private Progress progress = new Progress(true);
-
-    private Resources res;
-    private int listId;
-    private IAbstractActivity fromActivity;
-    private Handler importFinishedHandler;
-
-    public GPXImporter(final IAbstractActivity fromActivity, final int listId, final Handler importFinishedHandler) {
-        this.listId = listId;
-        this.fromActivity = fromActivity;
-        res = ((Activity) fromActivity).getResources();
-        this.importFinishedHandler = importFinishedHandler;
-    }
-
-    /**
-     * Import GPX file. Currently supports *.gpx, *.zip (containing gpx files, e.g. PQ queries) or *.loc files.
-     *
-     * @param file
-     *            the file to import
-     */
-    public void importGPX(final File file) {
-        if (StringUtils.endsWithIgnoreCase(file.getName(), GPX_FILE_EXTENSION)) {
-            new ImportGpxFileThread(file, listId, importStepHandler, progressHandler).start();
-        } else if (StringUtils.endsWithIgnoreCase(file.getName(), ZIP_FILE_EXTENSION)) {
-            new ImportGpxZipFileThread(file, listId, importStepHandler, progressHandler).start();
-        } else {
-            new ImportLocFileThread(file, listId, importStepHandler, progressHandler).start();
-        }
-    }
-
-    /**
-     * Import GPX provided via intent of activity that instantiated this GPXImporter.
-     */
-    public void importGPX() {
-        final ContentResolver contentResolver = ((Activity) fromActivity).getContentResolver();
-        final Intent intent = ((Activity) fromActivity).getIntent();
-        final Uri uri = intent.getData();
-
-        String mimeType = intent.getType();
-        // if mimetype can't be determined (e.g. for emulators email app), derive it from uri file extension
-        // contentResolver.getType(uri) doesn't help but throws exception for emulators email app
-        //   Permission Denial: reading com.android.email.provider.EmailProvider uri
-        // Google search says: there is no solution for this problem
-        // Gmail doesn't work at all, see #967
-        if (mimeType == null) {
-            if (StringUtils.endsWithIgnoreCase(uri.getPath(), GPX_FILE_EXTENSION)) {
-                mimeType = "application/xml";
-            } else {
-                // if we can't determine a better type, default to zip import
-                // emulator email sends e.g. content://com.android.email.attachmentprovider/1/1/RAW, mimetype=null
-                mimeType = "application/zip";
-            }
-        }
-
-        Log.i("importGPX: " + uri + ", mimetype=" + mimeType);
-        if (GPX_MIME_TYPES.contains(mimeType)) {
-            new ImportGpxAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
-        } else if (ZIP_MIME_TYPES.contains(mimeType)) {
-            new ImportGpxZipAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
-        } else {
-            importFinished();
-        }
-    }
-
-    static abstract class ImportThread extends Thread {
-        final int listId;
-        final Handler importStepHandler;
-        final CancellableHandler progressHandler;
-
-        protected ImportThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            this.listId = listId;
-            this.importStepHandler = importStepHandler;
-            this.progressHandler = progressHandler;
-        }
-
-        @Override
-        public void run() {
-            try {
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_START));
-                final Collection<Geocache> caches = doImport();
-                Log.i("Imported successfully " + caches.size() + " caches.");
-
-                final SearchResult search = new SearchResult();
-                for (Geocache cache : caches) {
-                    search.addCache(cache);
-                }
-
-                if (Settings.isStoreOfflineMaps() || Settings.isStoreOfflineWpMaps()) {
-                    importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_STORE_STATIC_MAPS, R.string.gpx_import_store_static_maps, search.getCount()));
-                    boolean finishedWithoutCancel = importStaticMaps(search);
-                    // Skip last message if static maps where canceled
-                    if (!finishedWithoutCancel) {
-                        return;
-                    }
-                }
-
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED, search.getCount(), 0, search));
-            } catch (IOException e) {
-                Log.i("Importing caches failed - error reading data: " + e.getMessage());
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_io, 0, e.getLocalizedMessage()));
-            } catch (ParserException e) {
-                Log.i("Importing caches failed - data format error" + e.getMessage());
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_parser, 0, e.getLocalizedMessage()));
-            } catch (CancellationException e) {
-                Log.i("Importing caches canceled");
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_CANCELED));
-            } catch (Exception e) {
-                Log.e("Importing caches failed - unknown error: ", e);
-                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_unexpected, 0, e.getLocalizedMessage()));
-            }
-        }
-
-        protected abstract Collection<Geocache> doImport() throws IOException, ParserException;
-
-        private boolean importStaticMaps(final SearchResult importedCaches) {
-            int storedCacheMaps = 0;
-            for (final String geocode : importedCaches.getGeocodes()) {
-                final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
-                if (cache != null) {
-                    Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);
-                    StaticMapsProvider.downloadMaps(cache);
-                } else {
-                    Log.d("GPXImporter.ImportThread.importStaticMaps: no data found for " + geocode);
-                }
-                storedCacheMaps++;
-                if (progressHandler.isCancelled()) {
-                    return false;
-                }
-                progressHandler.sendMessage(progressHandler.obtainMessage(0, storedCacheMaps, 0));
-            }
-            return true;
-        }
-    }
-
-    static class ImportLocFileThread extends ImportThread {
-        private final File file;
-
-        public ImportLocFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-            this.file = file;
-        }
-
-        @Override
-        protected Collection<Geocache> doImport() throws IOException, ParserException {
-            Log.i("Import LOC file: " + file.getAbsolutePath());
-            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) file.length()));
-            LocParser parser = new LocParser(listId);
-            return parser.parse(file, progressHandler);
-        }
-    }
-
-    static abstract class ImportGpxThread extends ImportThread {
-
-        protected ImportGpxThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-        }
-
-        @Override
-        protected Collection<Geocache> doImport() throws IOException, ParserException {
-            try {
-                // try to parse cache file as GPX 10
-                return doImport(new GPX10Parser(listId));
-            } catch (ParserException pe) {
-                // didn't work -> lets try GPX11
-                return doImport(new GPX11Parser(listId));
-            }
-        }
-
-        protected abstract Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException;
-    }
-
-    static class ImportGpxFileThread extends ImportGpxThread {
-        private final File cacheFile;
-
-        public ImportGpxFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-            this.cacheFile = file;
-        }
-
-        @Override
-        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
-            Log.i("Import GPX file: " + cacheFile.getAbsolutePath());
-            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) cacheFile.length()));
-            Collection<Geocache> caches = parser.parse(cacheFile, progressHandler);
-
-            final String wptsFilename = getWaypointsFileNameForGpxFile(cacheFile);
-            if (wptsFilename != null) {
-                final File wptsFile = new File(cacheFile.getParentFile(), wptsFilename);
-                if (wptsFile.canRead()) {
-                    Log.i("Import GPX waypoint file: " + wptsFile.getAbsolutePath());
-                    importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_WPT_FILE, R.string.gpx_import_loading_waypoints, (int) wptsFile.length()));
-                    caches = parser.parse(wptsFile, progressHandler);
-                }
-            }
-            return caches;
-        }
-    }
-
-    static class ImportGpxAttachmentThread extends ImportGpxThread {
-        private final Uri uri;
-        private ContentResolver contentResolver;
-
-        public ImportGpxAttachmentThread(Uri uri, ContentResolver contentResolver, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-            this.uri = uri;
-            this.contentResolver = contentResolver;
-        }
-
-        @Override
-        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
-            Log.i("Import GPX from uri: " + uri);
-            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, -1));
-            InputStream is = contentResolver.openInputStream(uri);
-            try {
-                return parser.parse(is, progressHandler);
-            } finally {
-                is.close();
-            }
-        }
-    }
-
-    static abstract class ImportGpxZipThread extends ImportGpxThread {
-
-        protected ImportGpxZipThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-        }
-
-        @Override
-        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
-            Collection<Geocache> caches = Collections.emptySet();
-            // can't assume that GPX file comes before waypoint file in zip -> so we need two passes
-            // 1. parse GPX files
-            ZipInputStream zis = new ZipInputStream(getInputStream());
-            try {
-                for (ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry()) {
-                    if (StringUtils.endsWithIgnoreCase(zipEntry.getName(), GPX_FILE_EXTENSION)) {
-                        if (!StringUtils.endsWithIgnoreCase(zipEntry.getName(), WAYPOINTS_FILE_SUFFIX_AND_EXTENSION)) {
-                            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) zipEntry.getSize()));
-                            caches = parser.parse(new NoCloseInputStream(zis), progressHandler);
-                        }
-                    } else {
-                        throw new ParserException("Imported zip is not a GPX zip file.");
-                    }
-                    zis.closeEntry();
-                }
-            } finally {
-                zis.close();
-            }
-
-            // 2. parse waypoint files
-            zis = new ZipInputStream(getInputStream());
-            try {
-                for (ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry()) {
-                    if (StringUtils.endsWithIgnoreCase(zipEntry.getName(), WAYPOINTS_FILE_SUFFIX_AND_EXTENSION)) {
-                        importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_WPT_FILE, R.string.gpx_import_loading_waypoints, (int) zipEntry.getSize()));
-                        caches = parser.parse(new NoCloseInputStream(zis), progressHandler);
-                    }
-                    zis.closeEntry();
-                }
-            } finally {
-                zis.close();
-            }
-
-            return caches;
-        }
-
-        protected abstract InputStream getInputStream() throws IOException;
-    }
-
-    static class ImportGpxZipFileThread extends ImportGpxZipThread {
-        private final File cacheFile;
-
-        public ImportGpxZipFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-            this.cacheFile = file;
-            Log.i("Import zipped GPX: " + file);
-        }
-
-        @Override
-        protected InputStream getInputStream() throws IOException {
-            return new FileInputStream(cacheFile);
-        }
-    }
-
-    static class ImportGpxZipAttachmentThread extends ImportGpxZipThread {
-        private final Uri uri;
-        private ContentResolver contentResolver;
-
-        public ImportGpxZipAttachmentThread(Uri uri, ContentResolver contentResolver, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
-            super(listId, importStepHandler, progressHandler);
-            this.uri = uri;
-            this.contentResolver = contentResolver;
-            Log.i("Import zipped GPX from uri: " + uri);
-        }
-
-        @Override
-        protected InputStream getInputStream() throws IOException {
-            return contentResolver.openInputStream(uri);
-        }
-    }
-
-    final private CancellableHandler progressHandler = new CancellableHandler() {
-        @Override
-        public void handleRegularMessage(Message msg) {
-            progress.setProgress(msg.arg1);
-        }
-    };
-
-    final private Handler importStepHandler = new Handler() {
-        private boolean showProgressAfterCancel = false;
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case IMPORT_STEP_START:
-                    Message cancelMessage = importStepHandler.obtainMessage(IMPORT_STEP_CANCEL);
-                    progress.show((Context) fromActivity, res.getString(R.string.gpx_import_title_reading_file), res.getString(R.string.gpx_import_loading_caches), ProgressDialog.STYLE_HORIZONTAL, cancelMessage);
-                    break;
-
-                case IMPORT_STEP_READ_FILE:
-                case IMPORT_STEP_READ_WPT_FILE:
-                    progress.setMessage(res.getString(msg.arg1));
-                    progress.setMaxProgressAndReset(msg.arg2);
-                    break;
-
-                case IMPORT_STEP_STORE_STATIC_MAPS:
-                    progress.dismiss();
-                    Message skipMessage = importStepHandler.obtainMessage(IMPORT_STEP_STATIC_MAPS_SKIPPED, msg.arg2, 0);
-                    progress.show((Context) fromActivity, res.getString(R.string.gpx_import_title_static_maps), res.getString(R.string.gpx_import_store_static_maps), ProgressDialog.STYLE_HORIZONTAL, skipMessage);
-                    progress.setMaxProgressAndReset(msg.arg2);
-                    break;
-
-                case IMPORT_STEP_STATIC_MAPS_SKIPPED:
-                    progress.dismiss();
-                    progressHandler.cancel();
-                    StringBuilder bufferSkipped = new StringBuilder(20);
-                    bufferSkipped.append(res.getString(R.string.gpx_import_static_maps_skipped)).append(", ").append(msg.arg1).append(' ').append(res.getString(R.string.gpx_import_caches_imported));
-                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), bufferSkipped.toString());
-                    importFinished();
-                    break;
-
-                case IMPORT_STEP_FINISHED:
-                    progress.dismiss();
-                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), msg.arg1 + " " + res.getString(R.string.gpx_import_caches_imported));
-                    importFinished();
-                    break;
-
-                case IMPORT_STEP_FINISHED_WITH_ERROR:
-                    progress.dismiss();
-                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_import_failed), res.getString(msg.arg1) + "\n\n" + msg.obj);
-                    importFinished();
-                    break;
-
-                case IMPORT_STEP_CANCEL:
-                    progress.dismiss();
-                    progressHandler.cancel();
-                    break;
-
-                case IMPORT_STEP_CANCELED:
-                    StringBuilder bufferCanceled = new StringBuilder(20);
-                    bufferCanceled.append(res.getString(R.string.gpx_import_canceled));
-                    if (showProgressAfterCancel) {
-                        bufferCanceled.append(", ").append(progress.getProgress()).append(' ').append(res.getString(R.string.gpx_import_caches_imported));
-                    }
-                    fromActivity.showShortToast(bufferCanceled.toString());
-                    importFinished();
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    };
-
-    /**
-     * @param gpxfile
-     *            the gpx file
-     * @return the expected file name of the waypoints file
-     */
-    static String getWaypointsFileNameForGpxFile(final File gpxfile) {
-        if (gpxfile == null || !gpxfile.canRead()) {
-            return null;
-        }
-        final String gpxFileName = gpxfile.getName();
-        File dir = gpxfile.getParentFile();
-        String[] filenameList = dir.list();
-        for (String filename : filenameList) {
-            if (!StringUtils.containsIgnoreCase(filename, WAYPOINTS_FILE_SUFFIX)) {
-                continue;
-            }
-            String expectedGpxFileName = StringUtils.substringBeforeLast(filename, WAYPOINTS_FILE_SUFFIX)
-                    + StringUtils.substringAfterLast(filename, WAYPOINTS_FILE_SUFFIX);
-            if (gpxFileName.equals(expectedGpxFileName)) {
-                return filename;
-            }
-        }
-        return null;
-    }
-
-    protected void importFinished() {
-        if (importFinishedHandler != null) {
-            importFinishedHandler.sendEmptyMessage(0);
-        }
-    }
-}
+package cgeo.geocaching.files;
+
+import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
+import cgeo.geocaching.SearchResult;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.StaticMapsProvider;
+import cgeo.geocaching.cgData;
+import cgeo.geocaching.activity.IAbstractActivity;
+import cgeo.geocaching.activity.Progress;
+import cgeo.geocaching.enumerations.LoadFlags;
+import cgeo.geocaching.utils.CancellableHandler;
+import cgeo.geocaching.utils.Log;
+
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class GPXImporter {
+    static final int IMPORT_STEP_START = 0;
+    static final int IMPORT_STEP_READ_FILE = 1;
+    static final int IMPORT_STEP_READ_WPT_FILE = 2;
+    static final int IMPORT_STEP_STORE_STATIC_MAPS = 4;
+    static final int IMPORT_STEP_FINISHED = 5;
+    static final int IMPORT_STEP_FINISHED_WITH_ERROR = 6;
+    static final int IMPORT_STEP_CANCEL = 7;
+    static final int IMPORT_STEP_CANCELED = 8;
+    static final int IMPORT_STEP_STATIC_MAPS_SKIPPED = 9;
+
+    public static final String GPX_FILE_EXTENSION = ".gpx";
+    public static final String ZIP_FILE_EXTENSION = ".zip";
+    public static final String WAYPOINTS_FILE_SUFFIX = "-wpts";
+    public static final String WAYPOINTS_FILE_SUFFIX_AND_EXTENSION = WAYPOINTS_FILE_SUFFIX + GPX_FILE_EXTENSION;
+
+    private static final List<String> GPX_MIME_TYPES = Arrays.asList("text/xml", "application/xml");
+    private static final List<String> ZIP_MIME_TYPES = Arrays.asList("application/zip", "application/x-compressed", "application/x-zip-compressed", "application/x-zip", "application/octet-stream");
+
+    private Progress progress = new Progress(true);
+
+    private Resources res;
+    private int listId;
+    private IAbstractActivity fromActivity;
+    private Handler importFinishedHandler;
+
+    public GPXImporter(final IAbstractActivity fromActivity, final int listId, final Handler importFinishedHandler) {
+        this.listId = listId;
+        this.fromActivity = fromActivity;
+        res = ((Activity) fromActivity).getResources();
+        this.importFinishedHandler = importFinishedHandler;
+    }
+
+    /**
+     * Import GPX file. Currently supports *.gpx, *.zip (containing gpx files, e.g. PQ queries) or *.loc files.
+     *
+     * @param file
+     *            the file to import
+     */
+    public void importGPX(final File file) {
+        if (StringUtils.endsWithIgnoreCase(file.getName(), GPX_FILE_EXTENSION)) {
+            new ImportGpxFileThread(file, listId, importStepHandler, progressHandler).start();
+        } else if (StringUtils.endsWithIgnoreCase(file.getName(), ZIP_FILE_EXTENSION)) {
+            new ImportGpxZipFileThread(file, listId, importStepHandler, progressHandler).start();
+        } else {
+            new ImportLocFileThread(file, listId, importStepHandler, progressHandler).start();
+        }
+    }
+
+    /**
+     * Import GPX provided via intent of activity that instantiated this GPXImporter.
+     */
+    public void importGPX() {
+        final ContentResolver contentResolver = ((Activity) fromActivity).getContentResolver();
+        final Intent intent = ((Activity) fromActivity).getIntent();
+        final Uri uri = intent.getData();
+
+        String mimeType = intent.getType();
+        // if mimetype can't be determined (e.g. for emulators email app), derive it from uri file extension
+        // contentResolver.getType(uri) doesn't help but throws exception for emulators email app
+        //   Permission Denial: reading com.android.email.provider.EmailProvider uri
+        // Google search says: there is no solution for this problem
+        // Gmail doesn't work at all, see #967
+        if (mimeType == null) {
+            if (StringUtils.endsWithIgnoreCase(uri.getPath(), GPX_FILE_EXTENSION)) {
+                mimeType = "application/xml";
+            } else {
+                // if we can't determine a better type, default to zip import
+                // emulator email sends e.g. content://com.android.email.attachmentprovider/1/1/RAW, mimetype=null
+                mimeType = "application/zip";
+            }
+        }
+
+        Log.i("importGPX: " + uri + ", mimetype=" + mimeType);
+        if (GPX_MIME_TYPES.contains(mimeType)) {
+            new ImportGpxAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
+        } else if (ZIP_MIME_TYPES.contains(mimeType)) {
+            new ImportGpxZipAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
+        } else {
+            importFinished();
+        }
+    }
+
+    static abstract class ImportThread extends Thread {
+        final int listId;
+        final Handler importStepHandler;
+        final CancellableHandler progressHandler;
+
+        protected ImportThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            this.listId = listId;
+            this.importStepHandler = importStepHandler;
+            this.progressHandler = progressHandler;
+        }
+
+        @Override
+        public void run() {
+            try {
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_START));
+                final Collection<Geocache> caches = doImport();
+                Log.i("Imported successfully " + caches.size() + " caches.");
+
+                final SearchResult search = new SearchResult();
+                for (Geocache cache : caches) {
+                    search.addCache(cache);
+                }
+
+                if (Settings.isStoreOfflineMaps() || Settings.isStoreOfflineWpMaps()) {
+                    importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_STORE_STATIC_MAPS, R.string.gpx_import_store_static_maps, search.getCount()));
+                    boolean finishedWithoutCancel = importStaticMaps(search);
+                    // Skip last message if static maps where canceled
+                    if (!finishedWithoutCancel) {
+                        return;
+                    }
+                }
+
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED, search.getCount(), 0, search));
+            } catch (IOException e) {
+                Log.i("Importing caches failed - error reading data: " + e.getMessage());
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_io, 0, e.getLocalizedMessage()));
+            } catch (ParserException e) {
+                Log.i("Importing caches failed - data format error" + e.getMessage());
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_parser, 0, e.getLocalizedMessage()));
+            } catch (CancellationException e) {
+                Log.i("Importing caches canceled");
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_CANCELED));
+            } catch (Exception e) {
+                Log.e("Importing caches failed - unknown error: ", e);
+                importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_unexpected, 0, e.getLocalizedMessage()));
+            }
+        }
+
+        protected abstract Collection<Geocache> doImport() throws IOException, ParserException;
+
+        private boolean importStaticMaps(final SearchResult importedCaches) {
+            int storedCacheMaps = 0;
+            for (final String geocode : importedCaches.getGeocodes()) {
+                final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
+                if (cache != null) {
+                    Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);
+                    StaticMapsProvider.downloadMaps(cache);
+                } else {
+                    Log.d("GPXImporter.ImportThread.importStaticMaps: no data found for " + geocode);
+                }
+                storedCacheMaps++;
+                if (progressHandler.isCancelled()) {
+                    return false;
+                }
+                progressHandler.sendMessage(progressHandler.obtainMessage(0, storedCacheMaps, 0));
+            }
+            return true;
+        }
+    }
+
+    static class ImportLocFileThread extends ImportThread {
+        private final File file;
+
+        public ImportLocFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+            this.file = file;
+        }
+
+        @Override
+        protected Collection<Geocache> doImport() throws IOException, ParserException {
+            Log.i("Import LOC file: " + file.getAbsolutePath());
+            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) file.length()));
+            LocParser parser = new LocParser(listId);
+            return parser.parse(file, progressHandler);
+        }
+    }
+
+    static abstract class ImportGpxThread extends ImportThread {
+
+        protected ImportGpxThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+        }
+
+        @Override
+        protected Collection<Geocache> doImport() throws IOException, ParserException {
+            try {
+                // try to parse cache file as GPX 10
+                return doImport(new GPX10Parser(listId));
+            } catch (ParserException pe) {
+                // didn't work -> lets try GPX11
+                return doImport(new GPX11Parser(listId));
+            }
+        }
+
+        protected abstract Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException;
+    }
+
+    static class ImportGpxFileThread extends ImportGpxThread {
+        private final File cacheFile;
+
+        public ImportGpxFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+            this.cacheFile = file;
+        }
+
+        @Override
+        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
+            Log.i("Import GPX file: " + cacheFile.getAbsolutePath());
+            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) cacheFile.length()));
+            Collection<Geocache> caches = parser.parse(cacheFile, progressHandler);
+
+            final String wptsFilename = getWaypointsFileNameForGpxFile(cacheFile);
+            if (wptsFilename != null) {
+                final File wptsFile = new File(cacheFile.getParentFile(), wptsFilename);
+                if (wptsFile.canRead()) {
+                    Log.i("Import GPX waypoint file: " + wptsFile.getAbsolutePath());
+                    importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_WPT_FILE, R.string.gpx_import_loading_waypoints, (int) wptsFile.length()));
+                    caches = parser.parse(wptsFile, progressHandler);
+                }
+            }
+            return caches;
+        }
+    }
+
+    static class ImportGpxAttachmentThread extends ImportGpxThread {
+        private final Uri uri;
+        private ContentResolver contentResolver;
+
+        public ImportGpxAttachmentThread(Uri uri, ContentResolver contentResolver, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+            this.uri = uri;
+            this.contentResolver = contentResolver;
+        }
+
+        @Override
+        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
+            Log.i("Import GPX from uri: " + uri);
+            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, -1));
+            InputStream is = contentResolver.openInputStream(uri);
+            try {
+                return parser.parse(is, progressHandler);
+            } finally {
+                is.close();
+            }
+        }
+    }
+
+    static abstract class ImportGpxZipThread extends ImportGpxThread {
+
+        protected ImportGpxZipThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+        }
+
+        @Override
+        protected Collection<Geocache> doImport(GPXParser parser) throws IOException, ParserException {
+            Collection<Geocache> caches = Collections.emptySet();
+            // can't assume that GPX file comes before waypoint file in zip -> so we need two passes
+            // 1. parse GPX files
+            ZipInputStream zis = new ZipInputStream(getInputStream());
+            try {
+                for (ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry()) {
+                    if (StringUtils.endsWithIgnoreCase(zipEntry.getName(), GPX_FILE_EXTENSION)) {
+                        if (!StringUtils.endsWithIgnoreCase(zipEntry.getName(), WAYPOINTS_FILE_SUFFIX_AND_EXTENSION)) {
+                            importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_FILE, R.string.gpx_import_loading_caches, (int) zipEntry.getSize()));
+                            caches = parser.parse(new NoCloseInputStream(zis), progressHandler);
+                        }
+                    } else {
+                        throw new ParserException("Imported zip is not a GPX zip file.");
+                    }
+                    zis.closeEntry();
+                }
+            } finally {
+                zis.close();
+            }
+
+            // 2. parse waypoint files
+            zis = new ZipInputStream(getInputStream());
+            try {
+                for (ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry()) {
+                    if (StringUtils.endsWithIgnoreCase(zipEntry.getName(), WAYPOINTS_FILE_SUFFIX_AND_EXTENSION)) {
+                        importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_READ_WPT_FILE, R.string.gpx_import_loading_waypoints, (int) zipEntry.getSize()));
+                        caches = parser.parse(new NoCloseInputStream(zis), progressHandler);
+                    }
+                    zis.closeEntry();
+                }
+            } finally {
+                zis.close();
+            }
+
+            return caches;
+        }
+
+        protected abstract InputStream getInputStream() throws IOException;
+    }
+
+    static class ImportGpxZipFileThread extends ImportGpxZipThread {
+        private final File cacheFile;
+
+        public ImportGpxZipFileThread(final File file, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+            this.cacheFile = file;
+            Log.i("Import zipped GPX: " + file);
+        }
+
+        @Override
+        protected InputStream getInputStream() throws IOException {
+            return new FileInputStream(cacheFile);
+        }
+    }
+
+    static class ImportGpxZipAttachmentThread extends ImportGpxZipThread {
+        private final Uri uri;
+        private ContentResolver contentResolver;
+
+        public ImportGpxZipAttachmentThread(Uri uri, ContentResolver contentResolver, int listId, Handler importStepHandler, CancellableHandler progressHandler) {
+            super(listId, importStepHandler, progressHandler);
+            this.uri = uri;
+            this.contentResolver = contentResolver;
+            Log.i("Import zipped GPX from uri: " + uri);
+        }
+
+        @Override
+        protected InputStream getInputStream() throws IOException {
+            return contentResolver.openInputStream(uri);
+        }
+    }
+
+    final private CancellableHandler progressHandler = new CancellableHandler() {
+        @Override
+        public void handleRegularMessage(Message msg) {
+            progress.setProgress(msg.arg1);
+        }
+    };
+
+    final private Handler importStepHandler = new Handler() {
+        private boolean showProgressAfterCancel = false;
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case IMPORT_STEP_START:
+                    Message cancelMessage = importStepHandler.obtainMessage(IMPORT_STEP_CANCEL);
+                    progress.show((Context) fromActivity, res.getString(R.string.gpx_import_title_reading_file), res.getString(R.string.gpx_import_loading_caches), ProgressDialog.STYLE_HORIZONTAL, cancelMessage);
+                    break;
+
+                case IMPORT_STEP_READ_FILE:
+                case IMPORT_STEP_READ_WPT_FILE:
+                    progress.setMessage(res.getString(msg.arg1));
+                    progress.setMaxProgressAndReset(msg.arg2);
+                    break;
+
+                case IMPORT_STEP_STORE_STATIC_MAPS:
+                    progress.dismiss();
+                    Message skipMessage = importStepHandler.obtainMessage(IMPORT_STEP_STATIC_MAPS_SKIPPED, msg.arg2, 0);
+                    progress.show((Context) fromActivity, res.getString(R.string.gpx_import_title_static_maps), res.getString(R.string.gpx_import_store_static_maps), ProgressDialog.STYLE_HORIZONTAL, skipMessage);
+                    progress.setMaxProgressAndReset(msg.arg2);
+                    break;
+
+                case IMPORT_STEP_STATIC_MAPS_SKIPPED:
+                    progress.dismiss();
+                    progressHandler.cancel();
+                    StringBuilder bufferSkipped = new StringBuilder(20);
+                    bufferSkipped.append(res.getString(R.string.gpx_import_static_maps_skipped)).append(", ").append(msg.arg1).append(' ').append(res.getString(R.string.gpx_import_caches_imported));
+                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), bufferSkipped.toString());
+                    importFinished();
+                    break;
+
+                case IMPORT_STEP_FINISHED:
+                    progress.dismiss();
+                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), msg.arg1 + " " + res.getString(R.string.gpx_import_caches_imported));
+                    importFinished();
+                    break;
+
+                case IMPORT_STEP_FINISHED_WITH_ERROR:
+                    progress.dismiss();
+                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_import_failed), res.getString(msg.arg1) + "\n\n" + msg.obj);
+                    importFinished();
+                    break;
+
+                case IMPORT_STEP_CANCEL:
+                    progress.dismiss();
+                    progressHandler.cancel();
+                    break;
+
+                case IMPORT_STEP_CANCELED:
+                    StringBuilder bufferCanceled = new StringBuilder(20);
+                    bufferCanceled.append(res.getString(R.string.gpx_import_canceled));
+                    if (showProgressAfterCancel) {
+                        bufferCanceled.append(", ").append(progress.getProgress()).append(' ').append(res.getString(R.string.gpx_import_caches_imported));
+                    }
+                    fromActivity.showShortToast(bufferCanceled.toString());
+                    importFinished();
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    };
+
+    /**
+     * @param gpxfile
+     *            the gpx file
+     * @return the expected file name of the waypoints file
+     */
+    static String getWaypointsFileNameForGpxFile(final File gpxfile) {
+        if (gpxfile == null || !gpxfile.canRead()) {
+            return null;
+        }
+        final String gpxFileName = gpxfile.getName();
+        File dir = gpxfile.getParentFile();
+        String[] filenameList = dir.list();
+        for (String filename : filenameList) {
+            if (!StringUtils.containsIgnoreCase(filename, WAYPOINTS_FILE_SUFFIX)) {
+                continue;
+            }
+            String expectedGpxFileName = StringUtils.substringBeforeLast(filename, WAYPOINTS_FILE_SUFFIX)
+                    + StringUtils.substringAfterLast(filename, WAYPOINTS_FILE_SUFFIX);
+            if (gpxFileName.equals(expectedGpxFileName)) {
+                return filename;
+            }
+        }
+        return null;
+    }
+
+    protected void importFinished() {
+        if (importFinishedHandler != null) {
+            importFinishedHandler.sendEmptyMessage(0);
+        }
+    }
+}
-- 
cgit v1.1


From a06ebc504275d11b740a54fddfb6dc60a0d0887a Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 17:57:35 +0200
Subject: refactoring: remove redundant null check

If the cache parameter is null, both callers will crash right before or
right after the call to storeCachePreviewMap. There is no point in
checking for nullness in this method.
---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 48f1e48..37a6cd6 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -163,10 +163,6 @@ public class StaticMapsProvider {
     }
 
     public static void storeCachePreviewMap(final Geocache cache) {
-        if (cache == null) {
-            Log.e("storeCachePreviewMap - missing input parameter cache");
-            return;
-        }
         final String latlonMap = cache.getCoords().format(Format.LAT_LON_DECDEGREE_COMMA);
         final Display display = ((WindowManager) cgeoapplication.getInstance().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
         DisplayMetrics metrics = new DisplayMetrics();
-- 
cgit v1.1


From a7c667f396f629957da115da3d46ce989b7ad736 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 18:06:25 +0200
Subject: refactoring: remove extra check

If getWaypoints() returns an empty collection, then the loop will do
nothing. Since it cannot return a null value, the test is redundant.
---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 37a6cd6..e7332a8 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -92,8 +92,8 @@ public class StaticMapsProvider {
         }
 
         // clean old and download static maps for waypoints if one is missing
-        if (Settings.isStoreOfflineWpMaps() && CollectionUtils.isNotEmpty(cache.getWaypoints())) {
-            for (Waypoint waypoint : cache.getWaypoints()) {
+        if (Settings.isStoreOfflineWpMaps()) {
+            for (final Waypoint waypoint : cache.getWaypoints()) {
                 if (!hasAllStaticMapsForWaypoint(cache.getGeocode(), waypoint)) {
                     refreshAllWpStaticMaps(cache, edge);
                 }
-- 
cgit v1.1


From b39ac269cec2ef1f77e35864189556b7954ba357 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 18:08:32 +0200
Subject: refactoring: remove unused import

---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index e7332a8..7afd33f 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -10,7 +10,6 @@ import cgeo.geocaching.utils.Log;
 
 import ch.boye.httpclientandroidlib.HttpResponse;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import android.content.Context;
-- 
cgit v1.1


From d53097da51ee155ac88c3e89680e673e087a3c64 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 18:10:50 +0200
Subject: refactoring: use Math.max to compute the maximum of two integer
 values

---
 main/src/cgeo/geocaching/StaticMapsProvider.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 7afd33f..9a4c00b 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -174,12 +174,7 @@ public class StaticMapsProvider {
 
     private static int guessMaxDisplaySide() {
         Point displaySize = Compatibility.getDisplaySize();
-        final int maxWidth = displaySize.x - 25;
-        final int maxHeight = displaySize.y - 25;
-        if (maxWidth > maxHeight) {
-            return maxWidth;
-        }
-        return maxHeight;
+        return Math.max(displaySize.x, displaySize.y) - 25;
     }
 
     private static void downloadMaps(final String geocode, final String markerUrl, final String prefix, final String latlonMap, final int edge,
-- 
cgit v1.1


From a2a94ea05224d696268ab385bf14d7322c366bfc Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 18:38:52 +0200
Subject: refactoring: simplify attribute resolution code

getString(id) would not return a blank string, it would raise an exception
if the given id was not found.
---
 main/src/cgeo/geocaching/filter/AttributeFilter.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/filter/AttributeFilter.java b/main/src/cgeo/geocaching/filter/AttributeFilter.java
index 4b6f382..f3e8eb3 100644
--- a/main/src/cgeo/geocaching/filter/AttributeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AttributeFilter.java
@@ -1,13 +1,11 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags.LoadFlag;
 
-import org.apache.commons.lang3.StringUtils;
-
 import android.content.res.Resources;
 
 import java.util.EnumSet;
@@ -24,13 +22,7 @@ class AttributeFilter extends AbstractFilter {
     private static String getName(final String attribute, final Resources res, final String packageName) {
         // dynamically search for a translation of the attribute
         final int id = res.getIdentifier(attribute, "string", packageName);
-        if (id > 0) {
-            final String translated = res.getString(id);
-            if (StringUtils.isNotBlank(translated)) {
-                return translated;
-            }
-        }
-        return attribute;
+        return id > 0 ? res.getString(id) : attribute;
     }
 
     @Override
-- 
cgit v1.1


From a684000289227de82d944da97d3d8d2d4998572b Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 20:13:46 +0200
Subject: refactoring: use lists instead of arrays for filter collections

Using arrays makes the surrounding code very constrained. Most of the
time, filter collections were built in lists and converted into arrays.
Using lists in the filter factory signature makes it more natural to
manipulate those collections.
---
 main/src/cgeo/geocaching/filter/AttributeFilter.java     | 11 ++++++-----
 main/src/cgeo/geocaching/filter/DifficultyFilter.java    |  5 +++--
 main/src/cgeo/geocaching/filter/FilterUserInterface.java |  9 +++++----
 main/src/cgeo/geocaching/filter/IFilterFactory.java      |  4 +++-
 main/src/cgeo/geocaching/filter/ModifiedFilter.java      |  7 +++++--
 main/src/cgeo/geocaching/filter/OriginFilter.java        |  5 +++--
 main/src/cgeo/geocaching/filter/SizeFilter.java          |  9 +++++----
 main/src/cgeo/geocaching/filter/StateFilter.java         |  7 ++++---
 main/src/cgeo/geocaching/filter/TerrainFilter.java       |  8 ++++----
 main/src/cgeo/geocaching/filter/TrackablesFilter.java    |  9 ++++++---
 main/src/cgeo/geocaching/filter/TypeFilter.java          |  9 +++++----
 11 files changed, 49 insertions(+), 34 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/filter/AttributeFilter.java b/main/src/cgeo/geocaching/filter/AttributeFilter.java
index f3e8eb3..cadcf49 100644
--- a/main/src/cgeo/geocaching/filter/AttributeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AttributeFilter.java
@@ -9,6 +9,8 @@ import cgeo.geocaching.enumerations.LoadFlags.LoadFlag;
 import android.content.res.Resources;
 
 import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
 
 class AttributeFilter extends AbstractFilter {
 
@@ -37,14 +39,13 @@ class AttributeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final String packageName = cgeoapplication.getInstance().getBaseContext().getPackageName();
             final Resources res = cgeoapplication.getInstance().getResources();
 
-            final String[] ids = res.getStringArray(R.array.attribute_ids);
-            final IFilter[] filters = new IFilter[ids.length];
-            for (int i = 0; i < ids.length; i++) {
-                filters[i] = new AttributeFilter(getName("attribute_" + ids[i], res, packageName), ids[i]);
+            final List<IFilter> filters = new LinkedList<IFilter>();
+            for (final String id: res.getStringArray(R.array.attribute_ids)) {
+                filters.add(new AttributeFilter(getName("attribute_" + id, res, packageName), id));
             }
             return filters;
         }
diff --git a/main/src/cgeo/geocaching/filter/DifficultyFilter.java b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
index c0ec61a..8099a51 100644
--- a/main/src/cgeo/geocaching/filter/DifficultyFilter.java
+++ b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 class DifficultyFilter extends AbstractRangeFilter {
 
@@ -19,12 +20,12 @@ class DifficultyFilter extends AbstractRangeFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
             for (int difficulty = 1; difficulty <= 5; difficulty++) {
                 filters.add(new DifficultyFilter(difficulty));
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
index be63a08..a1d42cc 100644
--- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java
+++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
@@ -16,6 +16,7 @@ import android.widget.ArrayAdapter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 public final class FilterUserInterface {
 
@@ -101,9 +102,9 @@ public final class FilterUserInterface {
     }
 
     private void selectFromFactory(final IFilterFactory factory, final String menuTitle, final RunnableWithArgument<IFilter> runAfterwards) {
-        final IFilter[] filters = factory.getFilters();
-        if (filters.length == 1) {
-            runAfterwards.run(filters[0]);
+        final List<IFilter> filters = Collections.unmodifiableList(factory.getFilters());
+        if (filters.size() == 1) {
+            runAfterwards.run(filters.get(0));
             return;
         }
 
@@ -114,7 +115,7 @@ public final class FilterUserInterface {
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int item) {
-                runAfterwards.run(filters[item]);
+                runAfterwards.run(filters.get(item));
             }
         });
 
diff --git a/main/src/cgeo/geocaching/filter/IFilterFactory.java b/main/src/cgeo/geocaching/filter/IFilterFactory.java
index 3491fd7..e750639 100644
--- a/main/src/cgeo/geocaching/filter/IFilterFactory.java
+++ b/main/src/cgeo/geocaching/filter/IFilterFactory.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.filter;
 
+import java.util.List;
+
 interface IFilterFactory {
-    public IFilter[] getFilters();
+    public List<? extends IFilter> getFilters();
 }
diff --git a/main/src/cgeo/geocaching/filter/ModifiedFilter.java b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
index f3e57de..74befda 100644
--- a/main/src/cgeo/geocaching/filter/ModifiedFilter.java
+++ b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
@@ -4,6 +4,9 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.cgeoapplication;
 
+import java.util.Collections;
+import java.util.List;
+
 class ModifiedFilter extends AbstractFilter implements IFilterFactory {
 
     public ModifiedFilter() {
@@ -17,7 +20,7 @@ class ModifiedFilter extends AbstractFilter implements IFilterFactory {
     }
 
     @Override
-    public IFilter[] getFilters() {
-        return new IFilter[] { this };
+    public List<ModifiedFilter> getFilters() {
+        return Collections.singletonList(this);
     }
 }
diff --git a/main/src/cgeo/geocaching/filter/OriginFilter.java b/main/src/cgeo/geocaching/filter/OriginFilter.java
index a880092..bd4e41e 100644
--- a/main/src/cgeo/geocaching/filter/OriginFilter.java
+++ b/main/src/cgeo/geocaching/filter/OriginFilter.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.connector.IConnector;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 public class OriginFilter extends AbstractFilter {
 
@@ -25,7 +26,7 @@ public class OriginFilter extends AbstractFilter {
     public static final class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<OriginFilter> getFilters() {
             final ArrayList<OriginFilter> filters = new ArrayList<OriginFilter>();
             for (IConnector connector : ConnectorFactory.getConnectors()) {
                 filters.add(new OriginFilter(connector));
@@ -40,7 +41,7 @@ public class OriginFilter extends AbstractFilter {
                 }
             });
 
-            return filters.toArray(new OriginFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/SizeFilter.java b/main/src/cgeo/geocaching/filter/SizeFilter.java
index 7a34c83..8ddc475 100644
--- a/main/src/cgeo/geocaching/filter/SizeFilter.java
+++ b/main/src/cgeo/geocaching/filter/SizeFilter.java
@@ -3,7 +3,8 @@ package cgeo.geocaching.filter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.enumerations.CacheSize;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 class SizeFilter extends AbstractFilter {
     private final CacheSize cacheSize;
@@ -26,15 +27,15 @@ class SizeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final CacheSize[] cacheSizes = CacheSize.values();
-            final ArrayList<SizeFilter> filters = new ArrayList<SizeFilter>();
+            final List<IFilter> filters = new LinkedList<IFilter>();
             for (CacheSize cacheSize : cacheSizes) {
                 if (cacheSize != CacheSize.UNKNOWN) {
                     filters.add(new SizeFilter(cacheSize));
                 }
             }
-            return filters.toArray(new SizeFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index 0df47c1..ae3fac2 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -9,6 +9,7 @@ import android.content.res.Resources;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 abstract class StateFilter extends AbstractFilter {
 
@@ -89,8 +90,8 @@ abstract class StateFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
-            final ArrayList<StateFilter> filters = new ArrayList<StateFilter>();
+        public List<StateFilter> getFilters() {
+            final List<StateFilter> filters = new ArrayList<StateFilter>(6);
             filters.add(new StateFoundFilter());
             filters.add(new StateArchivedFilter());
             filters.add(new StateDisabledFilter());
@@ -106,7 +107,7 @@ abstract class StateFilter extends AbstractFilter {
                 }
             });
 
-            return filters.toArray(new StateFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/TerrainFilter.java b/main/src/cgeo/geocaching/filter/TerrainFilter.java
index f7703d5..87372c6 100644
--- a/main/src/cgeo/geocaching/filter/TerrainFilter.java
+++ b/main/src/cgeo/geocaching/filter/TerrainFilter.java
@@ -1,10 +1,10 @@
 package cgeo.geocaching.filter;
 
-
-import cgeo.geocaching.R;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 class TerrainFilter extends AbstractRangeFilter {
 
@@ -19,12 +19,12 @@ class TerrainFilter extends AbstractRangeFilter {
 
     public static class Factory implements IFilterFactory {
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
             for (int terrain = 1; terrain <= 5; terrain++) {
                 filters.add(new TerrainFilter(terrain));
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
     }
 
diff --git a/main/src/cgeo/geocaching/filter/TrackablesFilter.java b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
index 3225daa..5eff8a7 100644
--- a/main/src/cgeo/geocaching/filter/TrackablesFilter.java
+++ b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
@@ -1,9 +1,12 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
 import cgeo.geocaching.cgeoapplication;
 
+import java.util.Collections;
+import java.util.List;
+
 class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     public TrackablesFilter() {
         super(cgeoapplication.getInstance().getString(R.string.caches_filter_track));
@@ -15,8 +18,8 @@ class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     }
 
     @Override
-    public IFilter[] getFilters() {
-        return new IFilter[] { this };
+    public List<TrackablesFilter> getFilters() {
+        return Collections.singletonList(this);
     }
 
 }
diff --git a/main/src/cgeo/geocaching/filter/TypeFilter.java b/main/src/cgeo/geocaching/filter/TypeFilter.java
index eeab552..ea0ccff 100644
--- a/main/src/cgeo/geocaching/filter/TypeFilter.java
+++ b/main/src/cgeo/geocaching/filter/TypeFilter.java
@@ -3,7 +3,8 @@ package cgeo.geocaching.filter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.enumerations.CacheType;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 class TypeFilter extends AbstractFilter {
     private final CacheType cacheType;
@@ -26,15 +27,15 @@ class TypeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final CacheType[] types = CacheType.values();
-            final ArrayList<IFilter> filters = new ArrayList<IFilter>(types.length);
+            final List<IFilter> filters = new LinkedList<IFilter>();
             for (CacheType cacheType : types) {
                 if (cacheType != CacheType.ALL) {
                     filters.add(new TypeFilter(cacheType));
                 }
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
 
     }
-- 
cgit v1.1


From e3c3b9bb066db079ac293052bc5dbcf2ba6f9bb4 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 21:05:23 +0200
Subject: fix #2585: log progress dismissed when tapping on screen

Use AsyncTaskWithProgress to factor out code at the same time.
---
 main/src/cgeo/geocaching/VisitCacheActivity.java | 137 +++++++++--------------
 1 file changed, 56 insertions(+), 81 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index f8232af..8957aa1 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -12,6 +12,7 @@ import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.twitter.Twitter;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.dialog.DateDialog;
+import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.LogTemplateProvider;
 import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
@@ -20,17 +21,15 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.util.SparseArray;
@@ -67,7 +66,6 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
     private LayoutInflater inflater = null;
     private Geocache cache = null;
-    private ProgressDialog waitDialog = null;
     private String cacheid = null;
     private String geocode = null;
     private String text = null;
@@ -240,34 +238,6 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         return res.getString(R.string.log_post_rate) + " " + ratingTextValue(rating) + "*";
     }
 
-    private final Handler postLogHandler = new Handler() {
-
-        @Override
-        public void handleMessage(final Message msg) {
-            if (waitDialog != null) {
-                waitDialog.dismiss();
-            }
-
-            final StatusCode error = (StatusCode) msg.obj;
-            if (error == StatusCode.NO_ERROR) {
-                showToast(res.getString(R.string.info_log_posted));
-                // No need to save the log when quitting if it has been posted.
-                text = currentLogText();
-                finish();
-            } else if (error == StatusCode.LOG_SAVED) {
-                showToast(res.getString(R.string.info_log_saved));
-
-                if (waitDialog != null) {
-                    waitDialog.dismiss();
-                }
-
-                finish();
-            } else {
-                showToast(error.getErrorString(res));
-            }
-        }
-    };
-
     public VisitCacheActivity() {
         super("c:geo-log");
     }
@@ -543,75 +513,80 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     private class PostListener implements View.OnClickListener {
         @Override
         public void onClick(View arg0) {
-            waitDialog = ProgressDialog.show(VisitCacheActivity.this, null,
-                    res.getString(StringUtils.isBlank(imageUri.getPath()) ? R.string.log_saving : R.string.log_saving_and_uploading), true);
-            waitDialog.setCancelable(true);
-
-            final Thread thread = new PostLogThread(postLogHandler, currentLogText());
-            thread.start();
+            final String message = res.getString(StringUtils.isBlank(imageUri.getPath()) ?
+                    R.string.log_saving :
+                    R.string.log_saving_and_uploading);
+            new Poster(VisitCacheActivity.this, message).execute(currentLogText());
         }
     }
 
-    private class PostLogThread extends Thread {
+    private class Poster extends AsyncTaskWithProgress<String, StatusCode> {
 
-        private final Handler handler;
-        private final String log;
-
-        public PostLogThread(Handler handlerIn, String logIn) {
-            super("Post log");
-            handler = handlerIn;
-            log = logIn;
+        public Poster(final Activity activity, final String progressMessage) {
+            super(activity, 0, null, progressMessage);
         }
 
         @Override
-        public void run() {
-            final StatusCode status = postLogFn(log);
-            handler.sendMessage(handler.obtainMessage(0, status));
-        }
-    }
+        protected StatusCode doInBackground(final String... args) {
+            final String log = args[0];
+            try {
+                final ImmutablePair<StatusCode, String> postResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
+                        date.get(Calendar.YEAR), (date.get(Calendar.MONTH) + 1), date.get(Calendar.DATE),
+                        log, trackables);
 
-    public StatusCode postLogFn(String log) {
-        try {
-            final ImmutablePair<StatusCode, String> postResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
-                    date.get(Calendar.YEAR), (date.get(Calendar.MONTH) + 1), date.get(Calendar.DATE),
-                    log, trackables);
+                if (postResult.left == StatusCode.NO_ERROR) {
+                    final LogEntry logNow = new LogEntry(date, typeSelected, log);
 
-            if (postResult.left == StatusCode.NO_ERROR) {
-                final LogEntry logNow = new LogEntry(date, typeSelected, log);
+                    cache.getLogs().add(0, logNow);
 
-                cache.getLogs().add(0, logNow);
-
-                if (typeSelected == LogType.FOUND_IT || typeSelected == LogType.ATTENDED) {
-                    cache.setFound(true);
-                }
+                    if (typeSelected == LogType.FOUND_IT || typeSelected == LogType.ATTENDED) {
+                        cache.setFound(true);
+                    }
 
-                cgData.saveChangedCache(cache);
-                cgData.clearLogOffline(geocode);
+                    cgData.saveChangedCache(cache);
+                    cgData.clearLogOffline(geocode);
 
-                if (typeSelected == LogType.FOUND_IT) {
-                    if (tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
-                        Twitter.postTweetCache(geocode);
+                    if (typeSelected == LogType.FOUND_IT) {
+                        if (tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
+                            Twitter.postTweetCache(geocode);
+                        }
+                        GCVote.setRating(cache, rating);
                     }
-                    GCVote.setRating(cache, rating);
-                }
 
-                if (StringUtils.isNotBlank(imageUri.getPath())) {
-                    ImmutablePair<StatusCode, String> imageResult = GCParser.uploadLogImage(postResult.right, imageCaption, imageDescription, imageUri);
-                    final String uploadedImageUrl = imageResult.right;
-                    if (StringUtils.isNotEmpty(uploadedImageUrl)) {
-                        logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
-                        cgData.saveChangedCache(cache);
+                    if (StringUtils.isNotBlank(imageUri.getPath())) {
+                        ImmutablePair<StatusCode, String> imageResult = GCParser.uploadLogImage(postResult.right, imageCaption, imageDescription, imageUri);
+                        final String uploadedImageUrl = imageResult.right;
+                        if (StringUtils.isNotEmpty(uploadedImageUrl)) {
+                            logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
+                            cgData.saveChangedCache(cache);
+                        }
+                        return imageResult.left;
                     }
-                    return imageResult.left;
                 }
+
+                return postResult.left;
+            } catch (Exception e) {
+                Log.e("cgeovisit.postLogFn", e);
             }
 
-            return postResult.left;
-        } catch (Exception e) {
-            Log.e("cgeovisit.postLogFn", e);
+            return StatusCode.LOG_POST_ERROR;
         }
 
-        return StatusCode.LOG_POST_ERROR;
+        @Override
+        protected void onPostExecute(final StatusCode status) {
+            super.onPostExecute(status);
+            if (status == StatusCode.NO_ERROR) {
+                showToast(res.getString(R.string.info_log_posted));
+                // No need to save the log when quitting if it has been posted.
+                text = currentLogText();
+                finish();
+            } else if (status == StatusCode.LOG_SAVED) {
+                showToast(res.getString(R.string.info_log_saved));
+                finish();
+            } else {
+                showToast(status.getErrorString(res));
+            }
+        }
     }
 
     private void saveLog(final boolean force) {
-- 
cgit v1.1


From 990b75b58d3c2d274028a3253f28364ee115a460 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 6 Apr 2013 21:48:25 +0200
Subject: refactoring: prefer StringUtils.defaultIfBlank over an explicit test

---
 main/src/cgeo/geocaching/Geocache.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 96bb2fe..4b78e4d 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -711,10 +711,7 @@ public class Geocache implements ICache, IWaypoint {
     public String getPersonalNote() {
         // non premium members have no personal notes, premium members have an empty string by default.
         // map both to null, so other code doesn't need to differentiate
-        if (StringUtils.isBlank(personalNote)) {
-            return null;
-        }
-        return personalNote;
+        return StringUtils.defaultIfBlank(personalNote, null);
     }
 
     public boolean supportsUserActions() {
-- 
cgit v1.1


From 325c9aad24d3aa2e2582cbc5e2d9ae815583b94a Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 7 Apr 2013 08:33:59 +0200
Subject: refactoring: make API of AsyncTaskWithProgress more explicit

---
 main/src/cgeo/geocaching/VisitCacheActivity.java   |  9 +-
 .../cgeo/geocaching/export/FieldnoteExport.java    | 29 +++----
 main/src/cgeo/geocaching/export/GpxExport.java     | 44 +++++-----
 .../geocaching/utils/AsyncTaskWithProgress.java    | 99 +++++++++++++++++-----
 4 files changed, 119 insertions(+), 62 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 8957aa1..74890f4 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -523,12 +523,12 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     private class Poster extends AsyncTaskWithProgress<String, StatusCode> {
 
         public Poster(final Activity activity, final String progressMessage) {
-            super(activity, 0, null, progressMessage);
+            super(activity, null, progressMessage, true);
         }
 
         @Override
-        protected StatusCode doInBackground(final String... args) {
-            final String log = args[0];
+        protected StatusCode doInBackgroundInternal(final String[] logTexts) {
+            final String log = logTexts[0];
             try {
                 final ImmutablePair<StatusCode, String> postResult = GCParser.postLog(geocode, cacheid, viewstates, typeSelected,
                         date.get(Calendar.YEAR), (date.get(Calendar.MONTH) + 1), date.get(Calendar.DATE),
@@ -573,8 +573,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         }
 
         @Override
-        protected void onPostExecute(final StatusCode status) {
-            super.onPostExecute(status);
+        protected void onPostExecuteInternal(final StatusCode status) {
             if (status == StatusCode.NO_ERROR) {
                 showToast(res.getString(R.string.info_log_posted));
                 // No need to save the log when quitting if it has been posted.
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index eadcb77..2900781 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -56,18 +56,19 @@ class FieldnoteExport extends AbstractExport {
     }
 
     @Override
-    public void export(final List<Geocache> caches, final Activity activity) {
+    public void export(final List<Geocache> cachesList, final Activity activity) {
+        final Geocache[] caches = cachesList.toArray(new Geocache[cachesList.size()]);
         if (null == activity) {
             // No activity given, so no user interaction possible.
             // Start export with default parameters.
-            new ExportTask(caches, null, false, false).execute((Void) null);
+            new ExportTask(null, false, false).execute(caches);
         } else {
             // Show configuration dialog
             getExportOptionsDialog(caches, activity).show();
         }
     }
 
-    private Dialog getExportOptionsDialog(final List<Geocache> caches, final Activity activity) {
+    private Dialog getExportOptionsDialog(final Geocache[] caches, final Activity activity) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
         // AlertDialog has always dark style, so we have to apply it as well always
@@ -90,19 +91,17 @@ class FieldnoteExport extends AbstractExport {
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
                 new ExportTask(
-                        caches,
                         activity,
                         uploadOption.isChecked(),
                         onlyNewOption.isChecked())
-                        .execute((Void) null);
+                        .execute(caches);
             }
         });
 
         return builder.create();
     }
 
-    private class ExportTask extends AsyncTaskWithProgress<Void, Boolean> {
-        private final List<Geocache> caches;
+    private class ExportTask extends AsyncTaskWithProgress<Geocache, Boolean> {
         private final Activity activity;
         private final boolean upload;
         private final boolean onlyNew;
@@ -113,8 +112,6 @@ class FieldnoteExport extends AbstractExport {
         /**
          * Instantiates and configures the task for exporting field notes.
          *
-         * @param caches
-         *            The {@link List} of {@link cgeo.geocaching.Geocache} to be exported
          * @param activity
          *            optional: Show a progress bar and toasts
          * @param upload
@@ -122,16 +119,15 @@ class FieldnoteExport extends AbstractExport {
          * @param onlyNew
          *            Upload/export only new logs since last export
          */
-        public ExportTask(final List<Geocache> caches, final Activity activity, final boolean upload, final boolean onlyNew) {
+        public ExportTask(final Activity activity, final boolean upload, final boolean onlyNew) {
             super(activity, getProgressTitle(), getString(R.string.export_fieldnotes_creating));
-            this.caches = caches;
             this.activity = activity;
             this.upload = upload;
             this.onlyNew = onlyNew;
         }
 
         @Override
-        protected Boolean doInBackground(Void... params) {
+        protected Boolean doInBackgroundInternal(Geocache[] caches) {
             final StringBuilder fieldNoteBuffer = new StringBuilder();
             try {
                 int i = 0;
@@ -219,8 +215,7 @@ class FieldnoteExport extends AbstractExport {
         }
 
         @Override
-        protected void onPostExecute(Boolean result) {
-            super.onPostExecute(result);
+        protected void onPostExecuteInternal(Boolean result) {
             if (null != activity) {
                 if (result) {
                     //                    if (onlyNew) {
@@ -239,12 +234,12 @@ class FieldnoteExport extends AbstractExport {
         }
 
         @Override
-        protected void onProgressUpdate(Integer... status) {
+        protected void onProgressUpdateInternal(int status) {
             if (null != activity) {
-                if (STATUS_UPLOAD == status[0]) {
+                if (STATUS_UPLOAD == status) {
                     setMessage(getString(R.string.export_fieldnotes_uploading));
                 } else {
-                    setMessage(getString(R.string.export_fieldnotes_creating) + " (" + status[0] + ')');
+                    setMessage(getString(R.string.export_fieldnotes_creating) + " (" + status + ')');
                 }
             }
         }
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 4c5d1e2..c6f72fd 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -5,9 +5,9 @@ import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.enumerations.CacheAttribute;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
@@ -37,6 +37,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -60,18 +61,19 @@ class GpxExport extends AbstractExport {
 
     @Override
     public void export(final List<Geocache> caches, final Activity activity) {
+        String[] geocodes = getGeocodes(caches);
         if (null == activity) {
             // No activity given, so no user interaction possible.
             // Start export with default parameters.
-            new ExportTask(caches, null).execute((Void) null);
+            new ExportTask(null).execute(geocodes);
 
         } else {
             // Show configuration dialog
-            getExportDialog(caches, activity).show();
+            getExportDialog(geocodes, activity).show();
         }
     }
 
-    private Dialog getExportDialog(final List<Geocache> caches, final Activity activity) {
+    private Dialog getExportDialog(final String[] geocodes, final Activity activity) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
         // AlertDialog has always dark style, so we have to apply it as well always
@@ -97,44 +99,47 @@ class GpxExport extends AbstractExport {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
-                new ExportTask(caches, activity).execute((Void) null);
+                new ExportTask(activity).execute(geocodes);
             }
         });
 
         return builder.create();
     }
 
-    private class ExportTask extends AsyncTaskWithProgress<Void, File> {
-        private final List<String> allGeocodes;
+    private static String[] getGeocodes(final List<Geocache> caches) {
+        ArrayList<String> allGeocodes = new ArrayList<String>(caches.size());
+        for (final Geocache geocache : caches) {
+            allGeocodes.add(geocache.getGeocode());
+        }
+        return allGeocodes.toArray(new String[allGeocodes.size()]);
+    }
+
+    private class ExportTask extends AsyncTaskWithProgress<String, File> {
         private final Activity activity;
         private int countExported = 0;
 
         /**
          * Instantiates and configures the task for exporting field notes.
          *
-         * @param caches
-         *            The {@link List} of {@link cgeo.geocaching.Geocache} to be exported
          * @param activity
          *            optional: Show a progress bar and toasts
          */
-        public ExportTask(final List<Geocache> caches, final Activity activity) {
-            super(activity, caches.size(), getProgressTitle(), cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, caches.size(), caches.size()));
-
-            // get rid of the (half loaded) caches, we will reload them as full caches during the export
-            allGeocodes = new ArrayList<String>(caches.size());
-            for (final Geocache geocache : caches) {
-                allGeocodes.add(geocache.getGeocode());
-            }
+        public ExportTask(final Activity activity) {
+            super(activity, getProgressTitle());
             this.activity = activity;
         }
 
         @Override
-        protected File doInBackground(Void... params) {
+        protected File doInBackgroundInternal(String[] geocodes) {
             // quick check for being able to write the GPX file
             if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
                 return null;
             }
 
+            List<String> allGeocodes = new ArrayList<String>(Arrays.asList(geocodes));
+
+            setMessage(cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, allGeocodes.size(), allGeocodes.size()));
+
             final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
             final File exportFile = new File(Settings.getGpxExportDir() + File.separatorChar + "export_" + fileNameDateFormat.format(new Date()) + ".gpx");
             FileWriter writer = null;
@@ -359,8 +364,7 @@ class GpxExport extends AbstractExport {
         }
 
         @Override
-        protected void onPostExecute(final File exportFile) {
-            super.onPostExecute(exportFile);
+        protected void onPostExecuteInternal(final File exportFile) {
             if (null != activity) {
                 if (exportFile != null) {
                     ActivityMixin.showToast(activity, getName() + ' ' + getString(R.string.export_exportedto) + ": " + exportFile.toString());
diff --git a/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java b/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java
index b23fa9d..7526d92 100644
--- a/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java
+++ b/main/src/cgeo/geocaching/utils/AsyncTaskWithProgress.java
@@ -8,8 +8,12 @@ import android.os.AsyncTask;
 
 /**
  * AsyncTask which automatically shows a progress dialog. Use it like the {@code AsyncTask} class, but leave away the
- * middle template parameter.
- *
+ * middle template parameter. Override {@link #doInBackgroundInternal(Object[])} and related methods.
+ * <p>
+ * If no style is given, the progress dialog uses "determinate" style with known maximum. The progress maximum is
+ * automatically derived from the number of {@code Params} given to the task in {@link #execute(Object...)}.
+ * </p>
+ * 
  * @param <Params>
  * @param <Result>
  */
@@ -17,64 +21,119 @@ public abstract class AsyncTaskWithProgress<Params, Result> extends AsyncTask<Pa
 
     private final Progress progress = new Progress();
     private final Activity activity;
-    private final int maxProgress;
     private final String progressTitle;
     private final String progressMessage;
+    private boolean indeterminate = false;
 
     /**
-     * Creates an AsyncTask with progress dialog, where the maximum is set to the given maxProgress.
-     * 
+     * Creates an AsyncTask with progress dialog.
+     *
      * @param activity
-     * @param maxProgress
      * @param progressTitle
      * @param progressMessage
      */
-    public AsyncTaskWithProgress(final Activity activity, final int maxProgress, final String progressTitle, final String progressMessage) {
+    public AsyncTaskWithProgress(final Activity activity, final String progressTitle, final String progressMessage) {
+        this(activity, progressTitle, progressMessage, false);
+    }
+
+    /**
+     * Creates an AsyncTask with progress dialog.
+     *
+     * @param activity
+     * @param progressTitle
+     */
+    public AsyncTaskWithProgress(final Activity activity, final String progressTitle) {
+        this(activity, progressTitle, null);
+    }
+
+    /**
+     * Creates an AsyncTask with progress dialog.
+     *
+     * @param activity
+     * @param progressTitle
+     * @param progressMessage
+     */
+    public AsyncTaskWithProgress(final Activity activity, final String progressTitle, final String progressMessage, boolean indeterminate) {
         this.activity = activity;
-        this.maxProgress = maxProgress;
         this.progressTitle = progressTitle;
         this.progressMessage = progressMessage;
+        this.indeterminate = indeterminate;
     }
 
     /**
-     * Creates an AsyncTask with progress dialog, where the maximum is set to indeterminate.
-     * 
+     * Creates an AsyncTask with progress dialog.
+     *
      * @param activity
      * @param progressTitle
-     * @param progressMessage
      */
-    public AsyncTaskWithProgress(final Activity activity, final String progressTitle, final String progressMessage) {
-        this(activity, 0, progressTitle, progressMessage);
+    public AsyncTaskWithProgress(final Activity activity, final String progressTitle, boolean indeterminate) {
+        this(activity, progressTitle, null, indeterminate);
     }
 
     @Override
-    protected void onPreExecute() {
+    protected final void onPreExecute() {
         if (null != activity) {
-            if (maxProgress <= 0) {
+            if (indeterminate) {
                 progress.show(activity, progressTitle, progressMessage, true, null);
             }
             else {
                 progress.show(activity, progressTitle, progressMessage, ProgressDialog.STYLE_HORIZONTAL, null);
             }
-            progress.setMaxProgressAndReset(maxProgress);
         }
+        onPreExecuteInternal();
+    }
+
+    /**
+     * This method should typically be overridden by sub classes instead of {@link #onPreExecute()}.
+     */
+    protected void onPreExecuteInternal() {
+        // empty by default
     }
 
     @Override
-    protected void onPostExecute(Result result) {
+    protected final void onPostExecute(Result result) {
+        onPostExecuteInternal(result);
         if (null != activity) {
             progress.dismiss();
         }
     }
 
+    /**
+     * This method should typically be overridden by sub classes instead of {@link #onPostExecute(Object)}.
+     *
+     * @param result
+     */
+    protected void onPostExecuteInternal(Result result) {
+        // empty by default
+    }
+
     @Override
-    protected void onProgressUpdate(Integer... status) {
-        if (null != activity) {
-            progress.setProgress(status[0]);
+    protected final void onProgressUpdate(Integer... status) {
+        final int progressValue = status[0];
+        if (null != activity && progressValue >= 0) {
+            progress.setProgress(progressValue);
         }
+        onProgressUpdateInternal(progressValue);
+    }
+
+    /**
+     * This method should by overridden by sub classes instead of {@link #onProgressUpdate(Integer...)}.
+     */
+    protected void onProgressUpdateInternal(@SuppressWarnings("unused") int progress) {
+        // empty by default
     }
 
     protected void setMessage(final String message) {
         progress.setMessage(message);
     }
+
+    @Override
+    protected final Result doInBackground(Params... params) {
+        if (params != null) {
+            progress.setMaxProgressAndReset(params.length);
+        }
+        return doInBackgroundInternal(params);
+    }
+
+    protected abstract Result doInBackgroundInternal(Params[] params);
 }
-- 
cgit v1.1


From 0518f75e136d51260164bb2681b03353b65b6ba5 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 09:14:32 +0200
Subject: refactoring: remove empty statements

---
 main/src/cgeo/geocaching/cgeo.java         | 3 +--
 main/src/cgeo/geocaching/maps/CGeoMap.java | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 5680ff3..0140c3a 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -311,6 +311,7 @@ public class cgeo extends AbstractActivity {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (requestCode == SCAN_REQUEST_CODE) {
+            // Only handle positive results, don't do anything if cancelled.
             if (resultCode == RESULT_OK) {
                 String scan = intent.getStringExtra("SCAN_RESULT");
                 if (StringUtils.isBlank(scan)) {
@@ -318,8 +319,6 @@ public class cgeo extends AbstractActivity {
                 }
 
                 SearchActivity.startActivityScan(scan, this);
-            } else if (resultCode == RESULT_CANCELED) {
-                // do nothing
             }
         } else if (requestCode == SEARCH_REQUEST_CODE) {
             // SearchActivity activity returned without making a search
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index f2e455c..e305b20 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -750,9 +750,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
 
                     @Override
                     public void onClick(DialogInterface dialog, int newItem) {
-                        if (newItem == selectedItem) {
-                            // no change
-                        } else {
+                        if (newItem != selectedItem) {
                             // Adjust index because of <default> selection
                             if (newItem > 0) {
                                 Settings.setCustomRenderThemeFile(themeFiles[newItem - 1].getPath());
-- 
cgit v1.1


From 1d1a6b02b77f65b1e9271acd56514fc443fdce4e Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 09:18:03 +0200
Subject: refactoring: remove redundant type casts

getParcelable() does not return a Parcelable, it returns a T where T is
a generic type deriving from Parcelable. Those type casts will be done
automatically and do not need to be spelled out explicitely.
---
 main/src/cgeo/geocaching/cgeocaches.java   | 2 +-
 main/src/cgeo/geocaching/cgeonavigate.java | 2 +-
 main/src/cgeo/geocaching/maps/CGeoMap.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index a8e798f..66333d4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -428,7 +428,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         if (extras != null) {
             Object typeObject = extras.get(Intents.EXTRA_LIST_TYPE);
             type = (typeObject instanceof CacheListType) ? (CacheListType) typeObject : CacheListType.OFFLINE;
-            coords = (Geopoint) extras.getParcelable(Intents.EXTRAS_COORDS);
+            coords = extras.getParcelable(Intents.EXTRAS_COORDS);
         }
         else {
             extras = new Bundle();
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index 17c2e20..929f0a3 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -63,7 +63,7 @@ public class cgeonavigate extends AbstractActivity {
         if (extras != null) {
             title = extras.getString(EXTRAS_GEOCODE);
             final String name = extras.getString(EXTRAS_NAME);
-            dstCoords = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
+            dstCoords = extras.getParcelable(EXTRAS_COORDS);
             info = extras.getString(EXTRAS_CACHE_INFO);
 
             if (StringUtils.isNotBlank(name)) {
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index e305b20..21c4984 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -382,9 +382,9 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
         if (extras != null) {
             mapMode = (MapMode) extras.get(EXTRAS_MAP_MODE);
             isLiveEnabled = extras.getBoolean(EXTRAS_LIVE_ENABLED, false);
-            searchIntent = (SearchResult) extras.getParcelable(EXTRAS_SEARCH);
+            searchIntent = extras.getParcelable(EXTRAS_SEARCH);
             geocodeIntent = extras.getString(EXTRAS_GEOCODE);
-            coordsIntent = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
+            coordsIntent = extras.getParcelable(EXTRAS_COORDS);
             waypointTypeIntent = WaypointType.findById(extras.getString(EXTRAS_WPTTYPE));
             mapStateIntent = extras.getIntArray(EXTRAS_MAPSTATE);
             mapTitle = extras.getString(EXTRAS_MAP_TITLE);
-- 
cgit v1.1


From 566f67a196b8aaa9fd29b05c18ddd4e767b3b3f3 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 09:20:55 +0200
Subject: refactoring: remove unused warnings on mandatory parameters

---
 main/src/cgeo/geocaching/cgeocaches.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 66333d4..657b06d 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1445,7 +1445,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void selectList(View view) {
+    public void selectList(@SuppressWarnings("unused") View view) {
         if (type != CacheListType.OFFLINE) {
             return;
         }
@@ -1544,7 +1544,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void goMap(View view) {
+    public void goMap(@SuppressWarnings("unused") View view) {
         if (search == null || CollectionUtils.isEmpty(cacheList)) {
             showToast(res.getString(R.string.warn_no_cache_coord));
 
-- 
cgit v1.1


From ba2a3ed0e0a02e90552b6605a94cb47d093c782e Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 7 Apr 2013 09:47:52 +0200
Subject: fix #2542: NPE when deleting list with all caches in it

---
 main/src/cgeo/geocaching/cgeocaches.java | 62 +++++++++++++++-----------------
 1 file changed, 28 insertions(+), 34 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 657b06d..bcd9531 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -39,6 +39,7 @@ import cgeo.geocaching.sorting.VisitComparator;
 import cgeo.geocaching.ui.CacheListAdapter;
 import cgeo.geocaching.ui.LoggingUI;
 import cgeo.geocaching.ui.WeakReferenceHandler;
+import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.DateUtils;
 import cgeo.geocaching.utils.GeoDirHandler;
 import cgeo.geocaching.utils.Log;
@@ -74,6 +75,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -373,21 +375,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             }
         }
     };
-    private Handler dropDetailsHandler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what != MSG_CANCEL) {
-                adapter.setSelectMode(false);
-
-                refreshCurrentList();
-
-                replaceCacheListFromSearch();
-
-                progress.dismiss();
-            }
-        }
-    };
     private Handler clearOfflineLogsHandler = new Handler() {
 
         @Override
@@ -794,7 +781,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
     }
 
     public void deletePastEvents() {
-        progress.show(this, null, res.getString(R.string.caches_drop_progress), true, dropDetailsHandler.obtainMessage(MSG_CANCEL));
         final List<Geocache> deletion = new ArrayList<Geocache>();
         for (Geocache cache : adapter.getCheckedOrAllCaches()) {
             if (cache.isEventCache()) {
@@ -804,7 +790,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 }
             }
         }
-        new DropDetailsThread(dropDetailsHandler, deletion).start();
+        new DropDetailsTask(false).execute(deletion.toArray(new Geocache[deletion.size()]));
     }
 
     public void clearOfflineLogs() {
@@ -1177,10 +1163,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
             @Override
             public void onClick(DialogInterface dialog, int id) {
-                dropSelected();
-                if (removeListAfterwards) {
-                    removeList(false);
-                }
+                dropSelected(removeListAfterwards);
                 dialog.cancel();
             }
         });
@@ -1196,9 +1179,9 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         alert.show();
     }
 
-    public void dropSelected() {
-        progress.show(this, null, res.getString(R.string.caches_drop_progress), true, dropDetailsHandler.obtainMessage(MSG_CANCEL));
-        new DropDetailsThread(dropDetailsHandler, adapter.getCheckedOrAllCaches()).start();
+    public void dropSelected(boolean removeListAfterwards) {
+        final List<Geocache> selected = adapter.getCheckedOrAllCaches();
+        new DropDetailsTask(removeListAfterwards).execute(selected.toArray(new Geocache[selected.size()]));
     }
 
     /**
@@ -1383,24 +1366,35 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         }
     }
 
-    private class DropDetailsThread extends Thread {
+    private class DropDetailsTask extends AsyncTaskWithProgress<Geocache, Void> {
 
-        final private Handler handler;
-        final private List<Geocache> selected;
+        private final boolean removeListAfterwards;
 
-        public DropDetailsThread(Handler handlerIn, List<Geocache> selectedIn) {
-            handler = handlerIn;
-            selected = selectedIn;
+        public DropDetailsTask(boolean removeListAfterwards) {
+            super(cgeocaches.this, null, res.getString(R.string.caches_drop_progress), true);
+            this.removeListAfterwards = removeListAfterwards;
         }
 
         @Override
-        public void run() {
+        protected Void doInBackgroundInternal(Geocache[] caches) {
             removeGeoAndDir();
-            cgData.markDropped(selected);
-            handler.sendEmptyMessage(MSG_DONE);
-
+            cgData.markDropped(Arrays.asList(caches));
             startGeoAndDir();
+            return null;
+        }
+
+        @Override
+        protected void onPostExecuteInternal(Void result) {
+            // remove list in UI because of toast
+            if (removeListAfterwards) {
+                removeList(false);
+            }
+
+            adapter.setSelectMode(false);
+            refreshCurrentList();
+            replaceCacheListFromSearch();
         }
+
     }
 
     private class ClearOfflineLogsThread extends Thread {
-- 
cgit v1.1


From 5a7ff22ff39d8726bdbbdd21364f23bcbd31de04 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 10:19:48 +0200
Subject: Add method documentation

---
 main/src/cgeo/geocaching/AbstractPopupActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index a7d1107..44acfc5 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -74,8 +74,13 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         }
     };
 
+    /**
+     * Callback to run when new location information is available.
+     * This may be overriden by deriving classes. The default implementation does nothing.
+     *
+     * @param geo the new data
+     */
     public void onUpdateGeoData(final IGeoData geo) {
-
     }
 
     protected AbstractPopupActivity(String helpTopic, int layout) {
-- 
cgit v1.1


From 777d113d77f1d384001d7ca2f75958871a70b26b Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 12:54:22 +0200
Subject: Rename EXTRAS_COORDS into the more correct EXTRA_COORDS

---
 main/src/cgeo/geocaching/Intents.java    | 2 +-
 main/src/cgeo/geocaching/cgeocaches.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Intents.java b/main/src/cgeo/geocaching/Intents.java
index 7f0a004..db4f245 100644
--- a/main/src/cgeo/geocaching/Intents.java
+++ b/main/src/cgeo/geocaching/Intents.java
@@ -9,7 +9,7 @@ public class Intents {
     private static final String PREFIX = "cgeo.geocaching.intent.extra.";
 
     public static final String EXTRA_ADDRESS = PREFIX + "address";
-    public static final String EXTRAS_COORDS = PREFIX + "coords";
+    public static final String EXTRA_COORDS = PREFIX + "coords";
     public static final String EXTRA_COUNT = PREFIX + "count";
     public static final String EXTRA_GEOCODE = PREFIX + "geocode";
     public static final String EXTRA_GUID = PREFIX + "guid";
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index bcd9531..30a18c5 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -415,7 +415,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         if (extras != null) {
             Object typeObject = extras.get(Intents.EXTRA_LIST_TYPE);
             type = (typeObject instanceof CacheListType) ? (CacheListType) typeObject : CacheListType.OFFLINE;
-            coords = extras.getParcelable(Intents.EXTRAS_COORDS);
+            coords = extras.getParcelable(Intents.EXTRA_COORDS);
         }
         else {
             extras = new Bundle();
@@ -1661,7 +1661,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.NEAREST);
-        cachesIntent.putExtra(Intents.EXTRAS_COORDS, coordsNow);
+        cachesIntent.putExtra(Intents.EXTRA_COORDS, coordsNow);
         context.startActivity(cachesIntent);
     }
 
@@ -1674,7 +1674,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
     public static void startActivityAddress(final Context context, final Geopoint coords, final String address) {
         final Intent addressIntent = new Intent(context, cgeocaches.class);
         addressIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.ADDRESS);
-        addressIntent.putExtra(Intents.EXTRAS_COORDS, coords);
+        addressIntent.putExtra(Intents.EXTRA_COORDS, coords);
         addressIntent.putExtra(Intents.EXTRA_ADDRESS, address);
         context.startActivity(addressIntent);
     }
@@ -1685,7 +1685,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.COORDINATE);
-        cachesIntent.putExtra(Intents.EXTRAS_COORDS, coords);
+        cachesIntent.putExtra(Intents.EXTRA_COORDS, coords);
         context.startActivity(cachesIntent);
     }
 
-- 
cgit v1.1


From c1b68d1b4b5d73afe60dcbbe03e9d3fd12f428b0 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 12:55:33 +0200
Subject: Put EXTRA parameters into the Intent class

---
 main/src/cgeo/geocaching/ImagesActivity.java | 16 ++++++----------
 main/src/cgeo/geocaching/Intents.java        |  2 ++
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 24f699e..de84af2 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -19,10 +19,6 @@ import java.util.List;
 
 public class ImagesActivity extends AbstractActivity {
 
-    private static final String EXTRAS_IMAGES = "images";
-    private static final String EXTRAS_TYPE = "type";
-    private static final String EXTRAS_GEOCODE = "geocode";
-
     private boolean offline;
     private ArrayList<Image> imageNames;
     private ImagesList imagesList;
@@ -37,8 +33,8 @@ public class ImagesActivity extends AbstractActivity {
 
         String geocode = null;
         if (extras != null) {
-            geocode = extras.getString(EXTRAS_GEOCODE);
-            imgType = (ImageType) extras.getSerializable(EXTRAS_TYPE);
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
+            imgType = (ImageType) extras.getSerializable(Intents.EXTRA_TYPE);
         }
 
         if (extras == null || geocode == null) {
@@ -54,7 +50,7 @@ public class ImagesActivity extends AbstractActivity {
 
         imagesList = new ImagesList(this, geocode);
 
-        imageNames = extras.getParcelableArrayList(EXTRAS_IMAGES);
+        imageNames = extras.getParcelableArrayList(Intents.EXTRA_IMAGES);
         if (CollectionUtils.isEmpty(imageNames)) {
             showToast(res.getString(R.string.warn_load_images));
             finish();
@@ -85,12 +81,12 @@ public class ImagesActivity extends AbstractActivity {
         final Intent logImgIntent = new Intent(fromActivity, ImagesActivity.class);
         // if resuming our app within this activity, finish it and return to the cache activity
         logImgIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
-                .putExtra(EXTRAS_GEOCODE, geocode)
-                .putExtra(EXTRAS_TYPE, imageType);
+                .putExtra(Intents.EXTRA_GEOCODE, geocode)
+                .putExtra(Intents.EXTRA_TYPE, imageType);
 
         // avoid forcing the array list as parameter type
         final ArrayList<Image> arrayList = new ArrayList<Image>(logImages);
-        logImgIntent.putParcelableArrayListExtra(EXTRAS_IMAGES, arrayList);
+        logImgIntent.putParcelableArrayListExtra(Intents.EXTRA_IMAGES, arrayList);
         fromActivity.startActivity(logImgIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/Intents.java b/main/src/cgeo/geocaching/Intents.java
index db4f245..a700451 100644
--- a/main/src/cgeo/geocaching/Intents.java
+++ b/main/src/cgeo/geocaching/Intents.java
@@ -13,6 +13,7 @@ public class Intents {
     public static final String EXTRA_COUNT = PREFIX + "count";
     public static final String EXTRA_GEOCODE = PREFIX + "geocode";
     public static final String EXTRA_GUID = PREFIX + "guid";
+    public static final String EXTRA_IMAGES = PREFIX + "images";
     public static final String EXTRA_ID = PREFIX + "id";
     public static final String EXTRA_KEYWORD = PREFIX + "keyword";
     public static final String EXTRA_KEYWORD_SEARCH = PREFIX + "keyword_search";
@@ -23,6 +24,7 @@ public class Intents {
     public static final String EXTRA_SEARCH = PREFIX + "search";
     public static final String EXTRA_START_DIR = PREFIX + "start_dir";
     public static final String EXTRA_TRACKING_CODE = PREFIX + "tracking_code";
+    public static final String EXTRA_TYPE = PREFIX + "type";
     public static final String EXTRA_USERNAME = PREFIX + "username";
     public static final String EXTRA_WAYPOINT_ID = PREFIX + "waypoint_id";
     public static final String EXTRA_CACHELIST = PREFIX + "cache_list";
-- 
cgit v1.1


From 154d9869c3972939cff5d95cb2b2343dc5e76309 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 7 Apr 2013 13:02:11 +0200
Subject: Replace progress dialog by individual progress bars when loading
 images

---
 main/res/layout/cache_image_item.xml              |  6 +++++
 main/res/values-cs/strings.xml                    |  3 ---
 main/res/values-de/strings.xml                    |  3 ---
 main/res/values-es/strings.xml                    |  2 --
 main/res/values-fr/strings.xml                    |  3 ---
 main/res/values-hu/strings.xml                    |  3 ---
 main/res/values-it/strings.xml                    |  3 ---
 main/res/values-ja/strings.xml                    |  3 ---
 main/res/values-nl/strings.xml                    |  3 ---
 main/res/values-pl/strings.xml                    |  3 ---
 main/res/values-pt/strings.xml                    |  3 ---
 main/res/values-sk/strings.xml                    |  3 ---
 main/res/values-sv/strings.xml                    |  3 ---
 main/res/values/strings.xml                       |  3 ---
 main/src/cgeo/geocaching/CacheDetailActivity.java |  3 +--
 main/src/cgeo/geocaching/ImagesActivity.java      |  2 +-
 main/src/cgeo/geocaching/ui/ImagesList.java       | 33 +++++------------------
 17 files changed, 14 insertions(+), 68 deletions(-)

(limited to 'main')

diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml
index 7ed4782..3e025e1 100644
--- a/main/res/layout/cache_image_item.xml
+++ b/main/res/layout/cache_image_item.xml
@@ -27,4 +27,10 @@
         android:textSize="14dip"
         android:visibility="gone" />
 
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@android:style/Widget.ProgressBar.Small"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index caf0a17..a93a535 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -514,7 +514,6 @@
   <string name="cache_attributes">Atributy</string>
   <string name="cache_inventory">Inventář</string>
   <string name="cache_log_offline">Offline Log</string>
-  <string name="cache_log_images_loading">Načítání obrázků z logů…</string>
   <string name="cache_log_images_title">Obrázky z Logů</string>
   <string name="cache_log_image_default_title">Fotografie</string>
   <string name="cache_personal_note">Osobní poznámka</string>
@@ -617,9 +616,7 @@
   <string name="cache_coordinates">Souřadnice</string>
   <string name="cache_coordinates_original">Původní souřadnice</string>
   <string name="cache_spoiler_images_title">Obrázky s nápovědou</string>
-  <string name="cache_spoiler_images_loading">Načítání obrázků s nápovědou…</string>
   <string name="cache_images_title">Obrázky</string>
-  <string name="cache_images_loading">Načítání obrázků…</string>
   <string name="cache_log_types">Typy zápisů</string>
   <string name="cache_coordinates_no">Tato keš nemá souřadnice.</string>
   <string name="cache_clear_history">Vymazat historii</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 87086ef..d011ce8 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -502,7 +502,6 @@
   <string name="cache_attributes">Attribute</string>
   <string name="cache_inventory">Inventar</string>
   <string name="cache_log_offline">Offline-Log</string>
-  <string name="cache_log_images_loading">Lade Logbild…</string>
   <string name="cache_log_images_title">Logbild</string>
   <string name="cache_log_image_default_title">Bild</string>
   <string name="cache_personal_note">Persönliche Notiz</string>
@@ -603,8 +602,6 @@
   <string name="cache_coordinates">Koordinaten</string>
   <string name="cache_coordinates_original">Ursprüngliche Koordinaten</string>
   <string name="cache_spoiler_images_title">Hinweisbilder</string>
-  <string name="cache_spoiler_images_loading">Lade Hinweisbilder…</string>
-  <string name="cache_images_loading">Lade Bilder…</string>
   <string name="cache_log_types">Logs</string>
   <string name="cache_coordinates_no">Dieser Cache hat keine Koordinaten.</string>
   <string name="cache_clear_history">Verlauf leeren</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 7215d72..0fe60b5 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -401,7 +401,6 @@
   <string name="cache_attributes">Atributos</string>
   <string name="cache_inventory">Inventario</string>
   <string name="cache_log_offline">Registro desconectado</string>
-  <string name="cache_log_images_loading">Cargando imagen de registro…</string>
   <string name="cache_log_images_title">Imagen de resgistro</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Nota personal</string>
@@ -464,7 +463,6 @@
   <string name="cache_location">Ubicación</string>
   <string name="cache_coordinates">Coordenadas</string>
   <string name="cache_spoiler_images_title">Imágenes reveladoras</string>
-  <string name="cache_spoiler_images_loading">Cargando imágenes reveladoras…</string>
   <string name="cache_log_types">Tipos de registro</string>
   <string name="cache_coordinates_no">Este escondite no tiene coordenadas.</string>
   <string name="cache_clear_history">Borrar historial</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 9de84ac..1fe3e20 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -512,7 +512,6 @@
   <string name="cache_attributes">Attributs</string>
   <string name="cache_inventory">Inventaire</string>
   <string name="cache_log_offline">Visite hors-ligne</string>
-  <string name="cache_log_images_loading">Chargement de l\'image de la visite…</string>
   <string name="cache_log_images_title">Image de la visite</string>
   <string name="cache_log_image_default_title">Photo</string>
   <string name="cache_personal_note">Note personnelle</string>
@@ -615,9 +614,7 @@
   <string name="cache_coordinates">Coordonnées</string>
   <string name="cache_coordinates_original">Coordonnées d\'origine</string>
   <string name="cache_spoiler_images_title">Images indices</string>
-  <string name="cache_spoiler_images_loading">Chargement des images indices…</string>
   <string name="cache_images_title">Images</string>
-  <string name="cache_images_loading">Chargement des images…</string>
   <string name="cache_log_types">Types de visites</string>
   <string name="cache_coordinates_no">Cette cache n\'a pas de coordonnées.</string>
   <string name="cache_clear_history">Effacer l\'historique</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index ec5e06e..dd8dfb9 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -483,7 +483,6 @@
   <string name="cache_attributes">Tulajdonságok</string>
   <string name="cache_inventory">Tárgyak</string>
   <string name="cache_log_offline">Offline bejegyzés</string>
-  <string name="cache_log_images_loading">Bejegyzés kép betöltése…</string>
   <string name="cache_log_images_title">Bejegyzés kép</string>
   <string name="cache_log_image_default_title">Fotó</string>
   <string name="cache_personal_note">Személyes megjegyzés</string>
@@ -577,9 +576,7 @@
   <string name="cache_coordinates">Koordináták</string>
   <string name="cache_coordinates_original">Eredeti koordináták</string> 
   <string name="cache_spoiler_images_title">Spoiler képek</string>
-  <string name="cache_spoiler_images_loading">Spoiler képek betöltése…</string>
   <string name="cache_images_title">Képek</string>
-  <string name="cache_images_loading">Képek betéltése…</string> 
   <string name="cache_log_types">Bejegyzés típusok</string>
   <string name="cache_coordinates_no">Ennek a ládának nincsenek koordinátái.</string>
   <string name="cache_clear_history">Előzmények törlése</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index f7d29cb..0205a19 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -484,7 +484,6 @@
   <string name="cache_attributes">Attributi</string>
   <string name="cache_inventory">Oggetti</string>
   <string name="cache_log_offline">Log Offline</string>
-  <string name="cache_log_images_loading">Caricamento immagini log…</string>
   <string name="cache_log_images_title">Immagini Log</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Note personali</string>
@@ -583,9 +582,7 @@
   <string name="cache_coordinates">Coordinate</string>
   <string name="cache_coordinates_original">Coordinate originali</string>
   <string name="cache_spoiler_images_title">Immagini spoiler</string>
-  <string name="cache_spoiler_images_loading">Caricamento immagini spoiler…</string>
   <string name="cache_images_title">Immaginis</string>
-  <string name="cache_images_loading">Caricamento immagini…</string>
   <string name="cache_log_types">Tipi di Log</string>
   <string name="cache_coordinates_no">Questo cache non ha coordinate.</string>
   <string name="cache_clear_history">Cancella cronologia</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 126a03c..926122f 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -494,7 +494,6 @@
   <string name="cache_attributes">属性</string>
   <string name="cache_inventory">目録</string>
   <string name="cache_log_offline">オフラインログ</string>
-  <string name="cache_log_images_loading">添付画像をロード中…</string>
   <string name="cache_log_images_title">ログの添付画像</string>
   <string name="cache_log_image_default_title">写真</string>
   <string name="cache_personal_note">パーソナルノート</string>
@@ -595,9 +594,7 @@
   <string name="cache_coordinates">座標</string>
   <string name="cache_coordinates_original">オリジナル座標</string>   <!-- 「初公開時の座標」の方がいいかも -->
   <string name="cache_spoiler_images_title">スポイラー画像</string>
-  <string name="cache_spoiler_images_loading">スポイラー画像をロード中…</string>
   <string name="cache_images_title">画像</string>
-  <string name="cache_images_loading">画像をロード中…</string>
   <string name="cache_log_types">ログタイプ</string>
   <string name="cache_coordinates_no">このキャッシュに座標値はありません。</string>
   <string name="cache_clear_history">全履歴を削除</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 729c382..322bb0b 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -497,7 +497,6 @@
   <string name="cache_attributes">Attributen</string>
   <string name="cache_inventory">Inventaris</string>
   <string name="cache_log_offline">Offline log</string>
-  <string name="cache_log_images_loading">Laden van logafbeeldingen…</string>
   <string name="cache_log_images_title">Logafbeelding</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Persoonlijke aantekening</string>
@@ -600,9 +599,7 @@
   <string name="cache_coordinates">Coördinaten</string>
   <string name="cache_coordinates_original">Originele coordinaten</string>
   <string name="cache_spoiler_images_title">Spoiler afbeeldingen</string>
-  <string name="cache_spoiler_images_loading">Spoiler afbeeldingen laden…</string>
   <string name="cache_images_title">Afbeeldingen</string>
-  <string name="cache_images_loading">Afbeeldingen laden…</string>
   <string name="cache_log_types">Log types</string>
   <string name="cache_coordinates_no">Deze cache heeft geen coördinaten.</string>
   <string name="cache_clear_history">Maak geschiedenis leeg</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index b5328c4..4ab069e 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -488,7 +488,6 @@
   <string name="cache_attributes">Atrybuty</string>
   <string name="cache_inventory">Inwentarz</string>
   <string name="cache_log_offline">Wpis offline</string>
-  <string name="cache_log_images_loading">Trwa ładowanie zdjęć z wpisu…</string>
   <string name="cache_log_images_title">Zdjęcie z wpisu</string>
   <string name="cache_log_image_default_title">Zdjęcie</string>
   <string name="cache_personal_note">Notatka osobista</string>
@@ -586,9 +585,7 @@
   <string name="cache_coordinates">Współrzędne</string>
   <string name="cache_coordinates_original">Oryginalne współrzędne</string>
   <string name="cache_spoiler_images_title">Zdjęcia spoiler</string>
-  <string name="cache_spoiler_images_loading">Ładuję zdjęcia spoiler…</string>
   <string name="cache_images_title">Zdjęcia</string>
-  <string name="cache_images_loading">Ładuję zdjęcia…</string>  
   <string name="cache_log_types">Rodzaj wpisu</string>
   <string name="cache_coordinates_no">Ta skrzynka nie ma współrzędnych GPS.</string>
   <string name="cache_clear_history">Usuń historię</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 5f67281..d6ee413 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -484,7 +484,6 @@
   <string name="cache_attributes">Atributos</string>
   <string name="cache_inventory">Inventário</string>
   <string name="cache_log_offline">Registo Offline</string>
-  <string name="cache_log_images_loading">A carregar imagem do registo…</string>
   <string name="cache_log_images_title">Imagem do registo</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Nota pessoal</string>
@@ -580,9 +579,7 @@
   <string name="cache_coordinates">Coordenadas</string>
   <string name="cache_coordinates_original">Coordenadas originais</string>
   <string name="cache_spoiler_images_title">Imagens spoiler</string>
-  <string name="cache_spoiler_images_loading">A carregar imagens spoiler…</string>
   <string name="cache_images_title">Imagens</string> 
-  <string name="cache_images_loading">A carregar as imagens…</string>
   <string name="cache_log_types">Tipos de log</string>
   <string name="cache_coordinates_no">Esta cache não tem coordenadas.</string>
   <string name="cache_clear_history">Apagar histórico</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index cef88d4..e128fb0 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -484,7 +484,6 @@
   <string name="cache_attributes">Atribúty</string>
   <string name="cache_inventory">Obsah</string>
   <string name="cache_log_offline">Offline log</string>
-  <string name="cache_log_images_loading">Načítanie obrázku z logu…</string>
   <string name="cache_log_images_title">Obrázok z logu</string>
   <string name="cache_log_image_default_title">Fotografia</string>
   <string name="cache_personal_note">Osobná poznámka</string>
@@ -579,9 +578,7 @@
   <string name="cache_coordinates">Súradnice</string>
   <string name="cache_coordinates_original">Pôvodné súradnice</string>
   <string name="cache_spoiler_images_title">Spoilerové obrázky</string>
-  <string name="cache_spoiler_images_loading">Načítanie spoilerových obrázkov…</string>
   <string name="cache_images_title">Obrázky</string>
-  <string name="cache_images_loading">Prebieha načítanie obrázkov…</string>
   <string name="cache_log_types">Typy záznamov</string>
   <string name="cache_coordinates_no">Táto skrýša nemá žiadne súradnice.</string>
   <string name="cache_clear_history">Vymazať históriu</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index d3be9ff..b68de4c 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -512,7 +512,6 @@
   <string name="cache_attributes">Attribut</string>
   <string name="cache_inventory">Innehåll</string>
   <string name="cache_log_offline">Offline logg</string>
-  <string name="cache_log_images_loading">Laddar loggbilder…</string>
   <string name="cache_log_images_title">Loggbild</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Personlig anteckning</string>
@@ -615,9 +614,7 @@
   <string name="cache_coordinates">Koordinater</string>
   <string name="cache_coordinates_original">Ursprungliga koordinater</string>
   <string name="cache_spoiler_images_title">Spoiler bilder</string>
-  <string name="cache_spoiler_images_loading">Laddar spoiler bilder…</string>
   <string name="cache_images_title">Bilder</string>
-  <string name="cache_images_loading">Laddar bilder…</string>
   <string name="cache_log_types">Loggtyper</string>
   <string name="cache_coordinates_no">Cachen saknar koordinater.</string>
   <string name="cache_clear_history">Rensa historik</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 13926c5..c539915 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -512,7 +512,6 @@
   <string name="cache_attributes">Attributes</string>
   <string name="cache_inventory">Inventory</string>
   <string name="cache_log_offline">Offline Log</string>
-  <string name="cache_log_images_loading">Loading Log images…</string>
   <string name="cache_log_images_title">Log images</string>
   <string name="cache_log_image_default_title">Photo</string>
   <string name="cache_personal_note">Personal note</string>
@@ -615,9 +614,7 @@
   <string name="cache_coordinates">Coordinates</string>
   <string name="cache_coordinates_original">Original Coordinates</string>
   <string name="cache_spoiler_images_title">Spoiler images</string>
-  <string name="cache_spoiler_images_loading">Loading spoiler images…</string>
   <string name="cache_images_title">Images</string>
-  <string name="cache_images_loading">Loading images…</string>
   <string name="cache_log_types">Log types</string>
   <string name="cache_coordinates_no">This cache has no coordinates.</string>
   <string name="cache_clear_history">Clear history</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index daeb14e..c4287ed 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -27,7 +27,6 @@ import cgeo.geocaching.ui.EditNoteDialog;
 import cgeo.geocaching.ui.EditNoteDialog.EditNoteDialogListener;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.ImagesList;
-import cgeo.geocaching.ui.ImagesList.ImageType;
 import cgeo.geocaching.ui.LoggingUI;
 import cgeo.geocaching.ui.WeakReferenceHandler;
 import cgeo.geocaching.utils.BaseUtils;
@@ -905,7 +904,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             return;
         }
         imagesList = new ImagesList(this, cache.getGeocode());
-        imagesList.loadImages(imageView, cache.getImages(), ImageType.AllImages, false);
+        imagesList.loadImages(imageView, cache.getImages(), false);
     }
 
     public static void startActivity(final Context context, final String geocode) {
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index de84af2..07ff734 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -63,7 +63,7 @@ public class ImagesActivity extends AbstractActivity {
     @Override
     public void onStart() {
         super.onStart();
-        imagesList.loadImages(findViewById(R.id.spoiler_list), imageNames, imgType, offline);
+        imagesList.loadImages(findViewById(R.id.spoiler_list), imageNames, offline);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 9464114..b2c819c 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -11,7 +11,6 @@ import cgeo.geocaching.utils.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -46,16 +45,14 @@ public class ImagesList {
     private Image currentImage;
 
     public enum ImageType {
-        LogImages(R.string.cache_log_images_title, R.string.cache_log_images_loading),
-        SpoilerImages(R.string.cache_spoiler_images_title, R.string.cache_spoiler_images_loading),
-        AllImages(R.string.cache_images_title, R.string.cache_images_loading);
+        LogImages(R.string.cache_log_images_title),
+        SpoilerImages(R.string.cache_spoiler_images_title),
+        AllImages(R.string.cache_images_title);
 
         private final int titleResId;
-        private final int loadingResId;
 
-        ImageType(final int title, final int loading) {
+        ImageType(final int title) {
             this.titleResId = title;
-            this.loadingResId = loading;
         }
 
         public int getTitle() {
@@ -64,9 +61,6 @@ public class ImagesList {
     }
 
     private LayoutInflater inflater = null;
-    private ProgressDialog progressDialog = null;
-    private int count = 0;
-    private int countDone = 0;
     private final Activity activity;
     // We could use a Set here, but we will insert no duplicates, so there is no need to check for uniqueness.
     private final Collection<Bitmap> bitmaps = new LinkedList<Bitmap>();
@@ -83,18 +77,10 @@ public class ImagesList {
         inflater = activity.getLayoutInflater();
     }
 
-    public void loadImages(final View parentView, final List<Image> images, ImageType imageType, final boolean offline) {
+    public void loadImages(final View parentView, final List<Image> images, final boolean offline) {
 
         imagesView = (LinearLayout) parentView.findViewById(R.id.spoiler_list);
 
-        count = images.size();
-        progressDialog = new ProgressDialog(activity);
-        progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-        progressDialog.setMessage(activity.getString(imageType.loadingResId));
-        progressDialog.setCancelable(true);
-        progressDialog.setMax(count);
-        progressDialog.show();
-
         for (final Image img : images) {
             LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, null);
 
@@ -154,19 +140,12 @@ public class ImagesList {
                 imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
                 imageView.setLayoutParams(new LayoutParams(bounds.width(), bounds.height()));
 
+                view.findViewById(R.id.progress_bar).setVisibility(View.GONE);
                 view.addView(imageView);
 
                 imageView.setId(image.hashCode());
                 images.put(imageView.getId(), img);
             }
-
-            synchronized (activity) {
-                countDone++;
-                progressDialog.setProgress(countDone);
-                if (progressDialog.getProgress() >= count) {
-                    progressDialog.dismiss();
-                }
-            }
         }
     }
 
-- 
cgit v1.1


From 97b10e667d2fdfd9abb56be8e5bfaee259e27f65 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 7 Apr 2013 14:45:42 +0200
Subject: fix #2640: Filter out stored caches

---
 main/res/values-de/strings.xml                   |  2 ++
 main/res/values/strings.xml                      |  2 ++
 main/src/cgeo/geocaching/filter/StateFilter.java | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+)

(limited to 'main')

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index d011ce8..aa27553 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -584,6 +584,8 @@
   <string name="cache_status_disabled">Deaktiviert</string>
   <string name="cache_status_premium">Nur für Premium-Mitglieder</string>
   <string name="cache_status_not_premium">Für alle Mitglieder</string>
+  <string name="cache_status_stored">Gespeichert</string>
+  <string name="cache_status_not_stored">Nicht gespeichert</string>
   <string name="cache_geocode">Geocode</string>
   <string name="cache_name">Name</string>
   <string name="cache_type">Typ</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index c539915..218c22b 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -596,6 +596,8 @@
   <string name="cache_status_disabled">Disabled</string>
   <string name="cache_status_premium">Premium Members only</string>
   <string name="cache_status_not_premium">All Members Access</string>
+  <string name="cache_status_stored">Stored</string>
+  <string name="cache_status_not_stored">Not stored</string>
   <string name="cache_geocode">Geo code</string>
   <string name="cache_name">Name</string>
   <string name="cache_type">Type</string>
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index ae3fac2..e18128d 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -87,6 +87,28 @@ abstract class StateFilter extends AbstractFilter {
         }
     }
 
+    static class StateStoredFilter extends StateFilter {
+        public StateStoredFilter() {
+            super(res.getString(R.string.cache_status_stored));
+        }
+
+        @Override
+        public boolean accepts(Geocache cache) {
+            return cache.isOffline();
+        }
+    }
+
+    static class StateNotStoredFilter extends StateFilter {
+        public StateNotStoredFilter() {
+            super(res.getString(R.string.cache_status_not_stored));
+        }
+
+        @Override
+        public boolean accepts(Geocache cache) {
+            return !cache.isOffline();
+        }
+    }
+
     public static class Factory implements IFilterFactory {
 
         @Override
@@ -98,6 +120,8 @@ abstract class StateFilter extends AbstractFilter {
             filters.add(new StatePremiumFilter());
             filters.add(new StateNonPremiumFilter());
             filters.add(new StateOfflineLogFilter());
+            filters.add(new StateStoredFilter());
+            filters.add(new StateNotStoredFilter());
 
             Collections.sort(filters, new Comparator<StateFilter>() {
 
-- 
cgit v1.1


From ae47c7df2d2fab20b709a85b8053908907f0eafd Mon Sep 17 00:00:00 2001
From: TriakCZ <kunc88@gmail.com>
Date: Mon, 8 Apr 2013 08:06:17 +0200
Subject: Partial revert of R3gis patch to translations

---
 main/res/values-cs/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index a93a535..d8c924a 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -90,7 +90,7 @@
   <string name="log_post">Odeslat Log</string>
   <string name="log_post_rate">Odeslat Log a hlasovat</string>
   <string name="log_post_no_rate">Odeslat Log a nehlasovat</string>
-  <string name="log_post_not_possible">Načítání stránky s Logy…</string>
+  <string name="log_post_not_possible">Načítání stránky s Logovacím formulářem…</string>
   <string name="log_add">Přidat</string>
   <string name="log_rating">Hodnocení</string>
   <string name="log_no_rating">Bez hodnocení</string>
@@ -323,7 +323,7 @@
   <string name="caches_filter_track">Se sledovatelnými předměty</string>
   <string name="caches_filter_clear">Vymazat filtry</string>
   <string name="caches_filter_modified">S upravenými souřadnicemi</string>
-  <string name="caches_filter_origin">Originální</string>
+  <string name="caches_filter_origin">Původ keše</string>
   <string name="caches_removing_from_history">Čištění Historie…</string>
   <string name="caches_clear_offlinelogs">Smazat offline Logy</string>
   <string name="caches_clear_offlinelogs_progress">Mazání offline logů</string>
@@ -552,7 +552,7 @@
   <string name="cache_dialog_loading_details_status_gcvote">Načítání GCVote</string>
   <string name="cache_dialog_loading_details_status_elevation">Načítání údajů o nadmořské výšce</string>
   <string name="cache_dialog_loading_details_status_cache">Ukládání do mezipaměti</string>
-  <string name="cache_dialog_loading_details_status_render">Renderování zobrazení</string>
+  <string name="cache_dialog_loading_details_status_render">Vykreslování pohledu</string>
   <string name="cache_dialog_offline_save_title">Offline</string>
   <string name="cache_dialog_offline_save_message">Ukládání keše pro offline použití…</string>
   <string name="cache_dialog_offline_drop_title">Offline</string>
-- 
cgit v1.1


From bc0fc04b30412aff6804e48063d9eccb068e84bd Mon Sep 17 00:00:00 2001
From: triakcz <kunc88@gmail.com>
Date: Wed, 10 Apr 2013 00:40:18 +0200
Subject: Removed translation of distance units

---
 main/res/values-cs/strings.xml               | 7 -------
 main/res/values-de/strings.xml               | 7 -------
 main/res/values-fr/strings.xml               | 7 -------
 main/res/values-hu/strings.xml               | 7 -------
 main/res/values-it/strings.xml               | 7 -------
 main/res/values-ja/strings.xml               | 7 -------
 main/res/values-nl/strings.xml               | 7 -------
 main/res/values-pl/strings.xml               | 7 -------
 main/res/values-sk/strings.xml               | 7 -------
 main/res/values/strings.xml                  | 7 -------
 main/res/values/strings_not_translatable.xml | 9 ++++++++-
 11 files changed, 8 insertions(+), 71 deletions(-)

(limited to 'main')

diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index d8c924a..58e28ac 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -716,13 +716,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Prostý</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m (Metry)</string>
-  <string name="unit_km">km (Kilometry)</string>
-  <string name="unit_ft">ft (Stopy)</string>
-  <string name="unit_yd">yd (Yardy)</string>
-  <string name="unit_mi">mi (Míle)</string>
-
   <!-- visit -->
   <string name="visit_tweet">Oznámit nález na Twitteru</string>
 
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index aa27553..048991b 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -703,13 +703,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Schlicht</string>
 
-<!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">Diesen Eintrag auf Twitter veröffentlichen</string>
 
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 1fe3e20..f7a6fde 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -714,13 +714,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Texte</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">Publier votre découverte sur Twitter</string>
 
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index dd8dfb9..353aa10 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -658,13 +658,6 @@
   <string name="search_history_cleared">Előzmények törölve</string>
 
   <string name="waypoint_coordinate_formats_plain">Egyszerű</string>
-  
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
 
   <!-- visit -->
   <string name="visit_tweet">Twitteld ki ezt a megtalálást</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 0205a19..b070b10 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -680,13 +680,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Plain</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">piedi</string>
-  <string name="unit_yd">iarde</string>
-  <string name="unit_mi">miglia</string>
-
   <!-- visit -->
   <string name="visit_tweet">Segnala questo ritrovamento su Twitter</string>
 
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 926122f..27ffbd3 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -692,13 +692,6 @@
 
   <string name="waypoint_coordinate_formats_plain">プレーン</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">この発見をTwitterでつぶやく</string>
 
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 322bb0b..557aa79 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -698,13 +698,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Vlak</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">Post deze vondst op Twitter</string>
 
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 4ab069e..b3a5032 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -681,13 +681,6 @@
 
   <string name="waypoint_coordinate_formats_plain">zwykłe</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">stopy</string>
-  <string name="unit_yd">jardy</string>
-  <string name="unit_mi">mile</string>
-
   <!-- visit -->
   <string name="visit_tweet">Wyślij informację do Twitter</string>
 
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index e128fb0..ef316ea 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -662,13 +662,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Iba text</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">informovať o nájdení na Twitteri</string>
 
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 218c22b..d35a982 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -716,13 +716,6 @@
 
   <string name="waypoint_coordinate_formats_plain">Plain</string>
 
-  <!-- distance units -->
-  <string name="unit_m">m</string>
-  <string name="unit_km">km</string>
-  <string name="unit_ft">ft</string>
-  <string name="unit_yd">yd</string>
-  <string name="unit_mi">mi</string>
-
   <!-- visit -->
   <string name="visit_tweet">Post this find to Twitter</string>
 
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index 8de1483..b392d73 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -8,7 +8,14 @@
   </string-array>
   
   <!-- distance units -->
-  <string-array name="distance_units">
+  <string name="unit_m" translatable="false">m</string>
+  <string name="unit_km" translatable="false">km</string>
+  <string name="unit_ft" translatable="false">ft</string>
+  <string name="unit_yd" translatable="false">yd</string>
+  <string name="unit_mi" translatable="false">mi</string>
+  
+  <!-- distance units -->
+  <string-array name="distance_units" translatable="false">
     <item>@string/unit_m</item>
     <item>@string/unit_km</item>
     <item>@string/unit_ft</item>
-- 
cgit v1.1


From 154fb6457c4ba05b99a8cf97afe9a5f3c1937cc1 Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Wed, 10 Apr 2013 20:55:19 +0200
Subject: fixes #2651 - exclude inaccessable dirs from choice

---
 main/src/cgeo/geocaching/files/SimpleDirChooser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 7520e2e..844287c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -238,7 +238,7 @@ public class SimpleDirChooser extends ListActivity {
         @Override
         public boolean accept(File dir, String filename) {
             File file = new File(dir, filename);
-            return file.isDirectory();
+            return file.isDirectory() && file.canWrite();
         }
 
     }
-- 
cgit v1.1


From 9945bf9dc036d52718e26b316621ee88eeabef04 Mon Sep 17 00:00:00 2001
From: RomNexus6 <romano.signorelli@gmail.com>
Date: Thu, 11 Apr 2013 14:28:20 +0300
Subject: updated translation-it to feb-24

---
 main/res/values-it/strings.xml | 91 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 12 deletions(-)

(limited to 'main')

diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index b070b10..c0c2ce5 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -85,6 +85,7 @@
   <string name="log_tb_changeall">Cambia tutto</string>
   <string name="log_save">Salva</string>
   <string name="log_saving">Invio log…</string>
+  <string name="log_saving_and_uploading">Invio log e immagine…</string> 
   <string name="log_clear">Azzera</string>
   <string name="log_post">Invia log</string>
   <string name="log_post_rate">Invia log + voto</string>
@@ -118,6 +119,13 @@
   <string name="log_today">Oggi</string>
   <string name="log_yesterday">Ieri</string>
   <string name="log_smilies">Smile</string>
+  <string name="log_image">Immagine</string>
+  <string name="log_image_attach">Aggiungi immagine</string>
+  <string name="log_image_edit">Modifica immagine</string>
+  <string name="log_image_stored">Esistente</string>
+  <string name="log_image_camera">Nuova</string>
+  <string name="log_image_caption">Didascalia</string>
+  <string name="log_image_description">Descrizione</string> 
 
   <!-- translation -->
   <string name="translate_to_sys_lang">Traduci in %s</string>
@@ -167,6 +175,8 @@
   <string name="err_missing_device_name">Per cortesia inserire il nome del dispositivo prima di registrarsi.</string>
   
   <string name="err_favorite_failed">Errore nella modifica dello stato preferiti.</string>
+  <string name="err_select_logimage_failed">La selezione dell\'immagine per il log è fallita.</string>
+  <string name="err_aquire_image_failed">Acquisizione immagine fallita.</string> 
 
   <string name="err_tb_display">c:geo non riesce a visualizzare il trackable che vuoi. È veramente un trackable?</string>
   <string name="err_tb_details_open">c:geo non riesce ad aprire i dettagli del trackable.</string>
@@ -189,6 +199,7 @@
   <string name="err_log_load_data_still">c:geo sta ancora caricando i dati necessari per salvare il log. Per cortesia attendere ancora un pochino.</string>
   <string name="err_log_failed_server">c:geo non è riuscito ad inviare il log perché il server non risponde.</string>
   <string name="err_log_post_failed">Sembra che il log non sia stato inviato. Prego verificare su Geocaching.com.</string>
+  <string name="err_logimage_post_failed">Sembra la l\'immagine non sia stata caricata. Si prega di controllare su Geocaching.com.</string>
 
   <string name="err_search_address_forgot">c:geo ha dimenticato l\'indirizzo che vuoi trovare.</string>
   <string name="err_parse_lat">c:geo non riesce ad interpretare la latitudine.</string>
@@ -218,6 +229,8 @@
   <string name="info_log_saved">c:geo ha salvato il log.</string>
   <string name="info_log_cleared">Il log è stato azzerato.</string>
   <string name="info_log_type_changed">Il tipo di log è cambiato!</string>
+  <string name="info_select_logimage_cancelled">Selezione o cattura immagine annnulata.</string>
+  <string name="info_stored_image">Nuova immagine salvata su:</string> 
 
   <string name="info_storing_static_maps">Tento di salvare la static map</string>
 
@@ -307,6 +320,7 @@
   <string name="caches_filter_track">Con oggetti trackables</string>
   <string name="caches_filter_clear">Rimuovi filtri</string>
   <string name="caches_filter_modified">Con coordinate modificate</string>
+  <string name="caches_filter_origin">Origine</string> 
   <string name="caches_removing_from_history">Rimozione dalla cronologia…</string>
 
   <!-- caches lists -->
@@ -387,6 +401,7 @@
   <string name="init_save_log_img">Salva immagini contenute nei log</string>
   <string name="init_units">Usa miglia/piedi</string>
   <string name="init_log_offline">Quando salvi log, fallo sempre offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string>
+  <string name="init_choose_list">Ask for list when storing caches</string> 
   <string name="init_livelist">Visualizza in che direzione sono i cache, nelle liste</string>
   <string name="init_altitude">Correzione di altitudine</string>
   <string name="init_altitude_description">Se il GPS restituisce un\'errata altitudine, puoi correggerla inserendo un valore positivo o negativo, in metri.</string>
@@ -498,6 +513,9 @@
   <string name="cache_favpoint_not_on">Questo cache non è uno dei tuoi favoriti.</string>
   <string name="cache_favpoint_add">Aggiungi</string>
   <string name="cache_favpoint_remove">Rimuovi</string>
+  <string name="cache_list_text">Lista:</string>
+  <string name="cache_list_change">Sposta</string>
+  <string name="cache_list_unknown">Non in una lista</string>
   <string name="cache_images">Immagini</string>
   
   <string name="cache_waypoints">Waypoints</string>
@@ -653,6 +671,7 @@
   <string name="waypoint_edit_title">Modifica waypoint</string>
   <string name="waypoint_add_title">Aggiungi waypoint</string>
   <string name="waypoint_note">Note</string>
+  <string name="waypoint_visited">Visitato</string> 
   <string name="waypoint_save">Salva</string>
   <string name="waypoint_loading">Caricamento waypoint…</string>
   <string name="waypoint_do_not_touch_cache_coordinates">Nessuna modifica alle coordinate cache</string>
@@ -813,10 +832,7 @@
   <string name="export_gpx_info">Il file GPX sarà esportato in %1$s con data ed ora correnti come nome file.</string>
   <string name="export_gpx_to">Invia il GPX esportato a</string>
 
-<!--  attribute unknown -->
-  <string name="attribute_unknown_yes">(attributo sconosciuto) permesso</string>
-  <string name="attribute_unknown_no">(attributo sconosciuto) non permesso</string>
-  <!--  attributes (permissions -> allowed, not allowed) -->
+  <!-- GC attributes --> 
   <string name="attribute_dogs_yes">Cani permessi</string>
   <string name="attribute_dogs_no">Cani NON permessi</string>
   <string name="attribute_bicycles_yes">Biciclette permesse</string>
@@ -835,8 +851,6 @@
   <string name="attribute_campfires_no">Fuochi da campo NON permessi</string>
   <string name="attribute_rv_yes">Camper/roulotte permessi</string>
   <string name="attribute_rv_no">Camper/roulotte NON permessi</string>
-
-  <!--  attributes (conditions -> yes, no) -->
   <string name="attribute_kids_yes">Raccomandato per bambini</string>
   <string name="attribute_kids_no">Non raccomandato per bambini</string>
   <string name="attribute_onehour_yes">Richiede meno di un\'ora</string>
@@ -889,8 +903,6 @@
   <string name="attribute_landf_no">Non è un tour \"Lost and found\"</string>
   <string name="attribute_partnership_yes">Cache di gruppo</string>
   <string name="attribute_partnership_no">Cache non di gruppo</string>
-
-  <!--  attributes (equipment -> required, not required) -->
   <string name="attribute_fee_yes">Accesso o parcheggio a pagamento</string>
   <string name="attribute_fee_no">Accesso o parcheggio non a pagamento</string>
   <string name="attribute_rappelling_yes">Richiesta attrezzatura da arrampicata</string>
@@ -913,8 +925,6 @@
   <string name="attribute_wirelessbeacon_no">Segnalatore radio non necessario</string>
   <string name="attribute_treeclimbing_yes">Richiede di salire su un albero</string>
   <string name="attribute_treeclimbing_no">Non richiede di salire su un albero</string>
-
-  <!--  attributes (hazards -> present, not present) -->
   <string name="attribute_poisonoak_yes">Piante velenose</string>
   <string name="attribute_poisonoak_no">Piante non velenose</string>
   <string name="attribute_dangerousanimals_yes">Animali pericolosi</string>
@@ -931,8 +941,6 @@
   <string name="attribute_danger_no">Area non pericolosa</string>
   <string name="attribute_thorn_yes">Rovi</string>
   <string name="attribute_thorn_no">Senza rovi</string>
-
-  <!--  attributes (facilities -> yes, no) -->
   <string name="attribute_wheelchair_yes">Accessibile con sedia a rotelle</string>
   <string name="attribute_wheelchair_no">Non accessibile con sedia a rotelle</string>
   <string name="attribute_parking_yes">Parcheggio</string>
@@ -955,6 +963,65 @@
   <string name="attribute_fuel_no">Lontano da pompa carburante</string>
   <string name="attribute_food_yes">Vicino a punto ristoro</string>
   <string name="attribute_food_no">Lontano da punti ristoro</string>
+  
+  <string name="attribute_oc_only_yes">Loggabile solo su Opencaching</string>
+  <string name="attribute_oc_only_no">Loggabile non solo su Opencaching</string>
+  <string name="attribute_link_only_yes">Hyperlink solo verso un altro portale di cache</string>
+  <string name="attribute_link_only_no">Non solo hyperlink ad un altro portale di cache</string>
+  <string name="attribute_letterbox_yes">Lettera (richiede francobollo)</string>
+  <string name="attribute_letterbox_no">No lettera (non richiede francobollo)</string>
+  <string name="attribute_railway_yes">Ferrovia attiva nelle vicinanze</string>
+  <string name="attribute_railway_no">Nessuna ferrovia nelle vicinanze</string>
+  <string name="attribute_syringe_yes">Pronto soccorso disponibile</string>
+  <string name="attribute_syringe_no">Pronto soccorso non disponibile</string>
+  <string name="attribute_swamp_yes">Paludoso</string>
+  <string name="attribute_swamp_no">Non paludoso</string>
+  <string name="attribute_hills_yes">Area collinare</string>
+  <string name="attribute_hills_no">Area non collinare</string>
+  <string name="attribute_poi_yes">Punto di interesse</string>
+  <string name="attribute_poi_no">Nessun punto di interesse</string>
+  <string name="attribute_moving_target_yes">Obiettivo in movimento</string>
+  <string name="attribute_moving_target_no">Obiettivo non in movimento</string>
+  <string name="attribute_webcam_yes">Webcam</string>
+  <string name="attribute_webcam_no">No webcam</string>
+  <string name="attribute_inside_yes">Con aree interne (cave, edifici etc.)</string>
+  <string name="attribute_inside_no">Senza aree interne</string>
+  <string name="attribute_in_water_yes">In acqua</string>
+  <string name="attribute_in_water_no">Non in acqua</string>
+  <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola...)</string>
+  <string name="attribute_no_gps_no">Con GPS</string>
+  <string name="attribute_overnight_yes">Necessario permanere di notte</string>
+  <string name="attribute_overnight_no">Permanenza notturna non necessaria</string>
+  <string name="attribute_specific_times_yes">Disponibile solo in certi orari</string>
+  <string name="attribute_specific_times_no">Disponibile a tutte le ore</string>
+  <string name="attribute_day_yes">Solo di giorno</string>
+  <string name="attribute_day_no">Non solo di giorno</string>
+  <string name="attribute_tide_yes">Marea</string>
+  <string name="attribute_tide_no">Senza marea</string>
+  <string name="attribute_all_seasons_yes">Tutte le stagioni</string>
+  <string name="attribute_all_seasons_no">Non in tutte le stagioni</string>
+  <string name="attribute_breeding_yes">Stagione di riproduzione / natura protetta</string>
+  <string name="attribute_breeding_no">Disponibile anche in stagione di riproduzione / natura protetta</string>
+  <string name="attribute_snow_proof_yes">Nascondiglio a prova di neve</string>
+  <string name="attribute_snow_proof_no">Nascondiglio non a prova di neve</string>
+  <string name="attribute_compass_yes">Bussola</string>
+  <string name="attribute_compass_no">Senza bussola</string>
+  <string name="attribute_cave_yes">Equipaggiamento da caverna</string>
+  <string name="attribute_cave_no">Senza equipaggiamento da caverna</string>
+  <string name="attribute_aircraft_yes">Aircraft</string>
+  <string name="attribute_aircraft_no">Senza aircraft</string>
+  <string name="attribute_investigation_yes">Investigazione</string>
+  <string name="attribute_investigation_no">Senza investigazione</string>
+  <string name="attribute_puzzle_yes">Puzzle / Mystery</string>
+  <string name="attribute_puzzle_no">No puzzle / mystery</string>
+  <string name="attribute_arithmetic_yes">Problema aritmetico</string>
+  <string name="attribute_arithmetic_no">Problema non aritmetico</string>
+  <string name="attribute_other_cache_yes">Cache di altro tipo</string>
+  <string name="attribute_other_cache_no">Cache non di altro tipo</string>
+  <string name="attribute_ask_owner_yes">Chiedere al proprietario per le condizioni di partenza</string>
+  <string name="attribute_ask_owner_no">Non chiedere al proprietario per le condizioni di partenza</string>
+  <string name="attribute_unknown_yes">Attributo sconosciuto</string>
+  <string name="attribute_unknown_no">Senza attributo sconosciuto</string> 
 
   <!-- next things -->
   <string name="legal_note">Per usare i servizi di Geocaching.com, si applicano i termini e le condizioni del <a href="http://www.geocaching.com/about/termsofuse.aspx">Contratto Groundspeak</a> che deve essere approvato dall\'utente.</string>
-- 
cgit v1.1


From 4f2242cdb76a1539b2d27eee3e17429990e3f14f Mon Sep 17 00:00:00 2001
From: RomNexus6 <romano.signorelli@gmail.com>
Date: Thu, 11 Apr 2013 13:18:19 +0300
Subject: cherry-picked PR from RomNexus6 patch-38

---
 main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index c0c2ce5..7d57aac 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -401,7 +401,7 @@
   <string name="init_save_log_img">Salva immagini contenute nei log</string>
   <string name="init_units">Usa miglia/piedi</string>
   <string name="init_log_offline">Quando salvi log, fallo sempre offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string>
-  <string name="init_choose_list">Ask for list when storing caches</string> 
+  <string name="init_choose_list">Chiedi la lista quando salvi un cache</string>  
   <string name="init_livelist">Visualizza in che direzione sono i cache, nelle liste</string>
   <string name="init_altitude">Correzione di altitudine</string>
   <string name="init_altitude_description">Se il GPS restituisce un\'errata altitudine, puoi correggerla inserendo un valore positivo o negativo, in metri.</string>
-- 
cgit v1.1


From 922244640b0d10e90c256660e3ccfb20df067005 Mon Sep 17 00:00:00 2001
From: RomNexus6 <romano.signorelli@gmail.com>
Date: Thu, 18 Apr 2013 16:21:46 +0300
Subject: updated translation-it

---
 main/res/values-it/strings.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 7d57aac..98a3f9c 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -306,7 +306,7 @@
   <string name="caches_refresh_selected">Aggiorna i cache selezionati</string>
   <string name="caches_refresh_all">Aggiorna tutti</string>
   <string name="caches_move_selected">Muovi i cache selezionati</string>
-  <string name="caches_move_all">Muovi tutte</string>
+  <string name="caches_move_all">Muovi tutti</string>
   <string name="caches_map_locus">Locus</string>
   <string name="caches_map_locus_export">Esporta in Locus</string>
   <string name="caches_recaptcha_title">reCAPTCHA</string>
@@ -322,6 +322,8 @@
   <string name="caches_filter_modified">Con coordinate modificate</string>
   <string name="caches_filter_origin">Origine</string> 
   <string name="caches_removing_from_history">Rimozione dalla cronologia…</string>
+  <string name="caches_clear_offlinelogs">Cancella i log offline</string>
+	<string name="caches_clear_offlinelogs_progress">Cancellazione logs offline</string>
 
   <!-- caches lists -->
   <string name="list_menu">Lista</string>
@@ -354,6 +356,7 @@
 
   <!-- init -->
   <string name="init_geocaching">Geocaching.com</string>
+  <string name="init_gc_activate">Attiva Geocaching.com su mappa live e nelle ricerche</string>
   <string name="init_oc">opencaching.de</string>
   <string name="init_oc_activate">Attiva opencaching.de su mappa live e nelle ricerche</string>
   <string name="init_oc_username_description">Inserisci il tuo utente opencaching.de per marcare i tuoi ritrovamenti.</string>
@@ -400,7 +403,7 @@
   <string name="init_offline_wp">Salva i waypoints delle mappe per uso offline</string>
   <string name="init_save_log_img">Salva immagini contenute nei log</string>
   <string name="init_units">Usa miglia/piedi</string>
-  <string name="init_log_offline">Quando salvi log, fallo sempre offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string>
+  <string name="init_log_offline">Attiva log offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string>
   <string name="init_choose_list">Chiedi la lista quando salvi un cache</string>  
   <string name="init_livelist">Visualizza in che direzione sono i cache, nelle liste</string>
   <string name="init_altitude">Correzione di altitudine</string>
@@ -452,6 +455,12 @@
   <string name="init_plain_logs">Visualizza i LOG senza colori</string>
   <string name="init_use_native_ua">Identifica come browser Android. Risolve alcuni problemi di login con alcuni provider di rete.</string>
   <string name="init_rendertheme_folder">Cartella per i temi mappa personali off-line</string>
+  <!-- map sources -->
+	<string name="map_source_google_map">Google: Map</string>
+	<string name="map_source_google_satellite">Google: Satellite</string>
+	<string name="map_source_osm_mapnik">OSM: Mapnik</string>
+	<string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+	<string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Send to c:geo</string>
   <string name="init_sendToCgeo_name">Nome dispositivo:</string>
-- 
cgit v1.1


From b71d4bd03f8da774881d119c3ab55e16dc27f4d1 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 20 Apr 2013 10:35:24 +0200
Subject: fix #2664: List sorting does not respect locale

---
 main/src/cgeo/geocaching/StoredList.java | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/StoredList.java b/main/src/cgeo/geocaching/StoredList.java
index 5a6f132..778c112 100644
--- a/main/src/cgeo/geocaching/StoredList.java
+++ b/main/src/cgeo/geocaching/StoredList.java
@@ -12,7 +12,10 @@ import android.content.res.Resources;
 import android.view.View;
 import android.widget.EditText;
 
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class StoredList {
@@ -69,7 +72,7 @@ public class StoredList {
         }
 
         public void promptForListSelection(final int titleId, final RunnableWithArgument<Integer> runAfterwards, final boolean onlyMoveTargets, final int exceptListId) {
-            final List<StoredList> lists = cgData.getLists();
+            final List<StoredList> lists = getSortedLists();
 
             if (lists == null) {
                 return;
@@ -115,6 +118,19 @@ public class StoredList {
             builder.create().show();
         }
 
+        private static List<StoredList> getSortedLists() {
+            final Collator collator = Collator.getInstance();
+            final List<StoredList> lists = cgData.getLists();
+            Collections.sort(lists, new Comparator<StoredList>() {
+
+                @Override
+                public int compare(StoredList lhs, StoredList rhs) {
+                    return collator.compare(lhs.getTitle(), rhs.getTitle());
+                }
+            });
+            return lists;
+        }
+
         public void promptForListCreation(final RunnableWithArgument<Integer> runAfterwards) {
             handleListNameInput("", R.string.list_dialog_create_title, R.string.list_dialog_create, new RunnableWithArgument<String>() {
 
@@ -176,4 +192,13 @@ public class StoredList {
             });
         }
     }
+
+    /**
+     * Get the list title. This method is not public by intention to make clients use the {@link UserInterface} class.
+     *
+     * @return
+     */
+    protected String getTitle() {
+        return title;
+    }
 }
-- 
cgit v1.1


From 705dc21ac799f786e6c7b76f9588ff22aa25a05f Mon Sep 17 00:00:00 2001
From: donEgro <egermajer.martin@gmail.com>
Date: Sat, 20 Apr 2013 22:13:29 +0200
Subject: Fixed Issue #708 - Refresh caches + no internet = normal progress.

---
 main/src/cgeo/geocaching/cgeocaches.java      |  5 +++++
 main/src/cgeo/geocaching/network/Network.java | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 61a32f1..8fc61d4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1082,6 +1082,11 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
 
+        if (!Network.isNetworkConnected(getApplicationContext())) {
+            showToast(getString(R.string.err_server));
+            return;
+        }
+
         if (Settings.getChooseList() && type != CacheListType.OFFLINE) {
             // let user select list to store cache in
             new StoredList.UserInterface(this).promptForListSelection(R.string.list_title,
diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index eb6a6ac..5a8cbb2 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -40,6 +40,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 
 import java.io.File;
@@ -471,4 +474,19 @@ public abstract class Network {
         return null;
     }
 
+    /**
+     * Checks if the device has network connection.
+     * 
+     * @param context
+     *            context of the application, cannot be null
+     * 
+     * @return <code>true</code> if the device is connected to the network.
+     */
+    public static boolean isNetworkConnected(Context context) {
+        ConnectivityManager conMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetwork = conMan.getActiveNetworkInfo();
+
+        return activeNetwork != null && activeNetwork.isConnected();
+    }
+
 }
-- 
cgit v1.1


From fceb3c05fd6ca7108b536ec2b9b0ab9e50cfba1e Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 22 Apr 2013 08:26:06 +0200
Subject: fix #2671: Don't show short description, if same as long description

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 78 +++++++++++++++--------
 1 file changed, 51 insertions(+), 27 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index c4287ed..9a13f91 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1752,8 +1752,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
             // cache short description
             if (StringUtils.isNotBlank(cache.getShortDescription())) {
-                new LoadDescriptionTask().execute(cache.getShortDescription(), view.findViewById(R.id.shortdesc), null);
-                registerForContextMenu(view.findViewById(R.id.shortdesc));
+                new LoadDescriptionTask(cache.getShortDescription(), view.findViewById(R.id.shortdesc), null, null).execute();
             }
 
             // long description
@@ -1858,14 +1857,15 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             } else {
                 personalNoteView.setVisibility(View.GONE);
             }
-        }private void loadLongDescription() {
+        }
+
+        private void loadLongDescription() {
             Button showDesc = (Button) view.findViewById(R.id.show_description);
             showDesc.setVisibility(View.GONE);
             showDesc.setOnClickListener(null);
             view.findViewById(R.id.loading).setVisibility(View.VISIBLE);
 
-            new LoadDescriptionTask().execute(cache.getDescription(), view.findViewById(R.id.longdesc), view.findViewById(R.id.loading));
-            registerForContextMenu(view.findViewById(R.id.longdesc));
+            new LoadDescriptionTask(cache.getDescription(), view.findViewById(R.id.longdesc), view.findViewById(R.id.loading), view.findViewById(R.id.shortdesc)).execute();
         }
 
     }
@@ -1901,28 +1901,33 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
      * </ol>
      */
     private class LoadDescriptionTask extends AsyncTask<Object, Void, Void> {
-        private View loadingIndicatorView;
-        private TextView descriptionView;
-        private String descriptionString;
+        private final View loadingIndicatorView;
+        private final TextView descriptionView;
+        private final String descriptionString;
         private Spanned description;
+        private final View shortDescView;
 
+        public LoadDescriptionTask(final String description, final View descriptionView, final View loadingIndicatorView, final View shortDescView) {
+            this.descriptionString = description;
+            this.descriptionView = (TextView) descriptionView;
+            this.loadingIndicatorView = loadingIndicatorView;
+            this.shortDescView = shortDescView;
+        }
 
         @Override
         protected Void doInBackground(Object... params) {
             try {
-                descriptionString = ((String) params[0]);
-                descriptionView = (TextView) params[1];
-                loadingIndicatorView = (View) params[2];
-
                 // Fast preview: parse only HTML without loading any images
                 HtmlImageCounter imageCounter = new HtmlImageCounter();
                 final UnknownTagsHandler unknownTagsHandler = new UnknownTagsHandler();
                 description = Html.fromHtml(descriptionString, imageCounter, unknownTagsHandler);
                 publishProgress();
+
+                boolean needsRefresh = false;
                 if (imageCounter.getImageCount() > 0) {
                     // Complete view: parse again with loading images - if necessary ! If there are any images causing problems the user can see at least the preview
                     description = Html.fromHtml(descriptionString, new HtmlImage(cache.getGeocode(), true, cache.getListId(), false), unknownTagsHandler);
-                    publishProgress();
+                    needsRefresh = true;
                 }
 
                 // If description has an HTML construct which may be problematic to render, add a note at the end of the long description.
@@ -1934,6 +1939,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     final Spanned tableNote = Html.fromHtml(res.getString(R.string.cache_description_table_note, "<a href=\"" + cache.getUrl() + "\">" + connector.getName() + "</a>"));
                     ((Editable) description).append("\n\n").append(tableNote);
                     ((Editable) description).setSpan(new StyleSpan(Typeface.ITALIC), startPos, description.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    needsRefresh = true;
+                }
+
+                if (needsRefresh) {
                     publishProgress();
                 }
             } catch (Exception e) {
@@ -1942,25 +1951,40 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             return null;
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see android.os.AsyncTask#onProgressUpdate(Progress[])
-         */
         @Override
         protected void onProgressUpdate(Void... values) {
-            if (description != null) {
-                if (StringUtils.isNotBlank(descriptionString)) {
-                    descriptionView.setText(description, TextView.BufferType.SPANNABLE);
-                    descriptionView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
-                    fixBlackTextColor(descriptionView, descriptionString);
-                }
-
-                descriptionView.setVisibility(View.VISIBLE);
-            } else {
+            if (description == null) {
                 showToast(res.getString(R.string.err_load_descr_failed));
+                return;
             }
+            if (StringUtils.isNotBlank(descriptionString)) {
+                descriptionView.setText(description, TextView.BufferType.SPANNABLE);
+                descriptionView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+                fixBlackTextColor(descriptionView, descriptionString);
+                descriptionView.setVisibility(View.VISIBLE);
+                registerForContextMenu(descriptionView);
 
+                hideDuplicatedShortDescription();
+            }
+        }
+
+        /**
+         * Hide the short description, if it is contained somewhere at the start of the long description.
+         */
+        private void hideDuplicatedShortDescription() {
+            if (shortDescView != null) {
+                final String shortDescription = cache.getShortDescription();
+                if (StringUtils.isNotBlank(shortDescription)) {
+                    int index = descriptionString.indexOf(shortDescription);
+                    if (index >= 0 && index < 200) {
+                        shortDescView.setVisibility(View.GONE);
+                    }
+                }
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
             if (null != loadingIndicatorView) {
                 loadingIndicatorView.setVisibility(View.GONE);
             }
-- 
cgit v1.1


From 9dac2f6bb2bf6849ec74a3438b17e1c85e1b01a8 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 22 Apr 2013 08:35:53 +0200
Subject: refactoring: move third party code into new source path

* makes it more easy to ignore warnings in third party code
---
 main/.classpath                                    |   5 +
 .../support/v4/app/FragmentListActivity.java       | 316 ---------
 main/src/cgeo/org/kxml2/io/KXmlSerializer.java     | 605 ----------------
 main/src/com/viewpagerindicator/PageIndicator.java |  63 --
 .../com/viewpagerindicator/TitlePageIndicator.java | 771 ---------------------
 main/src/com/viewpagerindicator/TitleProvider.java |  28 -
 .../app/appmanualclient/AppManualReaderClient.java | 375 ----------
 .../openintents/intents/FileManagerIntents.java    | 127 ----
 .../support/v4/app/FragmentListActivity.java       | 316 +++++++++
 .../cgeo/org/kxml2/io/KXmlSerializer.java          | 605 ++++++++++++++++
 .../com/viewpagerindicator/PageIndicator.java      |  63 ++
 .../com/viewpagerindicator/TitlePageIndicator.java | 771 +++++++++++++++++++++
 .../com/viewpagerindicator/TitleProvider.java      |  28 +
 .../app/appmanualclient/AppManualReaderClient.java | 375 ++++++++++
 .../openintents/intents/FileManagerIntents.java    | 127 ++++
 15 files changed, 2290 insertions(+), 2285 deletions(-)
 delete mode 100644 main/src/android/support/v4/app/FragmentListActivity.java
 delete mode 100644 main/src/cgeo/org/kxml2/io/KXmlSerializer.java
 delete mode 100644 main/src/com/viewpagerindicator/PageIndicator.java
 delete mode 100644 main/src/com/viewpagerindicator/TitlePageIndicator.java
 delete mode 100644 main/src/com/viewpagerindicator/TitleProvider.java
 delete mode 100644 main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
 delete mode 100644 main/src/org/openintents/intents/FileManagerIntents.java
 create mode 100644 main/thirdparty/android/support/v4/app/FragmentListActivity.java
 create mode 100644 main/thirdparty/cgeo/org/kxml2/io/KXmlSerializer.java
 create mode 100644 main/thirdparty/com/viewpagerindicator/PageIndicator.java
 create mode 100644 main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java
 create mode 100644 main/thirdparty/com/viewpagerindicator/TitleProvider.java
 create mode 100644 main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
 create mode 100644 main/thirdparty/org/openintents/intents/FileManagerIntents.java

(limited to 'main')

diff --git a/main/.classpath b/main/.classpath
index 79a19e9..2905a42 100644
--- a/main/.classpath
+++ b/main/.classpath
@@ -6,6 +6,11 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="thirdparty">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="libs/commons-lang3-3.1.jar"/>
 	<classpathentry kind="lib" path="libs/locus-api-4.0.jar"/>
 	<classpathentry kind="lib" path="libs/commons-collections-3.2.1.jar"/>
diff --git a/main/src/android/support/v4/app/FragmentListActivity.java b/main/src/android/support/v4/app/FragmentListActivity.java
deleted file mode 100644
index e3ed42c..0000000
--- a/main/src/android/support/v4/app/FragmentListActivity.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v4.app;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-/**
- * An activity that displays a list of items by binding to a data source such as
- * an array or Cursor, and exposes event handlers when the user selects an item.
- * <p>
- * FragmentListActivity hosts a {@link android.widget.ListView ListView} object that can
- * be bound to different data sources, typically either an array or a Cursor
- * holding query results. Binding, screen layout, and row layout are discussed
- * in the following sections.
- * <p>
- * <strong>Screen Layout</strong>
- * </p>
- * <p>
- * FragmentListActivity has a default layout that consists of a single, full-screen list
- * in the center of the screen. However, if you desire, you can customize the
- * screen layout by setting your own view layout with setContentView() in
- * onCreate(). To do this, your own view MUST contain a ListView object with the
- * id "@android:id/list" (or {@link android.R.id#list} if it's in code)
- * <p>
- * Optionally, your custom view can contain another view object of any type to
- * display when the list view is empty. This "empty list" notifier must have an
- * id "android:empty". Note that when an empty view is present, the list view
- * will be hidden when there is no data to display.
- * <p>
- * The following code demonstrates an (ugly) custom screen layout. It has a list
- * with a green background, and an alternate red "no data" message.
- * </p>
- * 
- * <pre>
- * &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
- * &lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- *         android:orientation=&quot;vertical&quot;
- *         android:layout_width=&quot;fill_parent&quot; 
- *         android:layout_height=&quot;fill_parent&quot;
- *         android:paddingLeft=&quot;8dp&quot;
- *         android:paddingRight=&quot;8dp&quot;&gt;
- * 
- *     &lt;ListView android:id=&quot;@id/android:list&quot;
- *               android:layout_width=&quot;fill_parent&quot; 
- *               android:layout_height=&quot;fill_parent&quot;
- *               android:background=&quot;#00FF00&quot;
- *               android:layout_weight=&quot;1&quot;
- *               android:drawSelectorOnTop=&quot;false&quot;/&gt;
- * 
- *     &lt;TextView android:id=&quot;@id/android:empty&quot;
- *               android:layout_width=&quot;fill_parent&quot; 
- *               android:layout_height=&quot;fill_parent&quot;
- *               android:background=&quot;#FF0000&quot;
- *               android:text=&quot;No data&quot;/&gt;
- * &lt;/LinearLayout&gt;
- * </pre>
- * 
- * <p>
- * <strong>Row Layout</strong>
- * </p>
- * <p>
- * You can specify the layout of individual rows in the list. You do this by
- * specifying a layout resource in the ListAdapter object hosted by the activity
- * (the ListAdapter binds the ListView to the data; more on this later).
- * <p>
- * A ListAdapter constructor takes a parameter that specifies a layout resource
- * for each row. It also has two additional parameters that let you specify
- * which data field to associate with which object in the row layout resource.
- * These two parameters are typically parallel arrays.
- * </p>
- * <p>
- * Android provides some standard row layout resources. These are in the
- * {@link android.R.layout} class, and have names such as simple_list_item_1,
- * simple_list_item_2, and two_line_list_item. The following layout XML is the
- * source for the resource two_line_list_item, which displays two data
- * fields,one above the other, for each list row.
- * </p>
- * 
- * <pre>
- * &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
- * &lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- *     android:layout_width=&quot;fill_parent&quot;
- *     android:layout_height=&quot;wrap_content&quot;
- *     android:orientation=&quot;vertical&quot;&gt;
- * 
- *     &lt;TextView android:id=&quot;@+id/text1&quot;
- *         android:textSize=&quot;16sp&quot;
- *         android:textStyle=&quot;bold&quot;
- *         android:layout_width=&quot;fill_parent&quot;
- *         android:layout_height=&quot;wrap_content&quot;/&gt;
- * 
- *     &lt;TextView android:id=&quot;@+id/text2&quot;
- *         android:textSize=&quot;16sp&quot;
- *         android:layout_width=&quot;fill_parent&quot;
- *         android:layout_height=&quot;wrap_content&quot;/&gt;
- * &lt;/LinearLayout&gt;
- * </pre>
- * 
- * <p>
- * You must identify the data bound to each TextView object in this layout. The
- * syntax for this is discussed in the next section.
- * </p>
- * <p>
- * <strong>Binding to Data</strong>
- * </p>
- * <p>
- * You bind the FragmentListActivity's ListView object to data using a class that
- * implements the {@link android.widget.ListAdapter ListAdapter} interface.
- * Android provides two standard list adapters:
- * {@link android.widget.SimpleAdapter SimpleAdapter} for static data (Maps),
- * and {@link android.widget.SimpleCursorAdapter SimpleCursorAdapter} for Cursor
- * query results.
- * </p>
- * <p>
- * The following code from a custom FragmentListActivity demonstrates querying the
- * Contacts provider for all contacts, then binding the Name and Company fields
- * to a two line row layout in the activity's ListView.
- * </p>
- * 
- * <pre>
- * public class MyListAdapter extends FragmentListActivity {
- * 
- *     &#064;Override
- *     protected void onCreate(Bundle savedInstanceState){
- *         super.onCreate(savedInstanceState);
- * 
- *         // We'll define a custom screen layout here (the one shown above), but
- *         // typically, you could just use the standard FragmentListActivity layout.
- *         setContentView(R.layout.custom_list_activity_view);
- * 
- *         // Query for all people contacts using the {@link android.provider.Contacts.People} convenience class.
- *         // Put a managed wrapper around the retrieved cursor so we don't have to worry about
- *         // requerying or closing it as the activity changes state.
- *         mCursor = this.getContentResolver().query(People.CONTENT_URI, null, null, null, null);
- *         startManagingCursor(mCursor);
- * 
- *         // Now create a new list adapter bound to the cursor. 
- *         // SimpleListAdapter is designed for binding to a Cursor.
- *         ListAdapter adapter = new SimpleCursorAdapter(
- *                 this, // Context.
- *                 android.R.layout.two_line_list_item,  // Specify the row template to use (here, two columns bound to the two retrieved cursor 
- * rows).
- *                 mCursor,                                              // Pass in the cursor to bind to.
- *                 new String[] {People.NAME, People.COMPANY},           // Array of cursor columns to bind to.
- *                 new int[] {android.R.id.text1, android.R.id.text2});  // Parallel array of which template objects to bind to those columns.
- * 
- *         // Bind to our new adapter.
- *         setListAdapter(adapter);
- *     }
- * }
- * </pre>
- * 
- * @see #setListAdapter
- * @see android.widget.ListView
- */
-public class FragmentListActivity extends FragmentActivity {
-    /**
-     * This field should be made private, so it is hidden from the SDK.
-     * {@hide}
-     */
-    protected ListAdapter mAdapter;
-    /**
-     * This field should be made private, so it is hidden from the SDK.
-     * {@hide}
-     */
-    protected ListView mList;
-
-    private Handler mHandler = new Handler();
-    private boolean mFinishedStart = false;
-
-    private Runnable mRequestFocus = new Runnable() {
-        @Override
-        public void run() {
-            mList.focusableViewAvailable(mList);
-        }
-    };
-    
-    /**
-     * This method will be called when an item in the list is selected.
-     * Subclasses should override. Subclasses can call
-     * getListView().getItemAtPosition(position) if they need to access the
-     * data associated with the selected item.
-     * 
-     * @param l The ListView where the click happened
-     * @param v The view that was clicked within the ListView
-     * @param position The position of the view in the list
-     * @param id The row id of the item that was clicked
-     */
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-    }
-    
-    /**
-     * Ensures the list view has been created before Activity restores all
-     * of the view states.
-     * 
-     *@see Activity#onRestoreInstanceState(Bundle)
-     */
-    @Override
-    protected void onRestoreInstanceState(Bundle state) {
-        ensureList();
-        super.onRestoreInstanceState(state);
-    }
-
-    /**
-     * Updates the screen state (current list and other views) when the
-     * content changes.
-     * 
-     * @see Activity#onContentChanged()
-     */
-    @Override
-    public void onContentChanged() {
-        super.onContentChanged();
-        View emptyView = findViewById(android.R.id.empty);
-        mList = (ListView)findViewById(android.R.id.list);
-        if (mList == null) {
-            throw new RuntimeException(
-                    "Your content must have a ListView whose id attribute is " +
-                    "'android.R.id.list'");
-        }
-        if (emptyView != null) {
-            mList.setEmptyView(emptyView);
-        }
-        mList.setOnItemClickListener(mOnClickListener);
-        if (mFinishedStart) {
-            setListAdapter(mAdapter);
-        }
-        mHandler.post(mRequestFocus);
-        mFinishedStart = true;
-    }
-
-    /**
-     * Provide the cursor for the list view.
-     */
-    public void setListAdapter(ListAdapter adapter) {
-        synchronized (this) {
-            ensureList();
-            mAdapter = adapter;
-            mList.setAdapter(adapter);
-        }
-    }
-
-    /**
-     * Set the currently selected list item to the specified
-     * position with the adapter's data
-     * 
-     * @param position
-     */
-    public void setSelection(int position) {
-        mList.setSelection(position);
-    }
-
-    /**
-     * Get the position of the currently selected list item.
-     */
-    public int getSelectedItemPosition() {
-        return mList.getSelectedItemPosition();
-    }
-
-    /**
-     * Get the cursor row ID of the currently selected list item.
-     */
-    public long getSelectedItemId() {
-        return mList.getSelectedItemId();
-    }
-
-    /**
-     * Get the activity's list view widget.
-     */
-    public ListView getListView() {
-        ensureList();
-        return mList;
-    }
-    
-    /**
-     * Get the ListAdapter associated with this activity's ListView.
-     */
-    public ListAdapter getListAdapter() {
-        return mAdapter;
-    }
-
-    private void ensureList() {
-        if (mList != null) {
-            return;
-        }
-        setContentView(android.R.layout.list_content);
-        
-    }
-
-    private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View v, int position, long id)
-        {
-            onListItemClick((ListView)parent, v, position, id);
-        }
-    };
-}
-
diff --git a/main/src/cgeo/org/kxml2/io/KXmlSerializer.java b/main/src/cgeo/org/kxml2/io/KXmlSerializer.java
deleted file mode 100644
index 027ff53..0000000
--- a/main/src/cgeo/org/kxml2/io/KXmlSerializer.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-package cgeo.org.kxml2.io;
-
-import org.apache.commons.lang3.StringUtils;
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Locale;
-
-public class KXmlSerializer implements XmlSerializer {
-
-    //    static final String UNDEFINED = ":";
-
-    // BEGIN android-added
-    /** size (in characters) for the write buffer */
-    private static final int WRITE_BUFFER_SIZE = 500;
-    // END android-added
-
-    // BEGIN android-changed
-    // (Guarantee that the writer is always buffered.)
-    private BufferedWriter writer;
-    // END android-changed
-
-    private boolean pending;
-    private int auto;
-    private int depth;
-
-    private String[] elementStack = new String[12];
-    //nsp/prefix/name
-    private int[] nspCounts = new int[4];
-    private String[] nspStack = new String[8];
-    //prefix/nsp; both empty are ""
-    private boolean[] indent = new boolean[4];
-    private boolean unicode;
-    private String encoding;
-
-    private final void check(boolean close) throws IOException {
-        if (!pending) {
-            return;
-        }
-
-        depth++;
-        pending = false;
-
-        if (indent.length <= depth) {
-            boolean[] hlp = new boolean[depth + 4];
-            System.arraycopy(indent, 0, hlp, 0, depth);
-            indent = hlp;
-        }
-        indent[depth] = indent[depth - 1];
-
-        for (int i = nspCounts[depth - 1]; i < nspCounts[depth]; i++) {
-            writer.write(' ');
-            writer.write("xmlns");
-            if (!StringUtils.isEmpty(nspStack[i * 2])) {
-                writer.write(':');
-                writer.write(nspStack[i * 2]);
-            }
-            else if (StringUtils.isEmpty(getNamespace()) && !StringUtils.isEmpty(nspStack[i * 2 + 1])) {
-                throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
-            }
-            writer.write("=\"");
-            writeEscaped(nspStack[i * 2 + 1], '"');
-            writer.write('"');
-        }
-
-        if (nspCounts.length <= depth + 1) {
-            int[] hlp = new int[depth + 8];
-            System.arraycopy(nspCounts, 0, hlp, 0, depth + 1);
-            nspCounts = hlp;
-        }
-
-        nspCounts[depth + 1] = nspCounts[depth];
-        //   nspCounts[depth + 2] = nspCounts[depth];
-
-        writer.write(close ? " />" : ">");
-    }
-
-    private final void writeEscaped(String s, int quot) throws IOException {
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '\n':
-                case '\r':
-                case '\t':
-                    if (quot == -1) {
-                        writer.write(c);
-                    } else {
-                        writer.write("&#"+((int) c)+';');
-                    }
-                    break;
-                case '&':
-                    writer.write("&amp;");
-                    break;
-                case '>':
-                    writer.write("&gt;");
-                    break;
-                case '<':
-                    writer.write("&lt;");
-                    break;
-                default:
-                    if (c == quot) {
-                        writer.write(c == '"' ? "&quot;" : "&apos;");
-                        break;
-                    }
-                    // BEGIN android-changed: refuse to output invalid characters
-                    // See http://www.w3.org/TR/REC-xml/#charsets for definition.
-                    // Corrected for c:geo to handle utf-16 codepoint surrogates correctly
-                    // See http://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B10000_to_U.2B10FFFF
-                    // Note: tab, newline, and carriage return have already been
-                    // handled above.
-                    // Check for lead surrogate
-                    if (c >= 0xd800 && c <= 0xdbff) {
-
-                        if (i + 1 < s.length()) {
-                            writer.write(s.substring(i, i + 1));
-                            i++;
-                            break;
-                        }
-                        // if the lead surrogate is at the string end, it's not valid utf-16
-                        reportInvalidCharacter(c);
-                    }
-                    boolean valid = (c >= 0x20 && c <= 0xd7ff) || (c >= 0xe000 && c <= 0xfffd);
-                    if (!valid) {
-                        reportInvalidCharacter(c);
-                    }
-                    if (unicode || c < 127) {
-                        writer.write(c);
-                    } else {
-                        writer.write("&#" + ((int) c) + ";");
-                    }
-                    // END android-changed
-            }
-        }
-    }
-
-    // BEGIN android-added
-    private static void reportInvalidCharacter(char ch) {
-        throw new IllegalArgumentException("Illegal character (" + Integer.toHexString((int) ch) + ")");
-    }
-    // END android-added
-
-    /*
-     * private final void writeIndent() throws IOException {
-     * writer.write("\r\n");
-     * for (int i = 0; i < depth; i++)
-     * writer.write(' ');
-     * }
-     */
-
-    public void docdecl(String dd) throws IOException {
-        writer.write("<!DOCTYPE");
-        writer.write(dd);
-        writer.write(">");
-    }
-
-    public void endDocument() throws IOException {
-        while (depth > 0) {
-            endTag(elementStack[depth * 3 - 3], elementStack[depth * 3 - 1]);
-        }
-        flush();
-    }
-
-    public void entityRef(String name) throws IOException {
-        check(false);
-        writer.write('&');
-        writer.write(name);
-        writer.write(';');
-    }
-
-    public boolean getFeature(String name) {
-        //return false;
-        return ("http://xmlpull.org/v1/doc/features.html#indent-output"
-                .equals(
-                name))
-                ? indent[depth]
-                : false;
-    }
-
-    public String getPrefix(String namespace, boolean create) {
-        try {
-            return getPrefix(namespace, false, create);
-        } catch (IOException e) {
-            throw new RuntimeException(e.toString());
-        }
-    }
-
-    private final String getPrefix(
-            String namespace,
-            boolean includeDefault,
-            boolean create)
-            throws IOException {
-
-        for (int i = nspCounts[depth + 1] * 2 - 2; i >= 0; i -= 2) {
-            if (nspStack[i + 1].equals(namespace)
-                    && (includeDefault || !StringUtils.isEmpty(nspStack[i]))) {
-                String cand = nspStack[i];
-                for (int j = i + 2; j < nspCounts[depth + 1] * 2; j++) {
-                    if (nspStack[j].equals(cand)) {
-                        cand = null;
-                        break;
-                    }
-                }
-                if (cand != null) {
-                    return cand;
-                }
-            }
-        }
-
-        if (!create) {
-            return null;
-        }
-
-        String prefix;
-
-        if (StringUtils.isEmpty(namespace)) {
-            prefix = "";
-        } else {
-            do {
-                prefix = "n" + (auto++);
-                for (int i = nspCounts[depth + 1] * 2 - 2; i >= 0; i -= 2) {
-                    if (prefix.equals(nspStack[i])) {
-                        prefix = null;
-                        break;
-                    }
-                }
-            } while (prefix == null);
-        }
-
-        boolean p = pending;
-        pending = false;
-        setPrefix(prefix, namespace);
-        pending = p;
-        return prefix;
-    }
-
-    public Object getProperty(String name) {
-        throw new RuntimeException("Unsupported property");
-    }
-
-    public void ignorableWhitespace(String s)
-            throws IOException {
-        text(s);
-    }
-
-    public void setFeature(String name, boolean value) {
-        if ("http://xmlpull.org/v1/doc/features.html#indent-output"
-                .equals(name)) {
-            indent[depth] = value;
-        } else {
-            throw new RuntimeException("Unsupported Feature");
-        }
-    }
-
-    public void setProperty(String name, Object value) {
-        throw new RuntimeException(
-                "Unsupported Property:" + value);
-    }
-
-    public void setPrefix(String prefix, String namespace)
-            throws IOException {
-
-        check(false);
-        if (prefix == null) {
-            prefix = "";
-        }
-        if (namespace == null) {
-            namespace = "";
-        }
-
-        String defined = getPrefix(namespace, true, false);
-
-        // boil out if already defined
-
-        if (prefix.equals(defined)) {
-            return;
-        }
-
-        int pos = (nspCounts[depth + 1]++) << 1;
-
-        if (nspStack.length < pos + 1) {
-            String[] hlp = new String[nspStack.length + 16];
-            System.arraycopy(nspStack, 0, hlp, 0, pos);
-            nspStack = hlp;
-        }
-
-        nspStack[pos++] = prefix;
-        nspStack[pos] = namespace;
-    }
-
-    public void setOutput(Writer writer) {
-        // BEGIN android-changed
-        // Guarantee that the writer is always buffered.
-        if (writer instanceof BufferedWriter) {
-            this.writer = (BufferedWriter) writer;
-        } else {
-            this.writer = new BufferedWriter(writer, WRITE_BUFFER_SIZE);
-        }
-        // END android-changed
-
-        // elementStack = new String[12]; //nsp/prefix/name
-        //nspCounts = new int[4];
-        //nspStack = new String[8]; //prefix/nsp
-        //indent = new boolean[4];
-
-        nspCounts[0] = 2;
-        nspCounts[1] = 2;
-        nspStack[0] = "";
-        nspStack[1] = "";
-        nspStack[2] = "xml";
-        nspStack[3] = "http://www.w3.org/XML/1998/namespace";
-        pending = false;
-        auto = 0;
-        depth = 0;
-
-        unicode = false;
-    }
-
-    public void setOutput(OutputStream os, String encoding)
-            throws IOException {
-        if (os == null) {
-            throw new IllegalArgumentException("os == null");
-        }
-        setOutput(encoding == null
-                ? new OutputStreamWriter(os)
-                : new OutputStreamWriter(os, encoding));
-        this.encoding = encoding;
-        if (encoding != null && encoding.toLowerCase(Locale.US).startsWith("utf")) {
-            unicode = true;
-        }
-    }
-
-    public void startDocument(String encoding, Boolean standalone) throws IOException {
-        writer.write("<?xml version='1.0' ");
-
-        if (encoding != null) {
-            this.encoding = encoding;
-            if (encoding.toLowerCase(Locale.US).startsWith("utf")) {
-                unicode = true;
-            }
-        }
-
-        if (this.encoding != null) {
-            writer.write("encoding='");
-            writer.write(this.encoding);
-            writer.write("' ");
-        }
-
-        if (standalone != null) {
-            writer.write("standalone='");
-            writer.write(
-                    standalone.booleanValue() ? "yes" : "no");
-            writer.write("' ");
-        }
-        writer.write("?>");
-    }
-
-    public XmlSerializer startTag(String namespace, String name)
-            throws IOException {
-        check(false);
-
-        //        if (namespace == null)
-        //            namespace = "";
-
-        if (indent[depth]) {
-            writer.write("\r\n");
-            for (int i = 0; i < depth; i++) {
-                writer.write("  ");
-            }
-        }
-
-        int esp = depth * 3;
-
-        if (elementStack.length < esp + 3) {
-            String[] hlp = new String[elementStack.length + 12];
-            System.arraycopy(elementStack, 0, hlp, 0, esp);
-            elementStack = hlp;
-        }
-
-        String prefix =
-                namespace == null
-                        ? ""
-                        : getPrefix(namespace, true, true);
-
-        if (namespace != null && StringUtils.isEmpty(namespace)) {
-            for (int i = nspCounts[depth]; i < nspCounts[depth + 1]; i++) {
-                if (StringUtils.isEmpty(nspStack[i * 2]) && !StringUtils.isEmpty(nspStack[i * 2 + 1])) {
-                    throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
-                }
-            }
-        }
-
-        elementStack[esp++] = namespace;
-        elementStack[esp++] = prefix;
-        elementStack[esp] = name;
-
-        writer.write('<');
-        if (!StringUtils.isEmpty(prefix)) {
-            writer.write(prefix);
-            writer.write(':');
-        }
-
-        writer.write(name);
-
-        pending = true;
-
-        return this;
-    }
-
-    public XmlSerializer attribute(
-            String namespace,
-            String name,
-            String value)
-            throws IOException {
-        if (!pending) {
-            throw new IllegalStateException("illegal position for attribute");
-        }
-
-        //        int cnt = nspCounts[depth];
-
-        if (namespace == null) {
-            namespace = "";
-        }
-
-        //        depth--;
-        //        pending = false;
-
-        String prefix =
-                StringUtils.isEmpty(namespace)
-                        ? ""
-                        : getPrefix(namespace, false, true);
-
-        //        pending = true;
-        //        depth++;
-
-        /*
-         * if (cnt != nspCounts[depth]) {
-         * writer.write(' ');
-         * writer.write("xmlns");
-         * if (nspStack[cnt * 2] != null) {
-         * writer.write(':');
-         * writer.write(nspStack[cnt * 2]);
-         * }
-         * writer.write("=\"");
-         * writeEscaped(nspStack[cnt * 2 + 1], '"');
-         * writer.write('"');
-         * }
-         */
-
-        writer.write(' ');
-        if (!StringUtils.isEmpty(prefix)) {
-            writer.write(prefix);
-            writer.write(':');
-        }
-        writer.write(name);
-        writer.write('=');
-        char q = value.indexOf('"') == -1 ? '"' : '\'';
-        writer.write(q);
-        writeEscaped(value, q);
-        writer.write(q);
-
-        return this;
-    }
-
-    public void flush() throws IOException {
-        check(false);
-        writer.flush();
-    }
-
-    /*
-     * public void close() throws IOException {
-     * check();
-     * writer.close();
-     * }
-     */
-    public XmlSerializer endTag(String namespace, String name)
-            throws IOException {
-
-        if (!pending)
-         {
-            depth--;
-        //        if (namespace == null)
-        //          namespace = "";
-        }
-
-        if ((namespace == null
-                && elementStack[depth * 3] != null)
-                || (namespace != null
-                && !namespace.equals(elementStack[depth * 3]))
-                || !elementStack[depth * 3 + 2].equals(name)) {
-            throw new IllegalArgumentException("</{"+namespace+"}"+name+"> does not match start");
-        }
-
-        if (pending) {
-            check(true);
-            depth--;
-        }
-        else {
-            if (indent[depth + 1]) {
-                writer.write("\r\n");
-                for (int i = 0; i < depth; i++) {
-                    writer.write("  ");
-                }
-            }
-
-            writer.write("</");
-            String prefix = elementStack[depth * 3 + 1];
-            if (!StringUtils.isEmpty(prefix)) {
-                writer.write(prefix);
-                writer.write(':');
-            }
-            writer.write(name);
-            writer.write('>');
-        }
-
-        nspCounts[depth + 1] = nspCounts[depth];
-        return this;
-    }
-
-    public String getNamespace() {
-        return getDepth() == 0 ? null : elementStack[getDepth() * 3 - 3];
-    }
-
-    public String getName() {
-        return getDepth() == 0 ? null : elementStack[getDepth() * 3 - 1];
-    }
-
-    public int getDepth() {
-        return pending ? depth + 1 : depth;
-    }
-
-    public XmlSerializer text(String text) throws IOException {
-        check(false);
-        indent[depth] = false;
-        writeEscaped(text, -1);
-        return this;
-    }
-
-    public XmlSerializer text(char[] text, int start, int len)
-            throws IOException {
-        text(new String(text, start, len));
-        return this;
-    }
-
-    public void cdsect(String data) throws IOException {
-        check(false);
-        // BEGIN android-changed: ]]> is not allowed within a CDATA,
-        // so break and start a new one when necessary.
-        data = data.replace("]]>", "]]]]><![CDATA[>");
-        char[] chars = data.toCharArray();
-        // We also aren't allowed any invalid characters.
-        for (char ch : chars) {
-            boolean valid = (ch >= 0x20 && ch <= 0xd7ff) ||
-                    (ch == '\t' || ch == '\n' || ch == '\r') ||
-                    (ch >= 0xe000 && ch <= 0xfffd);
-            if (!valid) {
-                reportInvalidCharacter(ch);
-            }
-        }
-        writer.write("<![CDATA[");
-        writer.write(chars, 0, chars.length);
-        writer.write("]]>");
-        // END android-changed
-    }
-
-    public void comment(String comment) throws IOException {
-        check(false);
-        writer.write("<!--");
-        writer.write(comment);
-        writer.write("-->");
-    }
-
-    public void processingInstruction(String pi)
-            throws IOException {
-        check(false);
-        writer.write("<?");
-        writer.write(pi);
-        writer.write("?>");
-    }
-}
\ No newline at end of file
diff --git a/main/src/com/viewpagerindicator/PageIndicator.java b/main/src/com/viewpagerindicator/PageIndicator.java
deleted file mode 100644
index 26414d8..0000000
--- a/main/src/com/viewpagerindicator/PageIndicator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2011 Patrik Akerfeldt
- * Copyright (C) 2011 Jake Wharton
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.viewpagerindicator;
-
-import android.support.v4.view.ViewPager;
-
-/**
- * A PageIndicator is responsible to show an visual indicator on the total views
- * number and the current visible view.
- */
-public interface PageIndicator extends ViewPager.OnPageChangeListener {
-    /**
-     * Bind the indicator to a ViewPager.
-     *
-     * @param view
-     */
-    public void setViewPager(ViewPager view);
-
-    /**
-     * Bind the indicator to a ViewPager.
-     *
-     * @param view
-     * @param initialPosition
-     */
-    public void setViewPager(ViewPager view, int initialPosition);
-
-    /**
-     * <p>Set the current page of both the ViewPager and indicator.</p>
-     *
-     * <p>This <strong>must</strong> be used if you need to set the page before
-     * the views are drawn on screen (e.g., default start page).</p>
-     *
-     * @param item
-     */
-    public void setCurrentItem(int item);
-
-    /**
-     * Set a page change listener which will receive forwarded events.
-     *
-     * @param listener
-     */
-    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener);
-
-    /**
-     * Notify the indicator that the fragment list has changed.
-     */
-    public void notifyDataSetChanged();
-}
diff --git a/main/src/com/viewpagerindicator/TitlePageIndicator.java b/main/src/com/viewpagerindicator/TitlePageIndicator.java
deleted file mode 100644
index 94ac962..0000000
--- a/main/src/com/viewpagerindicator/TitlePageIndicator.java
+++ /dev/null
@@ -1,771 +0,0 @@
-/*
- * Copyright (C) 2011 Patrik Akerfeldt
- * Copyright (C) 2011 Francisco Figueiredo Jr.
- * Copyright (C) 2011 Jake Wharton
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.viewpagerindicator;
-
-import cgeo.geocaching.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.RectF;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewConfigurationCompat;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-
-import java.util.ArrayList;
-
-/**
- * A TitlePageIndicator is a PageIndicator which displays the title of left view
- * (if exist), the title of the current select view (centered) and the title of
- * the right view (if exist). When the user scrolls the ViewPager then titles are
- * also scrolled.
- */
-public class TitlePageIndicator extends View implements PageIndicator {
-    /**
-     * Percentage indicating what percentage of the screen width away from
-     * center should the underline be fully faded. A value of 0.25 means that
-     * halfway between the center of the screen and an edge.
-     */
-    private static final float SELECTION_FADE_PERCENTAGE = 0.25f;
-
-    /**
-     * Percentage indicating what percentage of the screen width away from
-     * center should the selected text bold turn off. A value of 0.05 means
-     * that 10% between the center and an edge.
-     */
-    private static final float BOLD_FADE_PERCENTAGE = 0.05f;
-
-    public enum IndicatorStyle {
-        None(0), Triangle(1), Underline(2);
-
-        public final int value;
-
-        IndicatorStyle(int value) {
-            this.value = value;
-        }
-
-        public static IndicatorStyle fromValue(int value) {
-            for (IndicatorStyle style : IndicatorStyle.values()) {
-                if (style.value == value) {
-                    return style;
-                }
-            }
-            return null;
-        }
-    }
-
-    private ViewPager mViewPager;
-    private ViewPager.OnPageChangeListener mListener;
-    private TitleProvider mTitleProvider;
-    private int mCurrentPage;
-    private int mCurrentOffset;
-    private int mScrollState;
-    private final Paint mPaintText;
-    private boolean mBoldText;
-    private int mColorText;
-    private int mColorSelected;
-    private Path mPath = new Path();
-    private final Paint mPaintFooterLine;
-    private IndicatorStyle mFooterIndicatorStyle;
-    private final Paint mPaintFooterIndicator;
-    private float mFooterIndicatorHeight;
-    private float mFooterIndicatorUnderlinePadding;
-    private float mFooterPadding;
-    private float mTitlePadding;
-    private float mTopPadding;
-    /** Left and right side padding for not active view titles. */
-    private float mClipPadding;
-    private float mFooterLineHeight;
-
-    private static final int INVALID_POINTER = -1;
-
-    private int mTouchSlop;
-    private float mLastMotionX = -1;
-    private int mActivePointerId = INVALID_POINTER;
-    private boolean mIsDragging;
-
-
-    public TitlePageIndicator(Context context) {
-        this(context, null);
-    }
-
-    public TitlePageIndicator(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.vpiTitlePageIndicatorStyle);
-    }
-
-    public TitlePageIndicator(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        //Load defaults from resources
-        final Resources res = getResources();
-        final int defaultFooterColor = res.getColor(R.color.default_title_indicator_footer_color);
-        final float defaultFooterLineHeight = res.getDimension(R.dimen.default_title_indicator_footer_line_height);
-        final int defaultFooterIndicatorStyle = res.getInteger(R.integer.default_title_indicator_footer_indicator_style);
-        final float defaultFooterIndicatorHeight = res.getDimension(R.dimen.default_title_indicator_footer_indicator_height);
-        final float defaultFooterIndicatorUnderlinePadding = res.getDimension(R.dimen.default_title_indicator_footer_indicator_underline_padding);
-        final float defaultFooterPadding = res.getDimension(R.dimen.default_title_indicator_footer_padding);
-        final int defaultSelectedColor = res.getColor(R.color.default_title_indicator_selected_color);
-        final boolean defaultSelectedBold = res.getBoolean(R.bool.default_title_indicator_selected_bold);
-        final int defaultTextColor = res.getColor(R.color.default_title_indicator_text_color);
-        final float defaultTextSize = res.getDimension(R.dimen.default_title_indicator_text_size);
-        final float defaultTitlePadding = res.getDimension(R.dimen.default_title_indicator_title_padding);
-        final float defaultClipPadding = res.getDimension(R.dimen.default_title_indicator_clip_padding);
-        final float defaultTopPadding = res.getDimension(R.dimen.default_title_indicator_top_padding);
-
-        //Retrieve styles attributes
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TitlePageIndicator, defStyle, R.style.Widget_TitlePageIndicator);
-
-        //Retrieve the colors to be used for this view and apply them.
-        mFooterLineHeight = a.getDimension(R.styleable.TitlePageIndicator_footerLineHeight, defaultFooterLineHeight);
-        mFooterIndicatorStyle = IndicatorStyle.fromValue(a.getInteger(R.styleable.TitlePageIndicator_footerIndicatorStyle, defaultFooterIndicatorStyle));
-        mFooterIndicatorHeight = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorHeight, defaultFooterIndicatorHeight);
-        mFooterIndicatorUnderlinePadding = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorUnderlinePadding, defaultFooterIndicatorUnderlinePadding);
-        mFooterPadding = a.getDimension(R.styleable.TitlePageIndicator_footerPadding, defaultFooterPadding);
-        mTopPadding = a.getDimension(R.styleable.TitlePageIndicator_topPadding, defaultTopPadding);
-        mTitlePadding = a.getDimension(R.styleable.TitlePageIndicator_titlePadding, defaultTitlePadding);
-        mClipPadding = a.getDimension(R.styleable.TitlePageIndicator_clipPadding, defaultClipPadding);
-        mColorSelected = a.getColor(R.styleable.TitlePageIndicator_selectedColor, defaultSelectedColor);
-        mColorText = a.getColor(R.styleable.TitlePageIndicator_textColor, defaultTextColor);
-        mBoldText = a.getBoolean(R.styleable.TitlePageIndicator_selectedBold, defaultSelectedBold);
-
-        final float textSize = a.getDimension(R.styleable.TitlePageIndicator_textSize, defaultTextSize);
-        final int footerColor = a.getColor(R.styleable.TitlePageIndicator_footerColor, defaultFooterColor);
-        mPaintText = new Paint();
-        mPaintText.setTextSize(textSize);
-        mPaintText.setAntiAlias(true);
-        mPaintFooterLine = new Paint();
-        mPaintFooterLine.setStyle(Paint.Style.FILL_AND_STROKE);
-        mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
-        mPaintFooterLine.setColor(footerColor);
-        mPaintFooterIndicator = new Paint();
-        mPaintFooterIndicator.setStyle(Paint.Style.FILL_AND_STROKE);
-        mPaintFooterIndicator.setColor(footerColor);
-
-        a.recycle();
-
-        final ViewConfiguration configuration = ViewConfiguration.get(context);
-        mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration);
-    }
-
-
-    public int getFooterColor() {
-        return mPaintFooterLine.getColor();
-    }
-
-    public void setFooterColor(int footerColor) {
-        mPaintFooterLine.setColor(footerColor);
-        mPaintFooterIndicator.setColor(footerColor);
-        invalidate();
-    }
-
-    public float getFooterLineHeight() {
-        return mFooterLineHeight;
-    }
-
-    public void setFooterLineHeight(float footerLineHeight) {
-        mFooterLineHeight = footerLineHeight;
-        mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
-        invalidate();
-    }
-
-    public float getFooterIndicatorHeight() {
-        return mFooterIndicatorHeight;
-    }
-
-    public void setFooterIndicatorHeight(float footerTriangleHeight) {
-        mFooterIndicatorHeight = footerTriangleHeight;
-        invalidate();
-    }
-
-    public float getFooterIndicatorPadding() {
-        return mFooterPadding;
-    }
-
-    public void setFooterIndicatorPadding(float footerIndicatorPadding) {
-        mFooterPadding = footerIndicatorPadding;
-        invalidate();
-    }
-
-    public IndicatorStyle getFooterIndicatorStyle() {
-        return mFooterIndicatorStyle;
-    }
-
-    public void setFooterIndicatorStyle(IndicatorStyle indicatorStyle) {
-        mFooterIndicatorStyle = indicatorStyle;
-        invalidate();
-    }
-
-    public int getSelectedColor() {
-        return mColorSelected;
-    }
-
-    public void setSelectedColor(int selectedColor) {
-        mColorSelected = selectedColor;
-        invalidate();
-    }
-
-    public boolean isSelectedBold() {
-        return mBoldText;
-    }
-
-    public void setSelectedBold(boolean selectedBold) {
-        mBoldText = selectedBold;
-        invalidate();
-    }
-
-    public int getTextColor() {
-        return mColorText;
-    }
-
-    public void setTextColor(int textColor) {
-        mPaintText.setColor(textColor);
-        mColorText = textColor;
-        invalidate();
-    }
-
-    public float getTextSize() {
-        return mPaintText.getTextSize();
-    }
-
-    public void setTextSize(float textSize) {
-        mPaintText.setTextSize(textSize);
-        invalidate();
-    }
-
-    public float getTitlePadding() {
-        return this.mTitlePadding;
-    }
-
-    public void setTitlePadding(float titlePadding) {
-        mTitlePadding = titlePadding;
-        invalidate();
-    }
-
-    public float getTopPadding() {
-        return this.mTopPadding;
-    }
-
-    public void setTopPadding(float topPadding) {
-        mTopPadding = topPadding;
-        invalidate();
-    }
-
-    public float getClipPadding() {
-        return this.mClipPadding;
-    }
-
-    public void setClipPadding(float clipPadding) {
-        mClipPadding = clipPadding;
-        invalidate();
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see android.view.View#onDraw(android.graphics.Canvas)
-     */
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        if (mViewPager == null) {
-            return;
-        }
-        final int count = mViewPager.getAdapter().getCount();
-        if (count == 0) {
-            return;
-        }
-
-        //Calculate views bounds
-        ArrayList<RectF> bounds = calculateAllBounds(mPaintText);
-
-        //Make sure we're on a page that still exists
-        if (mCurrentPage >= bounds.size()) {
-            setCurrentItem(bounds.size()-1);
-        }
-
-        final int countMinusOne = count - 1;
-        final float halfWidth = getWidth() / 2f;
-        final int left = getLeft();
-        final float leftClip = left + mClipPadding;
-        final int width = getWidth();
-        final int height = getHeight();
-        final int right = left + width;
-        final float rightClip = right - mClipPadding;
-
-        int page = mCurrentPage;
-        float offsetPercent;
-        if (mCurrentOffset <= halfWidth) {
-            offsetPercent = 1.0f * mCurrentOffset / width;
-        } else {
-            page += 1;
-            offsetPercent = 1.0f * (width - mCurrentOffset) / width;
-        }
-        final boolean currentSelected = (offsetPercent <= SELECTION_FADE_PERCENTAGE);
-        final boolean currentBold = (offsetPercent <= BOLD_FADE_PERCENTAGE);
-        final float selectedPercent = (SELECTION_FADE_PERCENTAGE - offsetPercent) / SELECTION_FADE_PERCENTAGE;
-
-        //Verify if the current view must be clipped to the screen
-        RectF curPageBound = bounds.get(mCurrentPage);
-        float curPageWidth = curPageBound.right - curPageBound.left;
-        if (curPageBound.left < leftClip) {
-            //Try to clip to the screen (left side)
-            clipViewOnTheLeft(curPageBound, curPageWidth, left);
-        }
-        if (curPageBound.right > rightClip) {
-            //Try to clip to the screen (right side)
-            clipViewOnTheRight(curPageBound, curPageWidth, right);
-        }
-
-        //Left views starting from the current position
-        if (mCurrentPage > 0) {
-            for (int i = mCurrentPage - 1; i >= 0; i--) {
-                RectF bound = bounds.get(i);
-                //Is left side is outside the screen
-                if (bound.left < leftClip) {
-                    float w = bound.right - bound.left;
-                    //Try to clip to the screen (left side)
-                    clipViewOnTheLeft(bound, w, left);
-                    //Except if there's an intersection with the right view
-                    RectF rightBound = bounds.get(i + 1);
-                    //Intersection
-                    if (bound.right + mTitlePadding > rightBound.left) {
-                        bound.left = rightBound.left - w - mTitlePadding;
-                        bound.right = bound.left + w;
-                    }
-                }
-            }
-        }
-        //Right views starting from the current position
-        if (mCurrentPage < countMinusOne) {
-            for (int i = mCurrentPage + 1 ; i < count; i++) {
-                RectF bound = bounds.get(i);
-                //If right side is outside the screen
-                if (bound.right > rightClip) {
-                    float w = bound.right - bound.left;
-                    //Try to clip to the screen (right side)
-                    clipViewOnTheRight(bound, w, right);
-                    //Except if there's an intersection with the left view
-                    RectF leftBound = bounds.get(i - 1);
-                    //Intersection
-                    if (bound.left - mTitlePadding < leftBound.right) {
-                        bound.left = leftBound.right + mTitlePadding;
-                        bound.right = bound.left + w;
-                    }
-                }
-            }
-        }
-
-        //Now draw views
-        for (int i = 0; i < count; i++) {
-            //Get the title
-            RectF bound = bounds.get(i);
-            //Only if one side is visible
-            if ((bound.left > left && bound.left < right) || (bound.right > left && bound.right < right)) {
-                final boolean currentPage = (i == page);
-                //Only set bold if we are within bounds
-                mPaintText.setFakeBoldText(currentPage && currentBold && mBoldText);
-
-                //Draw text as unselected
-                mPaintText.setColor(mColorText);
-                canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
-
-                //If we are within the selected bounds draw the selected text
-                if (currentPage && currentSelected) {
-                    mPaintText.setColor(mColorSelected);
-                    mPaintText.setAlpha((int)((mColorSelected >>> 24) * selectedPercent));
-                    canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
-                }
-            }
-        }
-
-        //Draw the footer line
-        mPath.reset();
-        mPath.moveTo(0, height - mFooterLineHeight / 2f);
-        mPath.lineTo(width, height - mFooterLineHeight / 2f);
-        mPath.close();
-        canvas.drawPath(mPath, mPaintFooterLine);
-
-        switch (mFooterIndicatorStyle) {
-            case Triangle:
-                mPath.reset();
-                mPath.moveTo(halfWidth, height - mFooterLineHeight - mFooterIndicatorHeight);
-                mPath.lineTo(halfWidth + mFooterIndicatorHeight, height - mFooterLineHeight);
-                mPath.lineTo(halfWidth - mFooterIndicatorHeight, height - mFooterLineHeight);
-                mPath.close();
-                canvas.drawPath(mPath, mPaintFooterIndicator);
-                break;
-
-            case Underline:
-                if (!currentSelected) {
-                    break;
-                }
-
-                RectF underlineBounds = bounds.get(page);
-                mPath.reset();
-                mPath.moveTo(underlineBounds.left  - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
-                mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
-                mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
-                mPath.lineTo(underlineBounds.left  - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
-                mPath.close();
-
-                mPaintFooterIndicator.setAlpha((int)(0xFF * selectedPercent));
-                canvas.drawPath(mPath, mPaintFooterIndicator);
-                mPaintFooterIndicator.setAlpha(0xFF);
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean onTouchEvent(android.view.MotionEvent ev) {
-        if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) {
-            return false;
-        }
-
-        final int action = ev.getAction();
-
-        switch (action & MotionEventCompat.ACTION_MASK) {
-            case MotionEvent.ACTION_DOWN:
-                mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
-                mLastMotionX = ev.getX();
-                break;
-
-            case MotionEvent.ACTION_MOVE: {
-                final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
-                final float x = MotionEventCompat.getX(ev, activePointerIndex);
-                final float deltaX = x - mLastMotionX;
-
-                if (!mIsDragging) {
-                    if (Math.abs(deltaX) > mTouchSlop) {
-                        mIsDragging = true;
-                    }
-                }
-
-                if (mIsDragging) {
-                    if (!mViewPager.isFakeDragging()) {
-                        mViewPager.beginFakeDrag();
-                    }
-
-                    mLastMotionX = x;
-
-                    mViewPager.fakeDragBy(deltaX);
-                }
-
-                break;
-            }
-
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP:
-                if (!mIsDragging) {
-                    final int count = mViewPager.getAdapter().getCount();
-                    final int width = getWidth();
-                    final float halfWidth = width / 2f;
-                    final float sixthWidth = width / 6f;
-
-                    if ((mCurrentPage > 0) && (ev.getX() < halfWidth - sixthWidth)) {
-                        mViewPager.setCurrentItem(mCurrentPage - 1);
-                        return true;
-                    } else if ((mCurrentPage < count - 1) && (ev.getX() > halfWidth + sixthWidth)) {
-                        mViewPager.setCurrentItem(mCurrentPage + 1);
-                        return true;
-                    }
-                }
-
-                mIsDragging = false;
-                mActivePointerId = INVALID_POINTER;
-                if (mViewPager.isFakeDragging()) {
-                    mViewPager.endFakeDrag();
-                }
-                break;
-
-            case MotionEventCompat.ACTION_POINTER_DOWN: {
-                final int index = MotionEventCompat.getActionIndex(ev);
-                mLastMotionX = MotionEventCompat.getX(ev, index);
-                mActivePointerId = MotionEventCompat.getPointerId(ev, index);
-                break;
-            }
-
-            case MotionEventCompat.ACTION_POINTER_UP:
-                final int pointerIndex = MotionEventCompat.getActionIndex(ev);
-                final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
-                if (pointerId == mActivePointerId) {
-                    final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
-                    mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
-                }
-                mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId));
-                break;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set bounds for the right textView including clip padding.
-     *
-     * @param curViewBound
-     *            current bounds.
-     * @param curViewWidth
-     *            width of the view.
-     */
-    private void clipViewOnTheRight(RectF curViewBound, float curViewWidth, int right) {
-        curViewBound.right = right - mClipPadding;
-        curViewBound.left = curViewBound.right - curViewWidth;
-    }
-
-    /**
-     * Set bounds for the left textView including clip padding.
-     *
-     * @param curViewBound
-     *            current bounds.
-     * @param curViewWidth
-     *            width of the view.
-     */
-    private void clipViewOnTheLeft(RectF curViewBound, float curViewWidth, int left) {
-        curViewBound.left = left + mClipPadding;
-        curViewBound.right = mClipPadding + curViewWidth;
-    }
-
-    /**
-     * Calculate views bounds and scroll them according to the current index
-     *
-     * @param paint
-     * @param currentIndex
-     * @return
-     */
-    private ArrayList<RectF> calculateAllBounds(Paint paint) {
-        ArrayList<RectF> list = new ArrayList<RectF>();
-        //For each views (If no values then add a fake one)
-        final int count = mViewPager.getAdapter().getCount();
-        final int width = getWidth();
-        final int halfWidth = width / 2;
-        for (int i = 0; i < count; i++) {
-            RectF bounds = calcBounds(i, paint);
-            float w = (bounds.right - bounds.left);
-            float h = (bounds.bottom - bounds.top);
-            bounds.left = (halfWidth) - (w / 2) - mCurrentOffset + ((i - mCurrentPage) * width);
-            bounds.right = bounds.left + w;
-            bounds.top = 0;
-            bounds.bottom = h;
-            list.add(bounds);
-        }
-
-        return list;
-    }
-
-    /**
-     * Calculate the bounds for a view's title
-     *
-     * @param index
-     * @param paint
-     * @return
-     */
-    private RectF calcBounds(int index, Paint paint) {
-        //Calculate the text bounds
-        RectF bounds = new RectF();
-        bounds.right = paint.measureText(mTitleProvider.getTitle(index));
-        bounds.bottom = paint.descent() - paint.ascent();
-        return bounds;
-    }
-
-    @Override
-    public void setViewPager(ViewPager view) {
-        final PagerAdapter adapter = view.getAdapter();
-        if (adapter == null) {
-            throw new IllegalStateException("ViewPager does not have adapter instance.");
-        }
-        if (!(adapter instanceof TitleProvider)) {
-            throw new IllegalStateException("ViewPager adapter must implement TitleProvider to be used with TitlePageIndicator.");
-        }
-        mViewPager = view;
-        mViewPager.setOnPageChangeListener(this);
-        mTitleProvider = (TitleProvider)adapter;
-        invalidate();
-    }
-
-    @Override
-    public void setViewPager(ViewPager view, int initialPosition) {
-        setViewPager(view);
-        setCurrentItem(initialPosition);
-    }
-
-    @Override
-    public void notifyDataSetChanged() {
-        invalidate();
-    }
-
-    @Override
-    public void setCurrentItem(int item) {
-        if (mViewPager == null) {
-            throw new IllegalStateException("ViewPager has not been bound.");
-        }
-        mViewPager.setCurrentItem(item);
-        mCurrentPage = item;
-        invalidate();
-    }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-        mScrollState = state;
-
-        if (mListener != null) {
-            mListener.onPageScrollStateChanged(state);
-        }
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        mCurrentPage = position;
-        mCurrentOffset = positionOffsetPixels;
-        invalidate();
-
-        if (mListener != null) {
-            mListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
-        }
-    }
-
-    @Override
-    public void onPageSelected(int position) {
-        if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
-            mCurrentPage = position;
-            invalidate();
-        }
-
-        if (mListener != null) {
-            mListener.onPageSelected(position);
-        }
-    }
-
-    @Override
-    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
-        mListener = listener;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see android.view.View#onMeasure(int, int)
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
-    }
-
-    /**
-     * Determines the width of this view
-     *
-     * @param measureSpec
-     *            A measureSpec packed into an int
-     * @return The width of the view, honoring constraints from measureSpec
-     */
-    private int measureWidth(int measureSpec) {
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        if (specMode != MeasureSpec.EXACTLY) {
-            throw new IllegalStateException(getClass().getSimpleName() + " can only be used in EXACTLY mode.");
-        }
-        return specSize;
-    }
-
-    /**
-     * Determines the height of this view
-     *
-     * @param measureSpec
-     *            A measureSpec packed into an int
-     * @return The height of the view, honoring constraints from measureSpec
-     */
-    private int measureHeight(int measureSpec) {
-        float result;
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        if (specMode == MeasureSpec.EXACTLY) {
-            //We were told how big to be
-            result = specSize;
-        } else {
-            //Calculate the text bounds
-            RectF bounds = new RectF();
-            bounds.bottom = mPaintText.descent()-mPaintText.ascent();
-            result = bounds.bottom - bounds.top + mFooterLineHeight + mFooterPadding + mTopPadding;
-            if (mFooterIndicatorStyle != IndicatorStyle.None) {
-                result += mFooterIndicatorHeight;
-            }
-        }
-        return (int)result;
-    }
-
-    @Override
-    public void onRestoreInstanceState(Parcelable state) {
-        SavedState savedState = (SavedState)state;
-        super.onRestoreInstanceState(savedState.getSuperState());
-        mCurrentPage = savedState.currentPage;
-        requestLayout();
-    }
-
-    @Override
-    public Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        SavedState savedState = new SavedState(superState);
-        savedState.currentPage = mCurrentPage;
-        return savedState;
-    }
-
-    static class SavedState extends BaseSavedState {
-        int currentPage;
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        private SavedState(Parcel in) {
-            super(in);
-            currentPage = in.readInt();
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeInt(currentPage);
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
-}
diff --git a/main/src/com/viewpagerindicator/TitleProvider.java b/main/src/com/viewpagerindicator/TitleProvider.java
deleted file mode 100644
index 2a04b65..0000000
--- a/main/src/com/viewpagerindicator/TitleProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011 Patrik Akerfeldt
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.viewpagerindicator;
-
-/**
- * A TitleProvider provides the title to display according to a view.
- */
-public interface TitleProvider {
-    /**
-     * Returns the title of the view at position
-     * @param position
-     * @return
-     */
-    public String getTitle(int position);
-}
diff --git a/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java b/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
deleted file mode 100644
index af4c03e..0000000
--- a/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package gnu.android.app.appmanualclient;
-
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * The "App Manual Reader" client is a class to be used in applications which
- * want to offer their users manuals through the gnu.android.appmanualreader
- * application. Such applications do not need to include the whole
- * "App Manual Reader" app but instead just have to include only this little
- * package. This package then provides the mechanism to open suitable installed
- * manuals. It does not include any manuals itself.
- * <p>
- *
- * (c) 2011 Geocrasher (geocrasher@gmx.eu)
- * <p>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- * <p>
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- * <p>
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- * @author Geocrasher
- */
-public class AppManualReaderClient {
-
-	/**
-	 * The URI scheme used to identify application manual URIs when flinging
-	 * Intents around within an Android device, in the hope that there are
-	 * activities registered which will handle such application manual URIs.
-	 * Usually, there won't be just a single activity registered but instead
-	 * many, depending on how many manuals are installed on an Android device.
-	 */
-	public static final String URI_SCHEME_APPMANUAL = "appmanual";
-
-	/**
-	 * Standardized topic for opening a manual at its beginning.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_HOME = "andtw-home";
-	/**
-	 * Standardized topic for opening the index of a manual.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_INDEX = "andtw-index";
-	/**
-	 * Standardized topic for opening a manual's "about" topic.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_ABOUT_MANUAL = "andtw-about";
-
-	    /**
-     * Convenience function to open a manual at a specific topic. See
-     * {@link #openManual(String, String, Context, String)} for a detailed
-     * description.
-     *
-     * @param manualIdentifier
-     *            the identifier of the manual to open. This identifier must
-     *            uniquely identify the manual as such, independent of the
-     *            particular locale the manual is intended for.
-     * @param topic
-     *            the topic to open. Please do not use spaces for topic names.
-     *            With respect to the TiddlyWiki infrastructure used for manuals
-     *            the topic needs to the tag of a (single) tiddler. This way
-     *            manuals can be localized (especially their topic titles)
-     *            without breaking an app's knowledge about topics. Some
-     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-     *            {@link #TOPIC_ABOUT_MANUAL}.
-     * @param context
-     *            the context (usually an Activity) from which the manual is to
-     *            be opened. In particular, this context is required to derive
-     *            the proper current locale configuration in order to open
-     *            appropriate localized manuals, if installed.
-     *
-     * @exception ActivityNotFoundException
-     *                there is no suitable manual installed and all combinations
-     *                of locale scope failed to activate any manual.
-     *
-     * @see #openManual(String, String, Context, String, boolean)
-     */
-	public static void openManual(String manualIdentifier, String topic,
-			Context context) throws ActivityNotFoundException {
-		openManual(manualIdentifier, topic, context, null, false);
-	}
-
-	        /**
-     * Convenience function to open a manual at a specific topic. See
-     * {@link #openManual(String, String, Context, String)} for a detailed
-     * description.
-     *
-     * @param manualIdentifier
-     *            the identifier of the manual to open. This identifier must
-     *            uniquely identify the manual as such, independent of the
-     *            particular locale the manual is intended for.
-     * @param topic
-     *            the topic to open. Please do not use spaces for topic names.
-     *            With respect to the TiddlyWiki infrastructure used for manuals
-     *            the topic needs to the tag of a (single) tiddler. This way
-     *            manuals can be localized (especially their topic titles)
-     *            without breaking an app's knowledge about topics. Some
-     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-     *            {@link #TOPIC_ABOUT_MANUAL}.
-     * @param context
-     *            the context (usually an Activity) from which the manual is to
-     *            be opened. In particular, this context is required to derive
-     *            the proper current locale configuration in order to open
-     *            appropriate localized manuals, if installed.
-     * @param fallbackUri
-     *            either <code>null</code> or a fallback URI to be used in case
-     *            the user has not installed any suitable manual.
-     *
-     * @exception ActivityNotFoundException
-     *                there is no suitable manual installed and all combinations
-     *                of locale scope failed to activate any manual.
-     *
-     * @see #openManual(String, String, Context, String, boolean)
-     */
-	public static void openManual(String manualIdentifier, String topic,
-			Context context, String fallbackUri)
-			throws ActivityNotFoundException {
-		openManual(manualIdentifier, topic, context, fallbackUri, false);
-	}
-
-	/**
-	 * Opens a manual at a specific topic. At least it tries to open a manual.
-	 * As manuals are (usually) installed separately and we use late binding in
-	 * form of implicit intents, a lot of things can go wrong.
-	 *
-	 * We use late binding and the intent architecture in particular as follows:
-	 * first, we use our own URI scheme called "appmanual". Second, we use the
-	 * host field as a unique manual identifier (such as "c-geo" for the app
-	 * manuals for a map which must not be named by the powers that wanna be).
-	 * Third, a localized manual is differentiated as a path with a single
-	 * element in form of (in this precedence) "/lang_country_variant",
-	 * "/lang__variant", "/lang_country", "/lang", or "/". Fourth, the topic to
-	 * open is encoded as the a fragment "#topic=mytopic".
-	 *
-	 * In order to support localization, manuals can register themselves with
-	 * different URIs.
-	 *
-	 * @param manualIdentifier
-	 *            the identifier of the manual to open. This identifier must
-	 *            uniquely identify the manual as such, independent of the
-	 *            particular locale the manual is intended for.
-	 * @param topic
-	 *            the topic to open. Please do not use spaces for topic names.
-	 *            With respect to the TiddlyWiki infrastructure used for manuals
-	 *            the topic needs to the tag of a (single) tiddler. This way
-	 *            manuals can be localized (especially their topic titles)
-	 *            without breaking an app's knowledge about topics. Some
-	 *            standardized topics are predefined, such as
-	 *            {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-	 *            {@link #TOPIC_ABOUT_MANUAL}.
-	 * @param context
-	 *            the context (usually an Activity) from which the manual is to
-	 *            be opened. In particular, this context is required to derive
-	 *            the proper current locale configuration in order to open
-	 *            appropriate localized manuals, if installed.
-	 * @param fallbackUri
-	 *            either <code>null</code> or a fallback URI to be used in case
-	 *            the user has not installed any suitable manual.
-	 * @param contextAffinity
-	 *            if <code>true</code>, then we try to open the manual within
-	 *            the context, if possible. That is, if the package of the
-	 *            calling context also offers suitable activity registrations,
-	 *            then we will prefer them over any other registrations. If you
-	 *            don't know what this means, then you probably don't need this
-	 *            very special capability and should specify <code>false</code>
-	 *            for this parameter.
-	 *
-	 * @exception ActivityNotFoundException
-	 *                there is no suitable manual installed and all combinations
-	 *                of locale scope failed to activate any manual and no
-	 *                {@literal fallbackUri} was given.
-	 */
-	public static void openManual(String manualIdentifier, String topic,
-            Context context, String fallbackUri, boolean contextAffinity)
-			throws ActivityNotFoundException {
-		//
-		// The path of an "appmanual:" URI consists simply of the locale
-		// information. This allows manual packages to register themselves
-		// for both very specific locales as well as very broad ones.
-		//
-		String localePath = "/"
-				+ context.getResources().getConfiguration().locale.toString();
-		//
-		// We later need this intent in order to try to launch an appropriate
-		// manual (respectively its manual viewer). And yes, we need to set
-		// the intent's category explicitly, even as we will later use
-		// startActivity(): if we don't do this, the proper activity won't be
-		// started albeit the filter almost matches. That dirty behavior (it is
-		// documented wrong) had cost me half a day until I noticed some
-		// informational log entry generated from the ActivityManager. Grrrr!
-		//
-		Intent intent = new Intent(Intent.ACTION_VIEW);
-		int defaultIntentFlags = intent.getFlags();
-		intent.addCategory(Intent.CATEGORY_DEFAULT);
-		//
-		// Try to open the manual in the following order (subject to
-		// availability):
-		// 1. manualIdentifier_lang_country_variant (can also be
-		// manualIdentifier_lang__variant in some cases)
-		// 2. manualIdentifier_lang_country
-		// 3. manualIdentifier_lang
-		// 4. manualIdentifier
-		// Of course, manuals are free to register more than one Intent,
-		// in particular, the should register also the plain manualIdentifier
-		// as a suitable fallback strategy. Even when installing multiple
-		// manuals this doesn't matter, as the user then can choose which
-		// one to use on a single or permanent basis.
-		//
-        while (true) {
-            Uri uri = Uri.parse(URI_SCHEME_APPMANUAL + "://" + manualIdentifier
-					+ localePath + "#topic='" + topic + "'");
-			// Note: we do not use a MIME type for this.
-			intent.setData(uri);
-			intent.setFlags(defaultIntentFlags);
-			if ( contextAffinity ) {
-				//
-				// What is happening here? Well, here we try something that we
-				// would like to call "package affinity activity resolving".
-				// Given an implicit(!) intent we try to figure out whether the
-				// package of the context which is trying to open the manual is
-				// able to resolve the intent. If this is the case, then we
-				// simply turn the implicit intent into an explicit(!) intent.
-				// We do this by setting the concrete module, that is: package
-				// name (eventually the one of the calling context) and class
-				// name within the package.
-				//
-				List<ResolveInfo> capableActivities = context
-						.getPackageManager()
-						.queryIntentActivityOptions(null, null, intent,
-								PackageManager.MATCH_DEFAULT_ONLY);
-				int capables = capableActivities.size();
-				if ( capables > 1 ) {
-					for ( int idx = 0; idx < capables; ++idx ) {
-						ActivityInfo activityInfo = capableActivities.get(idx).activityInfo;
-						if ( activityInfo.packageName.contentEquals(context
-								.getPackageName()) ) {
-							intent.setClassName(activityInfo.packageName,
-									activityInfo.name);
-							//
-							// First match is okay, so we quit searching and
-							// continue with the usual attempt to start the
-							// activity. This should not fail, as we already
-							// found a match; yet the code is very forgiving in
-							// this respect and would just try another round
-							// with "downsized" locale requirements.
-							//
-							break;
-						}
-					}
-				}
-				// FIXME
-				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-			} else {
-				//
-				// No context affinity required, thus we need to set some flags:
-				//
-				// ...NEW_TASK: we want to start the manual reader activity as a
-				// separate
-				// task so that it can be kept open, yet in the background when
-				// returning to the application from which the manual was
-				// opened.
-				//
-				// ...SINGLE_TOP:
-				//
-				// ...RESET_TASK_IF_NEEDED: clear the manual reader activities
-				// down to the root activity. We've set the required
-				// ...CLEAR_WHEN_TASK_RESET above when opening the meta-manual
-				// with the context affinity.
-				//
-				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-						| Intent.FLAG_ACTIVITY_SINGLE_TOP
-						| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-			}
-			try {
-                String logTag = "appmanualclient";
-                if ( Log.isLoggable(logTag, Log.INFO) ) {
-					Log.i(logTag,
-							"Trying to activate manual: uri=" + uri.toString());
-				}
-				context.startActivity(intent);
-				//
-				// We could successfully activate the manual activity, so no
-				// further trials are required.
-				//
-				return;
-			} catch ( ActivityNotFoundException noActivity ) {
-				//
-				// Ensure that we switch back to implicit intent resolving for
-				// the next round.
-				//
-				intent.setComponent(null);
-				//
-				// As long as we still have some locale information, reduce it
-				// and try again a broader locale.
-				//
-				if ( localePath.length() > 1 ) {
-					int underscore = localePath.lastIndexOf('_');
-					if ( underscore > 0 ) {
-						localePath = localePath.substring(0, underscore);
-						//
-						// Handle the case where we have a locale variant, yet
-						// no locale country, thus two underscores in immediate
-						// series. Get rid of both.
-						//
-						if ( localePath.endsWith("_") ) {
-							localePath = localePath
-									.substring(0, underscore - 1);
-						}
-					} else {
-						//
-						// Ready for the last round: try without any locale
-						// modifiers.
-						//
-						localePath = "/";
-					}
-				} else {
-					//
-					// We've tried all combinations, so we've run out of them
-					// and bail out.
-					//
-					break;
-				}
-			}
-			//
-			// Okay, go for the next round, we've updated (or rather trimmed)
-			// the localeIdent, so let us try this.
-			//
-		}
-		//
-		// If we reach this code point then no suitable activity could be found
-		// and activated. In case the caller specified a fallback URI we will
-		// try to open that. As this will activate a suitable browser and this
-		// is an asynchronous activity we won't get back any negative results,
-		// such as 404's. Here we will only see such problems that prevented the
-		// start of a suitable browsing activity.
-		//
-		if ( fallbackUri != null ) {
-			intent = new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUri));
-			intent.addCategory(Intent.CATEGORY_BROWSABLE);
-			context.startActivity(intent);
-		}
-		//
-		// We could not activate any manual and there was no fallback URI to
-		// open, so we finally bail out unsuccessful with an exception.
-		//
-		throw new ActivityNotFoundException();
-	}
-}
diff --git a/main/src/org/openintents/intents/FileManagerIntents.java b/main/src/org/openintents/intents/FileManagerIntents.java
deleted file mode 100644
index 8ff10c8..0000000
--- a/main/src/org/openintents/intents/FileManagerIntents.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* 
- * Copyright (C) 2008 OpenIntents.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.intents;
-
-/**
- * Provides OpenIntents actions, extras, and categories used by providers. 
- * <p>These specifiers extend the standard Android specifiers.</p>
- */
-public final class FileManagerIntents {
-
-	/**
-	 * Activity Action: Pick a file through the file manager, or let user
-	 * specify a custom file name.
-	 * Data is the current file name or file name suggestion.
-	 * Returns a new file name as file URI in data.
-	 * 
-	 * <p>Constant Value: "org.openintents.action.PICK_FILE"</p>
-	 */
-	public static final String ACTION_PICK_FILE = "org.openintents.action.PICK_FILE";
-
-	/**
-	 * Activity Action: Pick a directory through the file manager, or let user
-	 * specify a custom file name.
-	 * Data is the current directory name or directory name suggestion.
-	 * Returns a new directory name as file URI in data.
-	 * 
-	 * <p>Constant Value: "org.openintents.action.PICK_DIRECTORY"</p>
-	 */
-	public static final String ACTION_PICK_DIRECTORY = "org.openintents.action.PICK_DIRECTORY";
-	
-	/**
-	 * Activity Action: Move, copy or delete after select entries.
-     * Data is the current directory name or directory name suggestion.
-     * 
-     * <p>Constant Value: "org.openintents.action.MULTI_SELECT"</p>
-	 */
-	public static final String ACTION_MULTI_SELECT = "org.openintents.action.MULTI_SELECT";
-
-	public static final String ACTION_SEARCH_STARTED = "org.openintents.action.SEARCH_STARTED";
-	
-	public static final String ACTION_SEARCH_FINISHED = "org.openintens.action.SEARCH_FINISHED";
-	
-	/**
-	 * The title to display.
-	 * 
-	 * <p>This is shown in the title bar of the file manager.</p>
-	 * 
-	 * <p>Constant Value: "org.openintents.extra.TITLE"</p>
-	 */
-	public static final String EXTRA_TITLE = "org.openintents.extra.TITLE";
-
-	/**
-	 * The text on the button to display.
-	 * 
-	 * <p>Depending on the use, it makes sense to set this to "Open" or "Save".</p>
-	 * 
-	 * <p>Constant Value: "org.openintents.extra.BUTTON_TEXT"</p>
-	 */
-	public static final String EXTRA_BUTTON_TEXT = "org.openintents.extra.BUTTON_TEXT";
-
-	/**
-	 * Flag indicating to show only writeable files and folders.
-     *
-	 * <p>Constant Value: "org.openintents.extra.WRITEABLE_ONLY"</p>
-	 */
-	public static final String EXTRA_WRITEABLE_ONLY = "org.openintents.extra.WRITEABLE_ONLY";
-
-	/**
-	 * The path to prioritize in search. Usually denotes the path the user was on when the search was initiated.
-	 * 
-     * <p>Constant Value: "org.openintents.extra.SEARCH_INIT_PATH"</p>
-	 */
-	public static final String EXTRA_SEARCH_INIT_PATH = "org.openintents.extra.SEARCH_INIT_PATH";
-
-	/**
-	 * The search query as sent to SearchService.
-	 * 
-     * <p>Constant Value: "org.openintents.extra.SEARCH_QUERY"</p>
-	 */
-	public static final String EXTRA_SEARCH_QUERY = "org.openintents.extra.SEARCH_QUERY";
-
-	/**
-     * <p>Constant Value: "org.openintents.extra.DIR_PATH"</p>
-	 */
-	public static final String EXTRA_DIR_PATH = "org.openintents.extra.DIR_PATH";
-
-	/**
-	 * Extension by which to filter.
-	 * 
-     * <p>Constant Value: "org.openintents.extra.FILTER_FILETYPE"</p>
-	 */
-	public static final String EXTRA_FILTER_FILETYPE = "org.openintents.extra.FILTER_FILETYPE";
-	
-	/**
-	 * Mimetype by which to filter.
-	 * 
-     * <p>Constant Value: "org.openintents.extra.FILTER_MIMETYPE"</p>
-	 */
-	public static final String EXTRA_FILTER_MIMETYPE = "org.openintents.extra.FILTER_MIMETYPE";
-	
-	/**
-	 * Only show directories.
-	 * 
-     * <p>Constant Value: "org.openintents.extra.DIRECTORIES_ONLY"</p>
-	 */
-	public static final String EXTRA_DIRECTORIES_ONLY = "org.openintents.extra.DIRECTORIES_ONLY";
-
-	public static final String EXTRA_DIALOG_FILE_HOLDER = "org.openintents.extra.DIALOG_FILE";
-
-	public static final String EXTRA_IS_GET_CONTENT_INITIATED = "org.openintents.extra.ENABLE_ACTIONS";
-
-	public static final String EXTRA_FILENAME = "org.openintents.extra.FILENAME";
-}
diff --git a/main/thirdparty/android/support/v4/app/FragmentListActivity.java b/main/thirdparty/android/support/v4/app/FragmentListActivity.java
new file mode 100644
index 0000000..e3ed42c
--- /dev/null
+++ b/main/thirdparty/android/support/v4/app/FragmentListActivity.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.support.v4.app;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+/**
+ * An activity that displays a list of items by binding to a data source such as
+ * an array or Cursor, and exposes event handlers when the user selects an item.
+ * <p>
+ * FragmentListActivity hosts a {@link android.widget.ListView ListView} object that can
+ * be bound to different data sources, typically either an array or a Cursor
+ * holding query results. Binding, screen layout, and row layout are discussed
+ * in the following sections.
+ * <p>
+ * <strong>Screen Layout</strong>
+ * </p>
+ * <p>
+ * FragmentListActivity has a default layout that consists of a single, full-screen list
+ * in the center of the screen. However, if you desire, you can customize the
+ * screen layout by setting your own view layout with setContentView() in
+ * onCreate(). To do this, your own view MUST contain a ListView object with the
+ * id "@android:id/list" (or {@link android.R.id#list} if it's in code)
+ * <p>
+ * Optionally, your custom view can contain another view object of any type to
+ * display when the list view is empty. This "empty list" notifier must have an
+ * id "android:empty". Note that when an empty view is present, the list view
+ * will be hidden when there is no data to display.
+ * <p>
+ * The following code demonstrates an (ugly) custom screen layout. It has a list
+ * with a green background, and an alternate red "no data" message.
+ * </p>
+ * 
+ * <pre>
+ * &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+ * &lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ *         android:orientation=&quot;vertical&quot;
+ *         android:layout_width=&quot;fill_parent&quot; 
+ *         android:layout_height=&quot;fill_parent&quot;
+ *         android:paddingLeft=&quot;8dp&quot;
+ *         android:paddingRight=&quot;8dp&quot;&gt;
+ * 
+ *     &lt;ListView android:id=&quot;@id/android:list&quot;
+ *               android:layout_width=&quot;fill_parent&quot; 
+ *               android:layout_height=&quot;fill_parent&quot;
+ *               android:background=&quot;#00FF00&quot;
+ *               android:layout_weight=&quot;1&quot;
+ *               android:drawSelectorOnTop=&quot;false&quot;/&gt;
+ * 
+ *     &lt;TextView android:id=&quot;@id/android:empty&quot;
+ *               android:layout_width=&quot;fill_parent&quot; 
+ *               android:layout_height=&quot;fill_parent&quot;
+ *               android:background=&quot;#FF0000&quot;
+ *               android:text=&quot;No data&quot;/&gt;
+ * &lt;/LinearLayout&gt;
+ * </pre>
+ * 
+ * <p>
+ * <strong>Row Layout</strong>
+ * </p>
+ * <p>
+ * You can specify the layout of individual rows in the list. You do this by
+ * specifying a layout resource in the ListAdapter object hosted by the activity
+ * (the ListAdapter binds the ListView to the data; more on this later).
+ * <p>
+ * A ListAdapter constructor takes a parameter that specifies a layout resource
+ * for each row. It also has two additional parameters that let you specify
+ * which data field to associate with which object in the row layout resource.
+ * These two parameters are typically parallel arrays.
+ * </p>
+ * <p>
+ * Android provides some standard row layout resources. These are in the
+ * {@link android.R.layout} class, and have names such as simple_list_item_1,
+ * simple_list_item_2, and two_line_list_item. The following layout XML is the
+ * source for the resource two_line_list_item, which displays two data
+ * fields,one above the other, for each list row.
+ * </p>
+ * 
+ * <pre>
+ * &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+ * &lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ *     android:layout_width=&quot;fill_parent&quot;
+ *     android:layout_height=&quot;wrap_content&quot;
+ *     android:orientation=&quot;vertical&quot;&gt;
+ * 
+ *     &lt;TextView android:id=&quot;@+id/text1&quot;
+ *         android:textSize=&quot;16sp&quot;
+ *         android:textStyle=&quot;bold&quot;
+ *         android:layout_width=&quot;fill_parent&quot;
+ *         android:layout_height=&quot;wrap_content&quot;/&gt;
+ * 
+ *     &lt;TextView android:id=&quot;@+id/text2&quot;
+ *         android:textSize=&quot;16sp&quot;
+ *         android:layout_width=&quot;fill_parent&quot;
+ *         android:layout_height=&quot;wrap_content&quot;/&gt;
+ * &lt;/LinearLayout&gt;
+ * </pre>
+ * 
+ * <p>
+ * You must identify the data bound to each TextView object in this layout. The
+ * syntax for this is discussed in the next section.
+ * </p>
+ * <p>
+ * <strong>Binding to Data</strong>
+ * </p>
+ * <p>
+ * You bind the FragmentListActivity's ListView object to data using a class that
+ * implements the {@link android.widget.ListAdapter ListAdapter} interface.
+ * Android provides two standard list adapters:
+ * {@link android.widget.SimpleAdapter SimpleAdapter} for static data (Maps),
+ * and {@link android.widget.SimpleCursorAdapter SimpleCursorAdapter} for Cursor
+ * query results.
+ * </p>
+ * <p>
+ * The following code from a custom FragmentListActivity demonstrates querying the
+ * Contacts provider for all contacts, then binding the Name and Company fields
+ * to a two line row layout in the activity's ListView.
+ * </p>
+ * 
+ * <pre>
+ * public class MyListAdapter extends FragmentListActivity {
+ * 
+ *     &#064;Override
+ *     protected void onCreate(Bundle savedInstanceState){
+ *         super.onCreate(savedInstanceState);
+ * 
+ *         // We'll define a custom screen layout here (the one shown above), but
+ *         // typically, you could just use the standard FragmentListActivity layout.
+ *         setContentView(R.layout.custom_list_activity_view);
+ * 
+ *         // Query for all people contacts using the {@link android.provider.Contacts.People} convenience class.
+ *         // Put a managed wrapper around the retrieved cursor so we don't have to worry about
+ *         // requerying or closing it as the activity changes state.
+ *         mCursor = this.getContentResolver().query(People.CONTENT_URI, null, null, null, null);
+ *         startManagingCursor(mCursor);
+ * 
+ *         // Now create a new list adapter bound to the cursor. 
+ *         // SimpleListAdapter is designed for binding to a Cursor.
+ *         ListAdapter adapter = new SimpleCursorAdapter(
+ *                 this, // Context.
+ *                 android.R.layout.two_line_list_item,  // Specify the row template to use (here, two columns bound to the two retrieved cursor 
+ * rows).
+ *                 mCursor,                                              // Pass in the cursor to bind to.
+ *                 new String[] {People.NAME, People.COMPANY},           // Array of cursor columns to bind to.
+ *                 new int[] {android.R.id.text1, android.R.id.text2});  // Parallel array of which template objects to bind to those columns.
+ * 
+ *         // Bind to our new adapter.
+ *         setListAdapter(adapter);
+ *     }
+ * }
+ * </pre>
+ * 
+ * @see #setListAdapter
+ * @see android.widget.ListView
+ */
+public class FragmentListActivity extends FragmentActivity {
+    /**
+     * This field should be made private, so it is hidden from the SDK.
+     * {@hide}
+     */
+    protected ListAdapter mAdapter;
+    /**
+     * This field should be made private, so it is hidden from the SDK.
+     * {@hide}
+     */
+    protected ListView mList;
+
+    private Handler mHandler = new Handler();
+    private boolean mFinishedStart = false;
+
+    private Runnable mRequestFocus = new Runnable() {
+        @Override
+        public void run() {
+            mList.focusableViewAvailable(mList);
+        }
+    };
+    
+    /**
+     * This method will be called when an item in the list is selected.
+     * Subclasses should override. Subclasses can call
+     * getListView().getItemAtPosition(position) if they need to access the
+     * data associated with the selected item.
+     * 
+     * @param l The ListView where the click happened
+     * @param v The view that was clicked within the ListView
+     * @param position The position of the view in the list
+     * @param id The row id of the item that was clicked
+     */
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+    }
+    
+    /**
+     * Ensures the list view has been created before Activity restores all
+     * of the view states.
+     * 
+     *@see Activity#onRestoreInstanceState(Bundle)
+     */
+    @Override
+    protected void onRestoreInstanceState(Bundle state) {
+        ensureList();
+        super.onRestoreInstanceState(state);
+    }
+
+    /**
+     * Updates the screen state (current list and other views) when the
+     * content changes.
+     * 
+     * @see Activity#onContentChanged()
+     */
+    @Override
+    public void onContentChanged() {
+        super.onContentChanged();
+        View emptyView = findViewById(android.R.id.empty);
+        mList = (ListView)findViewById(android.R.id.list);
+        if (mList == null) {
+            throw new RuntimeException(
+                    "Your content must have a ListView whose id attribute is " +
+                    "'android.R.id.list'");
+        }
+        if (emptyView != null) {
+            mList.setEmptyView(emptyView);
+        }
+        mList.setOnItemClickListener(mOnClickListener);
+        if (mFinishedStart) {
+            setListAdapter(mAdapter);
+        }
+        mHandler.post(mRequestFocus);
+        mFinishedStart = true;
+    }
+
+    /**
+     * Provide the cursor for the list view.
+     */
+    public void setListAdapter(ListAdapter adapter) {
+        synchronized (this) {
+            ensureList();
+            mAdapter = adapter;
+            mList.setAdapter(adapter);
+        }
+    }
+
+    /**
+     * Set the currently selected list item to the specified
+     * position with the adapter's data
+     * 
+     * @param position
+     */
+    public void setSelection(int position) {
+        mList.setSelection(position);
+    }
+
+    /**
+     * Get the position of the currently selected list item.
+     */
+    public int getSelectedItemPosition() {
+        return mList.getSelectedItemPosition();
+    }
+
+    /**
+     * Get the cursor row ID of the currently selected list item.
+     */
+    public long getSelectedItemId() {
+        return mList.getSelectedItemId();
+    }
+
+    /**
+     * Get the activity's list view widget.
+     */
+    public ListView getListView() {
+        ensureList();
+        return mList;
+    }
+    
+    /**
+     * Get the ListAdapter associated with this activity's ListView.
+     */
+    public ListAdapter getListAdapter() {
+        return mAdapter;
+    }
+
+    private void ensureList() {
+        if (mList != null) {
+            return;
+        }
+        setContentView(android.R.layout.list_content);
+        
+    }
+
+    private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View v, int position, long id)
+        {
+            onListItemClick((ListView)parent, v, position, id);
+        }
+    };
+}
+
diff --git a/main/thirdparty/cgeo/org/kxml2/io/KXmlSerializer.java b/main/thirdparty/cgeo/org/kxml2/io/KXmlSerializer.java
new file mode 100644
index 0000000..027ff53
--- /dev/null
+++ b/main/thirdparty/cgeo/org/kxml2/io/KXmlSerializer.java
@@ -0,0 +1,605 @@
+/*
+ * Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package cgeo.org.kxml2.io;
+
+import org.apache.commons.lang3.StringUtils;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Locale;
+
+public class KXmlSerializer implements XmlSerializer {
+
+    //    static final String UNDEFINED = ":";
+
+    // BEGIN android-added
+    /** size (in characters) for the write buffer */
+    private static final int WRITE_BUFFER_SIZE = 500;
+    // END android-added
+
+    // BEGIN android-changed
+    // (Guarantee that the writer is always buffered.)
+    private BufferedWriter writer;
+    // END android-changed
+
+    private boolean pending;
+    private int auto;
+    private int depth;
+
+    private String[] elementStack = new String[12];
+    //nsp/prefix/name
+    private int[] nspCounts = new int[4];
+    private String[] nspStack = new String[8];
+    //prefix/nsp; both empty are ""
+    private boolean[] indent = new boolean[4];
+    private boolean unicode;
+    private String encoding;
+
+    private final void check(boolean close) throws IOException {
+        if (!pending) {
+            return;
+        }
+
+        depth++;
+        pending = false;
+
+        if (indent.length <= depth) {
+            boolean[] hlp = new boolean[depth + 4];
+            System.arraycopy(indent, 0, hlp, 0, depth);
+            indent = hlp;
+        }
+        indent[depth] = indent[depth - 1];
+
+        for (int i = nspCounts[depth - 1]; i < nspCounts[depth]; i++) {
+            writer.write(' ');
+            writer.write("xmlns");
+            if (!StringUtils.isEmpty(nspStack[i * 2])) {
+                writer.write(':');
+                writer.write(nspStack[i * 2]);
+            }
+            else if (StringUtils.isEmpty(getNamespace()) && !StringUtils.isEmpty(nspStack[i * 2 + 1])) {
+                throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
+            }
+            writer.write("=\"");
+            writeEscaped(nspStack[i * 2 + 1], '"');
+            writer.write('"');
+        }
+
+        if (nspCounts.length <= depth + 1) {
+            int[] hlp = new int[depth + 8];
+            System.arraycopy(nspCounts, 0, hlp, 0, depth + 1);
+            nspCounts = hlp;
+        }
+
+        nspCounts[depth + 1] = nspCounts[depth];
+        //   nspCounts[depth + 2] = nspCounts[depth];
+
+        writer.write(close ? " />" : ">");
+    }
+
+    private final void writeEscaped(String s, int quot) throws IOException {
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '\n':
+                case '\r':
+                case '\t':
+                    if (quot == -1) {
+                        writer.write(c);
+                    } else {
+                        writer.write("&#"+((int) c)+';');
+                    }
+                    break;
+                case '&':
+                    writer.write("&amp;");
+                    break;
+                case '>':
+                    writer.write("&gt;");
+                    break;
+                case '<':
+                    writer.write("&lt;");
+                    break;
+                default:
+                    if (c == quot) {
+                        writer.write(c == '"' ? "&quot;" : "&apos;");
+                        break;
+                    }
+                    // BEGIN android-changed: refuse to output invalid characters
+                    // See http://www.w3.org/TR/REC-xml/#charsets for definition.
+                    // Corrected for c:geo to handle utf-16 codepoint surrogates correctly
+                    // See http://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B10000_to_U.2B10FFFF
+                    // Note: tab, newline, and carriage return have already been
+                    // handled above.
+                    // Check for lead surrogate
+                    if (c >= 0xd800 && c <= 0xdbff) {
+
+                        if (i + 1 < s.length()) {
+                            writer.write(s.substring(i, i + 1));
+                            i++;
+                            break;
+                        }
+                        // if the lead surrogate is at the string end, it's not valid utf-16
+                        reportInvalidCharacter(c);
+                    }
+                    boolean valid = (c >= 0x20 && c <= 0xd7ff) || (c >= 0xe000 && c <= 0xfffd);
+                    if (!valid) {
+                        reportInvalidCharacter(c);
+                    }
+                    if (unicode || c < 127) {
+                        writer.write(c);
+                    } else {
+                        writer.write("&#" + ((int) c) + ";");
+                    }
+                    // END android-changed
+            }
+        }
+    }
+
+    // BEGIN android-added
+    private static void reportInvalidCharacter(char ch) {
+        throw new IllegalArgumentException("Illegal character (" + Integer.toHexString((int) ch) + ")");
+    }
+    // END android-added
+
+    /*
+     * private final void writeIndent() throws IOException {
+     * writer.write("\r\n");
+     * for (int i = 0; i < depth; i++)
+     * writer.write(' ');
+     * }
+     */
+
+    public void docdecl(String dd) throws IOException {
+        writer.write("<!DOCTYPE");
+        writer.write(dd);
+        writer.write(">");
+    }
+
+    public void endDocument() throws IOException {
+        while (depth > 0) {
+            endTag(elementStack[depth * 3 - 3], elementStack[depth * 3 - 1]);
+        }
+        flush();
+    }
+
+    public void entityRef(String name) throws IOException {
+        check(false);
+        writer.write('&');
+        writer.write(name);
+        writer.write(';');
+    }
+
+    public boolean getFeature(String name) {
+        //return false;
+        return ("http://xmlpull.org/v1/doc/features.html#indent-output"
+                .equals(
+                name))
+                ? indent[depth]
+                : false;
+    }
+
+    public String getPrefix(String namespace, boolean create) {
+        try {
+            return getPrefix(namespace, false, create);
+        } catch (IOException e) {
+            throw new RuntimeException(e.toString());
+        }
+    }
+
+    private final String getPrefix(
+            String namespace,
+            boolean includeDefault,
+            boolean create)
+            throws IOException {
+
+        for (int i = nspCounts[depth + 1] * 2 - 2; i >= 0; i -= 2) {
+            if (nspStack[i + 1].equals(namespace)
+                    && (includeDefault || !StringUtils.isEmpty(nspStack[i]))) {
+                String cand = nspStack[i];
+                for (int j = i + 2; j < nspCounts[depth + 1] * 2; j++) {
+                    if (nspStack[j].equals(cand)) {
+                        cand = null;
+                        break;
+                    }
+                }
+                if (cand != null) {
+                    return cand;
+                }
+            }
+        }
+
+        if (!create) {
+            return null;
+        }
+
+        String prefix;
+
+        if (StringUtils.isEmpty(namespace)) {
+            prefix = "";
+        } else {
+            do {
+                prefix = "n" + (auto++);
+                for (int i = nspCounts[depth + 1] * 2 - 2; i >= 0; i -= 2) {
+                    if (prefix.equals(nspStack[i])) {
+                        prefix = null;
+                        break;
+                    }
+                }
+            } while (prefix == null);
+        }
+
+        boolean p = pending;
+        pending = false;
+        setPrefix(prefix, namespace);
+        pending = p;
+        return prefix;
+    }
+
+    public Object getProperty(String name) {
+        throw new RuntimeException("Unsupported property");
+    }
+
+    public void ignorableWhitespace(String s)
+            throws IOException {
+        text(s);
+    }
+
+    public void setFeature(String name, boolean value) {
+        if ("http://xmlpull.org/v1/doc/features.html#indent-output"
+                .equals(name)) {
+            indent[depth] = value;
+        } else {
+            throw new RuntimeException("Unsupported Feature");
+        }
+    }
+
+    public void setProperty(String name, Object value) {
+        throw new RuntimeException(
+                "Unsupported Property:" + value);
+    }
+
+    public void setPrefix(String prefix, String namespace)
+            throws IOException {
+
+        check(false);
+        if (prefix == null) {
+            prefix = "";
+        }
+        if (namespace == null) {
+            namespace = "";
+        }
+
+        String defined = getPrefix(namespace, true, false);
+
+        // boil out if already defined
+
+        if (prefix.equals(defined)) {
+            return;
+        }
+
+        int pos = (nspCounts[depth + 1]++) << 1;
+
+        if (nspStack.length < pos + 1) {
+            String[] hlp = new String[nspStack.length + 16];
+            System.arraycopy(nspStack, 0, hlp, 0, pos);
+            nspStack = hlp;
+        }
+
+        nspStack[pos++] = prefix;
+        nspStack[pos] = namespace;
+    }
+
+    public void setOutput(Writer writer) {
+        // BEGIN android-changed
+        // Guarantee that the writer is always buffered.
+        if (writer instanceof BufferedWriter) {
+            this.writer = (BufferedWriter) writer;
+        } else {
+            this.writer = new BufferedWriter(writer, WRITE_BUFFER_SIZE);
+        }
+        // END android-changed
+
+        // elementStack = new String[12]; //nsp/prefix/name
+        //nspCounts = new int[4];
+        //nspStack = new String[8]; //prefix/nsp
+        //indent = new boolean[4];
+
+        nspCounts[0] = 2;
+        nspCounts[1] = 2;
+        nspStack[0] = "";
+        nspStack[1] = "";
+        nspStack[2] = "xml";
+        nspStack[3] = "http://www.w3.org/XML/1998/namespace";
+        pending = false;
+        auto = 0;
+        depth = 0;
+
+        unicode = false;
+    }
+
+    public void setOutput(OutputStream os, String encoding)
+            throws IOException {
+        if (os == null) {
+            throw new IllegalArgumentException("os == null");
+        }
+        setOutput(encoding == null
+                ? new OutputStreamWriter(os)
+                : new OutputStreamWriter(os, encoding));
+        this.encoding = encoding;
+        if (encoding != null && encoding.toLowerCase(Locale.US).startsWith("utf")) {
+            unicode = true;
+        }
+    }
+
+    public void startDocument(String encoding, Boolean standalone) throws IOException {
+        writer.write("<?xml version='1.0' ");
+
+        if (encoding != null) {
+            this.encoding = encoding;
+            if (encoding.toLowerCase(Locale.US).startsWith("utf")) {
+                unicode = true;
+            }
+        }
+
+        if (this.encoding != null) {
+            writer.write("encoding='");
+            writer.write(this.encoding);
+            writer.write("' ");
+        }
+
+        if (standalone != null) {
+            writer.write("standalone='");
+            writer.write(
+                    standalone.booleanValue() ? "yes" : "no");
+            writer.write("' ");
+        }
+        writer.write("?>");
+    }
+
+    public XmlSerializer startTag(String namespace, String name)
+            throws IOException {
+        check(false);
+
+        //        if (namespace == null)
+        //            namespace = "";
+
+        if (indent[depth]) {
+            writer.write("\r\n");
+            for (int i = 0; i < depth; i++) {
+                writer.write("  ");
+            }
+        }
+
+        int esp = depth * 3;
+
+        if (elementStack.length < esp + 3) {
+            String[] hlp = new String[elementStack.length + 12];
+            System.arraycopy(elementStack, 0, hlp, 0, esp);
+            elementStack = hlp;
+        }
+
+        String prefix =
+                namespace == null
+                        ? ""
+                        : getPrefix(namespace, true, true);
+
+        if (namespace != null && StringUtils.isEmpty(namespace)) {
+            for (int i = nspCounts[depth]; i < nspCounts[depth + 1]; i++) {
+                if (StringUtils.isEmpty(nspStack[i * 2]) && !StringUtils.isEmpty(nspStack[i * 2 + 1])) {
+                    throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
+                }
+            }
+        }
+
+        elementStack[esp++] = namespace;
+        elementStack[esp++] = prefix;
+        elementStack[esp] = name;
+
+        writer.write('<');
+        if (!StringUtils.isEmpty(prefix)) {
+            writer.write(prefix);
+            writer.write(':');
+        }
+
+        writer.write(name);
+
+        pending = true;
+
+        return this;
+    }
+
+    public XmlSerializer attribute(
+            String namespace,
+            String name,
+            String value)
+            throws IOException {
+        if (!pending) {
+            throw new IllegalStateException("illegal position for attribute");
+        }
+
+        //        int cnt = nspCounts[depth];
+
+        if (namespace == null) {
+            namespace = "";
+        }
+
+        //        depth--;
+        //        pending = false;
+
+        String prefix =
+                StringUtils.isEmpty(namespace)
+                        ? ""
+                        : getPrefix(namespace, false, true);
+
+        //        pending = true;
+        //        depth++;
+
+        /*
+         * if (cnt != nspCounts[depth]) {
+         * writer.write(' ');
+         * writer.write("xmlns");
+         * if (nspStack[cnt * 2] != null) {
+         * writer.write(':');
+         * writer.write(nspStack[cnt * 2]);
+         * }
+         * writer.write("=\"");
+         * writeEscaped(nspStack[cnt * 2 + 1], '"');
+         * writer.write('"');
+         * }
+         */
+
+        writer.write(' ');
+        if (!StringUtils.isEmpty(prefix)) {
+            writer.write(prefix);
+            writer.write(':');
+        }
+        writer.write(name);
+        writer.write('=');
+        char q = value.indexOf('"') == -1 ? '"' : '\'';
+        writer.write(q);
+        writeEscaped(value, q);
+        writer.write(q);
+
+        return this;
+    }
+
+    public void flush() throws IOException {
+        check(false);
+        writer.flush();
+    }
+
+    /*
+     * public void close() throws IOException {
+     * check();
+     * writer.close();
+     * }
+     */
+    public XmlSerializer endTag(String namespace, String name)
+            throws IOException {
+
+        if (!pending)
+         {
+            depth--;
+        //        if (namespace == null)
+        //          namespace = "";
+        }
+
+        if ((namespace == null
+                && elementStack[depth * 3] != null)
+                || (namespace != null
+                && !namespace.equals(elementStack[depth * 3]))
+                || !elementStack[depth * 3 + 2].equals(name)) {
+            throw new IllegalArgumentException("</{"+namespace+"}"+name+"> does not match start");
+        }
+
+        if (pending) {
+            check(true);
+            depth--;
+        }
+        else {
+            if (indent[depth + 1]) {
+                writer.write("\r\n");
+                for (int i = 0; i < depth; i++) {
+                    writer.write("  ");
+                }
+            }
+
+            writer.write("</");
+            String prefix = elementStack[depth * 3 + 1];
+            if (!StringUtils.isEmpty(prefix)) {
+                writer.write(prefix);
+                writer.write(':');
+            }
+            writer.write(name);
+            writer.write('>');
+        }
+
+        nspCounts[depth + 1] = nspCounts[depth];
+        return this;
+    }
+
+    public String getNamespace() {
+        return getDepth() == 0 ? null : elementStack[getDepth() * 3 - 3];
+    }
+
+    public String getName() {
+        return getDepth() == 0 ? null : elementStack[getDepth() * 3 - 1];
+    }
+
+    public int getDepth() {
+        return pending ? depth + 1 : depth;
+    }
+
+    public XmlSerializer text(String text) throws IOException {
+        check(false);
+        indent[depth] = false;
+        writeEscaped(text, -1);
+        return this;
+    }
+
+    public XmlSerializer text(char[] text, int start, int len)
+            throws IOException {
+        text(new String(text, start, len));
+        return this;
+    }
+
+    public void cdsect(String data) throws IOException {
+        check(false);
+        // BEGIN android-changed: ]]> is not allowed within a CDATA,
+        // so break and start a new one when necessary.
+        data = data.replace("]]>", "]]]]><![CDATA[>");
+        char[] chars = data.toCharArray();
+        // We also aren't allowed any invalid characters.
+        for (char ch : chars) {
+            boolean valid = (ch >= 0x20 && ch <= 0xd7ff) ||
+                    (ch == '\t' || ch == '\n' || ch == '\r') ||
+                    (ch >= 0xe000 && ch <= 0xfffd);
+            if (!valid) {
+                reportInvalidCharacter(ch);
+            }
+        }
+        writer.write("<![CDATA[");
+        writer.write(chars, 0, chars.length);
+        writer.write("]]>");
+        // END android-changed
+    }
+
+    public void comment(String comment) throws IOException {
+        check(false);
+        writer.write("<!--");
+        writer.write(comment);
+        writer.write("-->");
+    }
+
+    public void processingInstruction(String pi)
+            throws IOException {
+        check(false);
+        writer.write("<?");
+        writer.write(pi);
+        writer.write("?>");
+    }
+}
\ No newline at end of file
diff --git a/main/thirdparty/com/viewpagerindicator/PageIndicator.java b/main/thirdparty/com/viewpagerindicator/PageIndicator.java
new file mode 100644
index 0000000..26414d8
--- /dev/null
+++ b/main/thirdparty/com/viewpagerindicator/PageIndicator.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.viewpagerindicator;
+
+import android.support.v4.view.ViewPager;
+
+/**
+ * A PageIndicator is responsible to show an visual indicator on the total views
+ * number and the current visible view.
+ */
+public interface PageIndicator extends ViewPager.OnPageChangeListener {
+    /**
+     * Bind the indicator to a ViewPager.
+     *
+     * @param view
+     */
+    public void setViewPager(ViewPager view);
+
+    /**
+     * Bind the indicator to a ViewPager.
+     *
+     * @param view
+     * @param initialPosition
+     */
+    public void setViewPager(ViewPager view, int initialPosition);
+
+    /**
+     * <p>Set the current page of both the ViewPager and indicator.</p>
+     *
+     * <p>This <strong>must</strong> be used if you need to set the page before
+     * the views are drawn on screen (e.g., default start page).</p>
+     *
+     * @param item
+     */
+    public void setCurrentItem(int item);
+
+    /**
+     * Set a page change listener which will receive forwarded events.
+     *
+     * @param listener
+     */
+    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener);
+
+    /**
+     * Notify the indicator that the fragment list has changed.
+     */
+    public void notifyDataSetChanged();
+}
diff --git a/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java b/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java
new file mode 100644
index 0000000..94ac962
--- /dev/null
+++ b/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java
@@ -0,0 +1,771 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ * Copyright (C) 2011 Francisco Figueiredo Jr.
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+import cgeo.geocaching.R;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewConfigurationCompat;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+import java.util.ArrayList;
+
+/**
+ * A TitlePageIndicator is a PageIndicator which displays the title of left view
+ * (if exist), the title of the current select view (centered) and the title of
+ * the right view (if exist). When the user scrolls the ViewPager then titles are
+ * also scrolled.
+ */
+public class TitlePageIndicator extends View implements PageIndicator {
+    /**
+     * Percentage indicating what percentage of the screen width away from
+     * center should the underline be fully faded. A value of 0.25 means that
+     * halfway between the center of the screen and an edge.
+     */
+    private static final float SELECTION_FADE_PERCENTAGE = 0.25f;
+
+    /**
+     * Percentage indicating what percentage of the screen width away from
+     * center should the selected text bold turn off. A value of 0.05 means
+     * that 10% between the center and an edge.
+     */
+    private static final float BOLD_FADE_PERCENTAGE = 0.05f;
+
+    public enum IndicatorStyle {
+        None(0), Triangle(1), Underline(2);
+
+        public final int value;
+
+        IndicatorStyle(int value) {
+            this.value = value;
+        }
+
+        public static IndicatorStyle fromValue(int value) {
+            for (IndicatorStyle style : IndicatorStyle.values()) {
+                if (style.value == value) {
+                    return style;
+                }
+            }
+            return null;
+        }
+    }
+
+    private ViewPager mViewPager;
+    private ViewPager.OnPageChangeListener mListener;
+    private TitleProvider mTitleProvider;
+    private int mCurrentPage;
+    private int mCurrentOffset;
+    private int mScrollState;
+    private final Paint mPaintText;
+    private boolean mBoldText;
+    private int mColorText;
+    private int mColorSelected;
+    private Path mPath = new Path();
+    private final Paint mPaintFooterLine;
+    private IndicatorStyle mFooterIndicatorStyle;
+    private final Paint mPaintFooterIndicator;
+    private float mFooterIndicatorHeight;
+    private float mFooterIndicatorUnderlinePadding;
+    private float mFooterPadding;
+    private float mTitlePadding;
+    private float mTopPadding;
+    /** Left and right side padding for not active view titles. */
+    private float mClipPadding;
+    private float mFooterLineHeight;
+
+    private static final int INVALID_POINTER = -1;
+
+    private int mTouchSlop;
+    private float mLastMotionX = -1;
+    private int mActivePointerId = INVALID_POINTER;
+    private boolean mIsDragging;
+
+
+    public TitlePageIndicator(Context context) {
+        this(context, null);
+    }
+
+    public TitlePageIndicator(Context context, AttributeSet attrs) {
+        this(context, attrs, R.attr.vpiTitlePageIndicatorStyle);
+    }
+
+    public TitlePageIndicator(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        //Load defaults from resources
+        final Resources res = getResources();
+        final int defaultFooterColor = res.getColor(R.color.default_title_indicator_footer_color);
+        final float defaultFooterLineHeight = res.getDimension(R.dimen.default_title_indicator_footer_line_height);
+        final int defaultFooterIndicatorStyle = res.getInteger(R.integer.default_title_indicator_footer_indicator_style);
+        final float defaultFooterIndicatorHeight = res.getDimension(R.dimen.default_title_indicator_footer_indicator_height);
+        final float defaultFooterIndicatorUnderlinePadding = res.getDimension(R.dimen.default_title_indicator_footer_indicator_underline_padding);
+        final float defaultFooterPadding = res.getDimension(R.dimen.default_title_indicator_footer_padding);
+        final int defaultSelectedColor = res.getColor(R.color.default_title_indicator_selected_color);
+        final boolean defaultSelectedBold = res.getBoolean(R.bool.default_title_indicator_selected_bold);
+        final int defaultTextColor = res.getColor(R.color.default_title_indicator_text_color);
+        final float defaultTextSize = res.getDimension(R.dimen.default_title_indicator_text_size);
+        final float defaultTitlePadding = res.getDimension(R.dimen.default_title_indicator_title_padding);
+        final float defaultClipPadding = res.getDimension(R.dimen.default_title_indicator_clip_padding);
+        final float defaultTopPadding = res.getDimension(R.dimen.default_title_indicator_top_padding);
+
+        //Retrieve styles attributes
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TitlePageIndicator, defStyle, R.style.Widget_TitlePageIndicator);
+
+        //Retrieve the colors to be used for this view and apply them.
+        mFooterLineHeight = a.getDimension(R.styleable.TitlePageIndicator_footerLineHeight, defaultFooterLineHeight);
+        mFooterIndicatorStyle = IndicatorStyle.fromValue(a.getInteger(R.styleable.TitlePageIndicator_footerIndicatorStyle, defaultFooterIndicatorStyle));
+        mFooterIndicatorHeight = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorHeight, defaultFooterIndicatorHeight);
+        mFooterIndicatorUnderlinePadding = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorUnderlinePadding, defaultFooterIndicatorUnderlinePadding);
+        mFooterPadding = a.getDimension(R.styleable.TitlePageIndicator_footerPadding, defaultFooterPadding);
+        mTopPadding = a.getDimension(R.styleable.TitlePageIndicator_topPadding, defaultTopPadding);
+        mTitlePadding = a.getDimension(R.styleable.TitlePageIndicator_titlePadding, defaultTitlePadding);
+        mClipPadding = a.getDimension(R.styleable.TitlePageIndicator_clipPadding, defaultClipPadding);
+        mColorSelected = a.getColor(R.styleable.TitlePageIndicator_selectedColor, defaultSelectedColor);
+        mColorText = a.getColor(R.styleable.TitlePageIndicator_textColor, defaultTextColor);
+        mBoldText = a.getBoolean(R.styleable.TitlePageIndicator_selectedBold, defaultSelectedBold);
+
+        final float textSize = a.getDimension(R.styleable.TitlePageIndicator_textSize, defaultTextSize);
+        final int footerColor = a.getColor(R.styleable.TitlePageIndicator_footerColor, defaultFooterColor);
+        mPaintText = new Paint();
+        mPaintText.setTextSize(textSize);
+        mPaintText.setAntiAlias(true);
+        mPaintFooterLine = new Paint();
+        mPaintFooterLine.setStyle(Paint.Style.FILL_AND_STROKE);
+        mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
+        mPaintFooterLine.setColor(footerColor);
+        mPaintFooterIndicator = new Paint();
+        mPaintFooterIndicator.setStyle(Paint.Style.FILL_AND_STROKE);
+        mPaintFooterIndicator.setColor(footerColor);
+
+        a.recycle();
+
+        final ViewConfiguration configuration = ViewConfiguration.get(context);
+        mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration);
+    }
+
+
+    public int getFooterColor() {
+        return mPaintFooterLine.getColor();
+    }
+
+    public void setFooterColor(int footerColor) {
+        mPaintFooterLine.setColor(footerColor);
+        mPaintFooterIndicator.setColor(footerColor);
+        invalidate();
+    }
+
+    public float getFooterLineHeight() {
+        return mFooterLineHeight;
+    }
+
+    public void setFooterLineHeight(float footerLineHeight) {
+        mFooterLineHeight = footerLineHeight;
+        mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
+        invalidate();
+    }
+
+    public float getFooterIndicatorHeight() {
+        return mFooterIndicatorHeight;
+    }
+
+    public void setFooterIndicatorHeight(float footerTriangleHeight) {
+        mFooterIndicatorHeight = footerTriangleHeight;
+        invalidate();
+    }
+
+    public float getFooterIndicatorPadding() {
+        return mFooterPadding;
+    }
+
+    public void setFooterIndicatorPadding(float footerIndicatorPadding) {
+        mFooterPadding = footerIndicatorPadding;
+        invalidate();
+    }
+
+    public IndicatorStyle getFooterIndicatorStyle() {
+        return mFooterIndicatorStyle;
+    }
+
+    public void setFooterIndicatorStyle(IndicatorStyle indicatorStyle) {
+        mFooterIndicatorStyle = indicatorStyle;
+        invalidate();
+    }
+
+    public int getSelectedColor() {
+        return mColorSelected;
+    }
+
+    public void setSelectedColor(int selectedColor) {
+        mColorSelected = selectedColor;
+        invalidate();
+    }
+
+    public boolean isSelectedBold() {
+        return mBoldText;
+    }
+
+    public void setSelectedBold(boolean selectedBold) {
+        mBoldText = selectedBold;
+        invalidate();
+    }
+
+    public int getTextColor() {
+        return mColorText;
+    }
+
+    public void setTextColor(int textColor) {
+        mPaintText.setColor(textColor);
+        mColorText = textColor;
+        invalidate();
+    }
+
+    public float getTextSize() {
+        return mPaintText.getTextSize();
+    }
+
+    public void setTextSize(float textSize) {
+        mPaintText.setTextSize(textSize);
+        invalidate();
+    }
+
+    public float getTitlePadding() {
+        return this.mTitlePadding;
+    }
+
+    public void setTitlePadding(float titlePadding) {
+        mTitlePadding = titlePadding;
+        invalidate();
+    }
+
+    public float getTopPadding() {
+        return this.mTopPadding;
+    }
+
+    public void setTopPadding(float topPadding) {
+        mTopPadding = topPadding;
+        invalidate();
+    }
+
+    public float getClipPadding() {
+        return this.mClipPadding;
+    }
+
+    public void setClipPadding(float clipPadding) {
+        mClipPadding = clipPadding;
+        invalidate();
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see android.view.View#onDraw(android.graphics.Canvas)
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (mViewPager == null) {
+            return;
+        }
+        final int count = mViewPager.getAdapter().getCount();
+        if (count == 0) {
+            return;
+        }
+
+        //Calculate views bounds
+        ArrayList<RectF> bounds = calculateAllBounds(mPaintText);
+
+        //Make sure we're on a page that still exists
+        if (mCurrentPage >= bounds.size()) {
+            setCurrentItem(bounds.size()-1);
+        }
+
+        final int countMinusOne = count - 1;
+        final float halfWidth = getWidth() / 2f;
+        final int left = getLeft();
+        final float leftClip = left + mClipPadding;
+        final int width = getWidth();
+        final int height = getHeight();
+        final int right = left + width;
+        final float rightClip = right - mClipPadding;
+
+        int page = mCurrentPage;
+        float offsetPercent;
+        if (mCurrentOffset <= halfWidth) {
+            offsetPercent = 1.0f * mCurrentOffset / width;
+        } else {
+            page += 1;
+            offsetPercent = 1.0f * (width - mCurrentOffset) / width;
+        }
+        final boolean currentSelected = (offsetPercent <= SELECTION_FADE_PERCENTAGE);
+        final boolean currentBold = (offsetPercent <= BOLD_FADE_PERCENTAGE);
+        final float selectedPercent = (SELECTION_FADE_PERCENTAGE - offsetPercent) / SELECTION_FADE_PERCENTAGE;
+
+        //Verify if the current view must be clipped to the screen
+        RectF curPageBound = bounds.get(mCurrentPage);
+        float curPageWidth = curPageBound.right - curPageBound.left;
+        if (curPageBound.left < leftClip) {
+            //Try to clip to the screen (left side)
+            clipViewOnTheLeft(curPageBound, curPageWidth, left);
+        }
+        if (curPageBound.right > rightClip) {
+            //Try to clip to the screen (right side)
+            clipViewOnTheRight(curPageBound, curPageWidth, right);
+        }
+
+        //Left views starting from the current position
+        if (mCurrentPage > 0) {
+            for (int i = mCurrentPage - 1; i >= 0; i--) {
+                RectF bound = bounds.get(i);
+                //Is left side is outside the screen
+                if (bound.left < leftClip) {
+                    float w = bound.right - bound.left;
+                    //Try to clip to the screen (left side)
+                    clipViewOnTheLeft(bound, w, left);
+                    //Except if there's an intersection with the right view
+                    RectF rightBound = bounds.get(i + 1);
+                    //Intersection
+                    if (bound.right + mTitlePadding > rightBound.left) {
+                        bound.left = rightBound.left - w - mTitlePadding;
+                        bound.right = bound.left + w;
+                    }
+                }
+            }
+        }
+        //Right views starting from the current position
+        if (mCurrentPage < countMinusOne) {
+            for (int i = mCurrentPage + 1 ; i < count; i++) {
+                RectF bound = bounds.get(i);
+                //If right side is outside the screen
+                if (bound.right > rightClip) {
+                    float w = bound.right - bound.left;
+                    //Try to clip to the screen (right side)
+                    clipViewOnTheRight(bound, w, right);
+                    //Except if there's an intersection with the left view
+                    RectF leftBound = bounds.get(i - 1);
+                    //Intersection
+                    if (bound.left - mTitlePadding < leftBound.right) {
+                        bound.left = leftBound.right + mTitlePadding;
+                        bound.right = bound.left + w;
+                    }
+                }
+            }
+        }
+
+        //Now draw views
+        for (int i = 0; i < count; i++) {
+            //Get the title
+            RectF bound = bounds.get(i);
+            //Only if one side is visible
+            if ((bound.left > left && bound.left < right) || (bound.right > left && bound.right < right)) {
+                final boolean currentPage = (i == page);
+                //Only set bold if we are within bounds
+                mPaintText.setFakeBoldText(currentPage && currentBold && mBoldText);
+
+                //Draw text as unselected
+                mPaintText.setColor(mColorText);
+                canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
+
+                //If we are within the selected bounds draw the selected text
+                if (currentPage && currentSelected) {
+                    mPaintText.setColor(mColorSelected);
+                    mPaintText.setAlpha((int)((mColorSelected >>> 24) * selectedPercent));
+                    canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
+                }
+            }
+        }
+
+        //Draw the footer line
+        mPath.reset();
+        mPath.moveTo(0, height - mFooterLineHeight / 2f);
+        mPath.lineTo(width, height - mFooterLineHeight / 2f);
+        mPath.close();
+        canvas.drawPath(mPath, mPaintFooterLine);
+
+        switch (mFooterIndicatorStyle) {
+            case Triangle:
+                mPath.reset();
+                mPath.moveTo(halfWidth, height - mFooterLineHeight - mFooterIndicatorHeight);
+                mPath.lineTo(halfWidth + mFooterIndicatorHeight, height - mFooterLineHeight);
+                mPath.lineTo(halfWidth - mFooterIndicatorHeight, height - mFooterLineHeight);
+                mPath.close();
+                canvas.drawPath(mPath, mPaintFooterIndicator);
+                break;
+
+            case Underline:
+                if (!currentSelected) {
+                    break;
+                }
+
+                RectF underlineBounds = bounds.get(page);
+                mPath.reset();
+                mPath.moveTo(underlineBounds.left  - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
+                mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
+                mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
+                mPath.lineTo(underlineBounds.left  - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
+                mPath.close();
+
+                mPaintFooterIndicator.setAlpha((int)(0xFF * selectedPercent));
+                canvas.drawPath(mPath, mPaintFooterIndicator);
+                mPaintFooterIndicator.setAlpha(0xFF);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(android.view.MotionEvent ev) {
+        if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) {
+            return false;
+        }
+
+        final int action = ev.getAction();
+
+        switch (action & MotionEventCompat.ACTION_MASK) {
+            case MotionEvent.ACTION_DOWN:
+                mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
+                mLastMotionX = ev.getX();
+                break;
+
+            case MotionEvent.ACTION_MOVE: {
+                final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
+                final float x = MotionEventCompat.getX(ev, activePointerIndex);
+                final float deltaX = x - mLastMotionX;
+
+                if (!mIsDragging) {
+                    if (Math.abs(deltaX) > mTouchSlop) {
+                        mIsDragging = true;
+                    }
+                }
+
+                if (mIsDragging) {
+                    if (!mViewPager.isFakeDragging()) {
+                        mViewPager.beginFakeDrag();
+                    }
+
+                    mLastMotionX = x;
+
+                    mViewPager.fakeDragBy(deltaX);
+                }
+
+                break;
+            }
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                if (!mIsDragging) {
+                    final int count = mViewPager.getAdapter().getCount();
+                    final int width = getWidth();
+                    final float halfWidth = width / 2f;
+                    final float sixthWidth = width / 6f;
+
+                    if ((mCurrentPage > 0) && (ev.getX() < halfWidth - sixthWidth)) {
+                        mViewPager.setCurrentItem(mCurrentPage - 1);
+                        return true;
+                    } else if ((mCurrentPage < count - 1) && (ev.getX() > halfWidth + sixthWidth)) {
+                        mViewPager.setCurrentItem(mCurrentPage + 1);
+                        return true;
+                    }
+                }
+
+                mIsDragging = false;
+                mActivePointerId = INVALID_POINTER;
+                if (mViewPager.isFakeDragging()) {
+                    mViewPager.endFakeDrag();
+                }
+                break;
+
+            case MotionEventCompat.ACTION_POINTER_DOWN: {
+                final int index = MotionEventCompat.getActionIndex(ev);
+                mLastMotionX = MotionEventCompat.getX(ev, index);
+                mActivePointerId = MotionEventCompat.getPointerId(ev, index);
+                break;
+            }
+
+            case MotionEventCompat.ACTION_POINTER_UP:
+                final int pointerIndex = MotionEventCompat.getActionIndex(ev);
+                final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
+                if (pointerId == mActivePointerId) {
+                    final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+                    mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
+                }
+                mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId));
+                break;
+        }
+
+        return true;
+    }
+
+    /**
+     * Set bounds for the right textView including clip padding.
+     *
+     * @param curViewBound
+     *            current bounds.
+     * @param curViewWidth
+     *            width of the view.
+     */
+    private void clipViewOnTheRight(RectF curViewBound, float curViewWidth, int right) {
+        curViewBound.right = right - mClipPadding;
+        curViewBound.left = curViewBound.right - curViewWidth;
+    }
+
+    /**
+     * Set bounds for the left textView including clip padding.
+     *
+     * @param curViewBound
+     *            current bounds.
+     * @param curViewWidth
+     *            width of the view.
+     */
+    private void clipViewOnTheLeft(RectF curViewBound, float curViewWidth, int left) {
+        curViewBound.left = left + mClipPadding;
+        curViewBound.right = mClipPadding + curViewWidth;
+    }
+
+    /**
+     * Calculate views bounds and scroll them according to the current index
+     *
+     * @param paint
+     * @param currentIndex
+     * @return
+     */
+    private ArrayList<RectF> calculateAllBounds(Paint paint) {
+        ArrayList<RectF> list = new ArrayList<RectF>();
+        //For each views (If no values then add a fake one)
+        final int count = mViewPager.getAdapter().getCount();
+        final int width = getWidth();
+        final int halfWidth = width / 2;
+        for (int i = 0; i < count; i++) {
+            RectF bounds = calcBounds(i, paint);
+            float w = (bounds.right - bounds.left);
+            float h = (bounds.bottom - bounds.top);
+            bounds.left = (halfWidth) - (w / 2) - mCurrentOffset + ((i - mCurrentPage) * width);
+            bounds.right = bounds.left + w;
+            bounds.top = 0;
+            bounds.bottom = h;
+            list.add(bounds);
+        }
+
+        return list;
+    }
+
+    /**
+     * Calculate the bounds for a view's title
+     *
+     * @param index
+     * @param paint
+     * @return
+     */
+    private RectF calcBounds(int index, Paint paint) {
+        //Calculate the text bounds
+        RectF bounds = new RectF();
+        bounds.right = paint.measureText(mTitleProvider.getTitle(index));
+        bounds.bottom = paint.descent() - paint.ascent();
+        return bounds;
+    }
+
+    @Override
+    public void setViewPager(ViewPager view) {
+        final PagerAdapter adapter = view.getAdapter();
+        if (adapter == null) {
+            throw new IllegalStateException("ViewPager does not have adapter instance.");
+        }
+        if (!(adapter instanceof TitleProvider)) {
+            throw new IllegalStateException("ViewPager adapter must implement TitleProvider to be used with TitlePageIndicator.");
+        }
+        mViewPager = view;
+        mViewPager.setOnPageChangeListener(this);
+        mTitleProvider = (TitleProvider)adapter;
+        invalidate();
+    }
+
+    @Override
+    public void setViewPager(ViewPager view, int initialPosition) {
+        setViewPager(view);
+        setCurrentItem(initialPosition);
+    }
+
+    @Override
+    public void notifyDataSetChanged() {
+        invalidate();
+    }
+
+    @Override
+    public void setCurrentItem(int item) {
+        if (mViewPager == null) {
+            throw new IllegalStateException("ViewPager has not been bound.");
+        }
+        mViewPager.setCurrentItem(item);
+        mCurrentPage = item;
+        invalidate();
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+        mScrollState = state;
+
+        if (mListener != null) {
+            mListener.onPageScrollStateChanged(state);
+        }
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        mCurrentPage = position;
+        mCurrentOffset = positionOffsetPixels;
+        invalidate();
+
+        if (mListener != null) {
+            mListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
+        }
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+            mCurrentPage = position;
+            invalidate();
+        }
+
+        if (mListener != null) {
+            mListener.onPageSelected(position);
+        }
+    }
+
+    @Override
+    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
+        mListener = listener;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see android.view.View#onMeasure(int, int)
+     */
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
+    }
+
+    /**
+     * Determines the width of this view
+     *
+     * @param measureSpec
+     *            A measureSpec packed into an int
+     * @return The width of the view, honoring constraints from measureSpec
+     */
+    private int measureWidth(int measureSpec) {
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+
+        if (specMode != MeasureSpec.EXACTLY) {
+            throw new IllegalStateException(getClass().getSimpleName() + " can only be used in EXACTLY mode.");
+        }
+        return specSize;
+    }
+
+    /**
+     * Determines the height of this view
+     *
+     * @param measureSpec
+     *            A measureSpec packed into an int
+     * @return The height of the view, honoring constraints from measureSpec
+     */
+    private int measureHeight(int measureSpec) {
+        float result;
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+
+        if (specMode == MeasureSpec.EXACTLY) {
+            //We were told how big to be
+            result = specSize;
+        } else {
+            //Calculate the text bounds
+            RectF bounds = new RectF();
+            bounds.bottom = mPaintText.descent()-mPaintText.ascent();
+            result = bounds.bottom - bounds.top + mFooterLineHeight + mFooterPadding + mTopPadding;
+            if (mFooterIndicatorStyle != IndicatorStyle.None) {
+                result += mFooterIndicatorHeight;
+            }
+        }
+        return (int)result;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        SavedState savedState = (SavedState)state;
+        super.onRestoreInstanceState(savedState.getSuperState());
+        mCurrentPage = savedState.currentPage;
+        requestLayout();
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState savedState = new SavedState(superState);
+        savedState.currentPage = mCurrentPage;
+        return savedState;
+    }
+
+    static class SavedState extends BaseSavedState {
+        int currentPage;
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        private SavedState(Parcel in) {
+            super(in);
+            currentPage = in.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(currentPage);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
diff --git a/main/thirdparty/com/viewpagerindicator/TitleProvider.java b/main/thirdparty/com/viewpagerindicator/TitleProvider.java
new file mode 100644
index 0000000..2a04b65
--- /dev/null
+++ b/main/thirdparty/com/viewpagerindicator/TitleProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+/**
+ * A TitleProvider provides the title to display according to a view.
+ */
+public interface TitleProvider {
+    /**
+     * Returns the title of the view at position
+     * @param position
+     * @return
+     */
+    public String getTitle(int position);
+}
diff --git a/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java b/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
new file mode 100644
index 0000000..af4c03e
--- /dev/null
+++ b/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
@@ -0,0 +1,375 @@
+package gnu.android.app.appmanualclient;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.util.Log;
+
+import java.util.List;
+
+/**
+ * The "App Manual Reader" client is a class to be used in applications which
+ * want to offer their users manuals through the gnu.android.appmanualreader
+ * application. Such applications do not need to include the whole
+ * "App Manual Reader" app but instead just have to include only this little
+ * package. This package then provides the mechanism to open suitable installed
+ * manuals. It does not include any manuals itself.
+ * <p>
+ *
+ * (c) 2011 Geocrasher (geocrasher@gmx.eu)
+ * <p>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ * <p>
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ * <p>
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ * @author Geocrasher
+ */
+public class AppManualReaderClient {
+
+	/**
+	 * The URI scheme used to identify application manual URIs when flinging
+	 * Intents around within an Android device, in the hope that there are
+	 * activities registered which will handle such application manual URIs.
+	 * Usually, there won't be just a single activity registered but instead
+	 * many, depending on how many manuals are installed on an Android device.
+	 */
+	public static final String URI_SCHEME_APPMANUAL = "appmanual";
+
+	/**
+	 * Standardized topic for opening a manual at its beginning.
+	 *
+	 * @see #openManual(String, String, Context)
+	 * @see #openManual(String, String, Context, String)
+	 */
+	public static final String TOPIC_HOME = "andtw-home";
+	/**
+	 * Standardized topic for opening the index of a manual.
+	 *
+	 * @see #openManual(String, String, Context)
+	 * @see #openManual(String, String, Context, String)
+	 */
+	public static final String TOPIC_INDEX = "andtw-index";
+	/**
+	 * Standardized topic for opening a manual's "about" topic.
+	 *
+	 * @see #openManual(String, String, Context)
+	 * @see #openManual(String, String, Context, String)
+	 */
+	public static final String TOPIC_ABOUT_MANUAL = "andtw-about";
+
+	    /**
+     * Convenience function to open a manual at a specific topic. See
+     * {@link #openManual(String, String, Context, String)} for a detailed
+     * description.
+     *
+     * @param manualIdentifier
+     *            the identifier of the manual to open. This identifier must
+     *            uniquely identify the manual as such, independent of the
+     *            particular locale the manual is intended for.
+     * @param topic
+     *            the topic to open. Please do not use spaces for topic names.
+     *            With respect to the TiddlyWiki infrastructure used for manuals
+     *            the topic needs to the tag of a (single) tiddler. This way
+     *            manuals can be localized (especially their topic titles)
+     *            without breaking an app's knowledge about topics. Some
+     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
+     *            {@link #TOPIC_ABOUT_MANUAL}.
+     * @param context
+     *            the context (usually an Activity) from which the manual is to
+     *            be opened. In particular, this context is required to derive
+     *            the proper current locale configuration in order to open
+     *            appropriate localized manuals, if installed.
+     *
+     * @exception ActivityNotFoundException
+     *                there is no suitable manual installed and all combinations
+     *                of locale scope failed to activate any manual.
+     *
+     * @see #openManual(String, String, Context, String, boolean)
+     */
+	public static void openManual(String manualIdentifier, String topic,
+			Context context) throws ActivityNotFoundException {
+		openManual(manualIdentifier, topic, context, null, false);
+	}
+
+	        /**
+     * Convenience function to open a manual at a specific topic. See
+     * {@link #openManual(String, String, Context, String)} for a detailed
+     * description.
+     *
+     * @param manualIdentifier
+     *            the identifier of the manual to open. This identifier must
+     *            uniquely identify the manual as such, independent of the
+     *            particular locale the manual is intended for.
+     * @param topic
+     *            the topic to open. Please do not use spaces for topic names.
+     *            With respect to the TiddlyWiki infrastructure used for manuals
+     *            the topic needs to the tag of a (single) tiddler. This way
+     *            manuals can be localized (especially their topic titles)
+     *            without breaking an app's knowledge about topics. Some
+     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
+     *            {@link #TOPIC_ABOUT_MANUAL}.
+     * @param context
+     *            the context (usually an Activity) from which the manual is to
+     *            be opened. In particular, this context is required to derive
+     *            the proper current locale configuration in order to open
+     *            appropriate localized manuals, if installed.
+     * @param fallbackUri
+     *            either <code>null</code> or a fallback URI to be used in case
+     *            the user has not installed any suitable manual.
+     *
+     * @exception ActivityNotFoundException
+     *                there is no suitable manual installed and all combinations
+     *                of locale scope failed to activate any manual.
+     *
+     * @see #openManual(String, String, Context, String, boolean)
+     */
+	public static void openManual(String manualIdentifier, String topic,
+			Context context, String fallbackUri)
+			throws ActivityNotFoundException {
+		openManual(manualIdentifier, topic, context, fallbackUri, false);
+	}
+
+	/**
+	 * Opens a manual at a specific topic. At least it tries to open a manual.
+	 * As manuals are (usually) installed separately and we use late binding in
+	 * form of implicit intents, a lot of things can go wrong.
+	 *
+	 * We use late binding and the intent architecture in particular as follows:
+	 * first, we use our own URI scheme called "appmanual". Second, we use the
+	 * host field as a unique manual identifier (such as "c-geo" for the app
+	 * manuals for a map which must not be named by the powers that wanna be).
+	 * Third, a localized manual is differentiated as a path with a single
+	 * element in form of (in this precedence) "/lang_country_variant",
+	 * "/lang__variant", "/lang_country", "/lang", or "/". Fourth, the topic to
+	 * open is encoded as the a fragment "#topic=mytopic".
+	 *
+	 * In order to support localization, manuals can register themselves with
+	 * different URIs.
+	 *
+	 * @param manualIdentifier
+	 *            the identifier of the manual to open. This identifier must
+	 *            uniquely identify the manual as such, independent of the
+	 *            particular locale the manual is intended for.
+	 * @param topic
+	 *            the topic to open. Please do not use spaces for topic names.
+	 *            With respect to the TiddlyWiki infrastructure used for manuals
+	 *            the topic needs to the tag of a (single) tiddler. This way
+	 *            manuals can be localized (especially their topic titles)
+	 *            without breaking an app's knowledge about topics. Some
+	 *            standardized topics are predefined, such as
+	 *            {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
+	 *            {@link #TOPIC_ABOUT_MANUAL}.
+	 * @param context
+	 *            the context (usually an Activity) from which the manual is to
+	 *            be opened. In particular, this context is required to derive
+	 *            the proper current locale configuration in order to open
+	 *            appropriate localized manuals, if installed.
+	 * @param fallbackUri
+	 *            either <code>null</code> or a fallback URI to be used in case
+	 *            the user has not installed any suitable manual.
+	 * @param contextAffinity
+	 *            if <code>true</code>, then we try to open the manual within
+	 *            the context, if possible. That is, if the package of the
+	 *            calling context also offers suitable activity registrations,
+	 *            then we will prefer them over any other registrations. If you
+	 *            don't know what this means, then you probably don't need this
+	 *            very special capability and should specify <code>false</code>
+	 *            for this parameter.
+	 *
+	 * @exception ActivityNotFoundException
+	 *                there is no suitable manual installed and all combinations
+	 *                of locale scope failed to activate any manual and no
+	 *                {@literal fallbackUri} was given.
+	 */
+	public static void openManual(String manualIdentifier, String topic,
+            Context context, String fallbackUri, boolean contextAffinity)
+			throws ActivityNotFoundException {
+		//
+		// The path of an "appmanual:" URI consists simply of the locale
+		// information. This allows manual packages to register themselves
+		// for both very specific locales as well as very broad ones.
+		//
+		String localePath = "/"
+				+ context.getResources().getConfiguration().locale.toString();
+		//
+		// We later need this intent in order to try to launch an appropriate
+		// manual (respectively its manual viewer). And yes, we need to set
+		// the intent's category explicitly, even as we will later use
+		// startActivity(): if we don't do this, the proper activity won't be
+		// started albeit the filter almost matches. That dirty behavior (it is
+		// documented wrong) had cost me half a day until I noticed some
+		// informational log entry generated from the ActivityManager. Grrrr!
+		//
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		int defaultIntentFlags = intent.getFlags();
+		intent.addCategory(Intent.CATEGORY_DEFAULT);
+		//
+		// Try to open the manual in the following order (subject to
+		// availability):
+		// 1. manualIdentifier_lang_country_variant (can also be
+		// manualIdentifier_lang__variant in some cases)
+		// 2. manualIdentifier_lang_country
+		// 3. manualIdentifier_lang
+		// 4. manualIdentifier
+		// Of course, manuals are free to register more than one Intent,
+		// in particular, the should register also the plain manualIdentifier
+		// as a suitable fallback strategy. Even when installing multiple
+		// manuals this doesn't matter, as the user then can choose which
+		// one to use on a single or permanent basis.
+		//
+        while (true) {
+            Uri uri = Uri.parse(URI_SCHEME_APPMANUAL + "://" + manualIdentifier
+					+ localePath + "#topic='" + topic + "'");
+			// Note: we do not use a MIME type for this.
+			intent.setData(uri);
+			intent.setFlags(defaultIntentFlags);
+			if ( contextAffinity ) {
+				//
+				// What is happening here? Well, here we try something that we
+				// would like to call "package affinity activity resolving".
+				// Given an implicit(!) intent we try to figure out whether the
+				// package of the context which is trying to open the manual is
+				// able to resolve the intent. If this is the case, then we
+				// simply turn the implicit intent into an explicit(!) intent.
+				// We do this by setting the concrete module, that is: package
+				// name (eventually the one of the calling context) and class
+				// name within the package.
+				//
+				List<ResolveInfo> capableActivities = context
+						.getPackageManager()
+						.queryIntentActivityOptions(null, null, intent,
+								PackageManager.MATCH_DEFAULT_ONLY);
+				int capables = capableActivities.size();
+				if ( capables > 1 ) {
+					for ( int idx = 0; idx < capables; ++idx ) {
+						ActivityInfo activityInfo = capableActivities.get(idx).activityInfo;
+						if ( activityInfo.packageName.contentEquals(context
+								.getPackageName()) ) {
+							intent.setClassName(activityInfo.packageName,
+									activityInfo.name);
+							//
+							// First match is okay, so we quit searching and
+							// continue with the usual attempt to start the
+							// activity. This should not fail, as we already
+							// found a match; yet the code is very forgiving in
+							// this respect and would just try another round
+							// with "downsized" locale requirements.
+							//
+							break;
+						}
+					}
+				}
+				// FIXME
+				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+			} else {
+				//
+				// No context affinity required, thus we need to set some flags:
+				//
+				// ...NEW_TASK: we want to start the manual reader activity as a
+				// separate
+				// task so that it can be kept open, yet in the background when
+				// returning to the application from which the manual was
+				// opened.
+				//
+				// ...SINGLE_TOP:
+				//
+				// ...RESET_TASK_IF_NEEDED: clear the manual reader activities
+				// down to the root activity. We've set the required
+				// ...CLEAR_WHEN_TASK_RESET above when opening the meta-manual
+				// with the context affinity.
+				//
+				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+						| Intent.FLAG_ACTIVITY_SINGLE_TOP
+						| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+			}
+			try {
+                String logTag = "appmanualclient";
+                if ( Log.isLoggable(logTag, Log.INFO) ) {
+					Log.i(logTag,
+							"Trying to activate manual: uri=" + uri.toString());
+				}
+				context.startActivity(intent);
+				//
+				// We could successfully activate the manual activity, so no
+				// further trials are required.
+				//
+				return;
+			} catch ( ActivityNotFoundException noActivity ) {
+				//
+				// Ensure that we switch back to implicit intent resolving for
+				// the next round.
+				//
+				intent.setComponent(null);
+				//
+				// As long as we still have some locale information, reduce it
+				// and try again a broader locale.
+				//
+				if ( localePath.length() > 1 ) {
+					int underscore = localePath.lastIndexOf('_');
+					if ( underscore > 0 ) {
+						localePath = localePath.substring(0, underscore);
+						//
+						// Handle the case where we have a locale variant, yet
+						// no locale country, thus two underscores in immediate
+						// series. Get rid of both.
+						//
+						if ( localePath.endsWith("_") ) {
+							localePath = localePath
+									.substring(0, underscore - 1);
+						}
+					} else {
+						//
+						// Ready for the last round: try without any locale
+						// modifiers.
+						//
+						localePath = "/";
+					}
+				} else {
+					//
+					// We've tried all combinations, so we've run out of them
+					// and bail out.
+					//
+					break;
+				}
+			}
+			//
+			// Okay, go for the next round, we've updated (or rather trimmed)
+			// the localeIdent, so let us try this.
+			//
+		}
+		//
+		// If we reach this code point then no suitable activity could be found
+		// and activated. In case the caller specified a fallback URI we will
+		// try to open that. As this will activate a suitable browser and this
+		// is an asynchronous activity we won't get back any negative results,
+		// such as 404's. Here we will only see such problems that prevented the
+		// start of a suitable browsing activity.
+		//
+		if ( fallbackUri != null ) {
+			intent = new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUri));
+			intent.addCategory(Intent.CATEGORY_BROWSABLE);
+			context.startActivity(intent);
+		}
+		//
+		// We could not activate any manual and there was no fallback URI to
+		// open, so we finally bail out unsuccessful with an exception.
+		//
+		throw new ActivityNotFoundException();
+	}
+}
diff --git a/main/thirdparty/org/openintents/intents/FileManagerIntents.java b/main/thirdparty/org/openintents/intents/FileManagerIntents.java
new file mode 100644
index 0000000..8ff10c8
--- /dev/null
+++ b/main/thirdparty/org/openintents/intents/FileManagerIntents.java
@@ -0,0 +1,127 @@
+/* 
+ * Copyright (C) 2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.intents;
+
+/**
+ * Provides OpenIntents actions, extras, and categories used by providers. 
+ * <p>These specifiers extend the standard Android specifiers.</p>
+ */
+public final class FileManagerIntents {
+
+	/**
+	 * Activity Action: Pick a file through the file manager, or let user
+	 * specify a custom file name.
+	 * Data is the current file name or file name suggestion.
+	 * Returns a new file name as file URI in data.
+	 * 
+	 * <p>Constant Value: "org.openintents.action.PICK_FILE"</p>
+	 */
+	public static final String ACTION_PICK_FILE = "org.openintents.action.PICK_FILE";
+
+	/**
+	 * Activity Action: Pick a directory through the file manager, or let user
+	 * specify a custom file name.
+	 * Data is the current directory name or directory name suggestion.
+	 * Returns a new directory name as file URI in data.
+	 * 
+	 * <p>Constant Value: "org.openintents.action.PICK_DIRECTORY"</p>
+	 */
+	public static final String ACTION_PICK_DIRECTORY = "org.openintents.action.PICK_DIRECTORY";
+	
+	/**
+	 * Activity Action: Move, copy or delete after select entries.
+     * Data is the current directory name or directory name suggestion.
+     * 
+     * <p>Constant Value: "org.openintents.action.MULTI_SELECT"</p>
+	 */
+	public static final String ACTION_MULTI_SELECT = "org.openintents.action.MULTI_SELECT";
+
+	public static final String ACTION_SEARCH_STARTED = "org.openintents.action.SEARCH_STARTED";
+	
+	public static final String ACTION_SEARCH_FINISHED = "org.openintens.action.SEARCH_FINISHED";
+	
+	/**
+	 * The title to display.
+	 * 
+	 * <p>This is shown in the title bar of the file manager.</p>
+	 * 
+	 * <p>Constant Value: "org.openintents.extra.TITLE"</p>
+	 */
+	public static final String EXTRA_TITLE = "org.openintents.extra.TITLE";
+
+	/**
+	 * The text on the button to display.
+	 * 
+	 * <p>Depending on the use, it makes sense to set this to "Open" or "Save".</p>
+	 * 
+	 * <p>Constant Value: "org.openintents.extra.BUTTON_TEXT"</p>
+	 */
+	public static final String EXTRA_BUTTON_TEXT = "org.openintents.extra.BUTTON_TEXT";
+
+	/**
+	 * Flag indicating to show only writeable files and folders.
+     *
+	 * <p>Constant Value: "org.openintents.extra.WRITEABLE_ONLY"</p>
+	 */
+	public static final String EXTRA_WRITEABLE_ONLY = "org.openintents.extra.WRITEABLE_ONLY";
+
+	/**
+	 * The path to prioritize in search. Usually denotes the path the user was on when the search was initiated.
+	 * 
+     * <p>Constant Value: "org.openintents.extra.SEARCH_INIT_PATH"</p>
+	 */
+	public static final String EXTRA_SEARCH_INIT_PATH = "org.openintents.extra.SEARCH_INIT_PATH";
+
+	/**
+	 * The search query as sent to SearchService.
+	 * 
+     * <p>Constant Value: "org.openintents.extra.SEARCH_QUERY"</p>
+	 */
+	public static final String EXTRA_SEARCH_QUERY = "org.openintents.extra.SEARCH_QUERY";
+
+	/**
+     * <p>Constant Value: "org.openintents.extra.DIR_PATH"</p>
+	 */
+	public static final String EXTRA_DIR_PATH = "org.openintents.extra.DIR_PATH";
+
+	/**
+	 * Extension by which to filter.
+	 * 
+     * <p>Constant Value: "org.openintents.extra.FILTER_FILETYPE"</p>
+	 */
+	public static final String EXTRA_FILTER_FILETYPE = "org.openintents.extra.FILTER_FILETYPE";
+	
+	/**
+	 * Mimetype by which to filter.
+	 * 
+     * <p>Constant Value: "org.openintents.extra.FILTER_MIMETYPE"</p>
+	 */
+	public static final String EXTRA_FILTER_MIMETYPE = "org.openintents.extra.FILTER_MIMETYPE";
+	
+	/**
+	 * Only show directories.
+	 * 
+     * <p>Constant Value: "org.openintents.extra.DIRECTORIES_ONLY"</p>
+	 */
+	public static final String EXTRA_DIRECTORIES_ONLY = "org.openintents.extra.DIRECTORIES_ONLY";
+
+	public static final String EXTRA_DIALOG_FILE_HOLDER = "org.openintents.extra.DIALOG_FILE";
+
+	public static final String EXTRA_IS_GET_CONTENT_INITIATED = "org.openintents.extra.ENABLE_ACTIONS";
+
+	public static final String EXTRA_FILENAME = "org.openintents.extra.FILENAME";
+}
-- 
cgit v1.1


From 1b671477deb79543e4606feb51c45e1cbe912ff6 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 22 Apr 2013 08:57:16 +0200
Subject: code cleanup: remove JDT warnings

---
 main/src/cgeo/geocaching/cgeocaches.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index e5176d5..7888b14 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1444,7 +1444,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void selectList(@SuppressWarnings("unused") View view) {
+    public void selectList(View view) {
         if (type != CacheListType.OFFLINE) {
             return;
         }
@@ -1543,7 +1543,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void goMap(@SuppressWarnings("unused") View view) {
+    public void goMap(View view) {
         if (search == null || CollectionUtils.isEmpty(cacheList)) {
             showToast(res.getString(R.string.warn_no_cache_coord));
 
-- 
cgit v1.1


From 6b421b17d247214c5fc9df494f9d2d5006cd7743 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 22 Apr 2013 09:10:54 +0200
Subject: fix Ant build

* add secondary source path
---
 main/ant.properties | 1 +
 1 file changed, 1 insertion(+)

(limited to 'main')

diff --git a/main/ant.properties b/main/ant.properties
index c26774c..8216a77 100644
--- a/main/ant.properties
+++ b/main/ant.properties
@@ -17,3 +17,4 @@
 
 proguard.config=proguard.cfg
 proguard.jar=support/proguard.jar
+source.dir=src;thirdparty
\ No newline at end of file
-- 
cgit v1.1


From 92a7d243bba95870ff7b702fe46447817142f1c7 Mon Sep 17 00:00:00 2001
From: donEgro <egermajer.martin@gmail.com>
Date: Mon, 22 Apr 2013 19:00:03 +0200
Subject: Fixed Issue #708 - Refresh caches + no internet = normal progress.
 Checking refresh in CacheDetailActivity, CachePopup and cgeocaches.

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 5 +++++
 main/src/cgeo/geocaching/CachePopup.java          | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 43ce65f..bbc59e6 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1354,6 +1354,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     return;
                 }
 
+                if (!Network.isNetworkConnected(getApplicationContext())) {
+                    showToast(getString(R.string.err_server));
+                    return;
+                }
+
                 final RefreshCacheHandler refreshCacheHandler = new RefreshCacheHandler();
 
                 progress.show(CacheDetailActivity.this, res.getString(R.string.cache_dialog_refresh_title), res.getString(R.string.cache_dialog_refresh_message), true, refreshCacheHandler.cancelMessage());
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index e6d0148..d51f9f2 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
 import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.network.Network;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
@@ -160,6 +161,11 @@ public class CachePopup extends AbstractPopupActivity {
                 return;
             }
 
+            if (!Network.isNetworkConnected(getApplicationContext())) {
+                showToast(getString(R.string.err_server));
+                return;
+            }
+
             final RefreshCacheHandler refreshCacheHandler = new RefreshCacheHandler();
             progress.show(CachePopup.this, res.getString(R.string.cache_dialog_refresh_title), res.getString(R.string.cache_dialog_refresh_message), true, refreshCacheHandler.cancelMessage());
             new RefreshCacheThread(refreshCacheHandler).start();
-- 
cgit v1.1


From 7b6ed882b1513c7068faf1375a98c5ed1a08ae32 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Fri, 26 Apr 2013 10:06:52 +0200
Subject: #2537 reduce memory usage of downloaded images

---
 main/src/cgeo/geocaching/network/HtmlImage.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index b08d36d..45cdbb5 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -65,6 +65,7 @@ public class HtmlImage implements Html.ImageGetter {
 
         bfOptions = new BitmapFactory.Options();
         bfOptions.inTempStorage = new byte[16 * 1024];
+        bfOptions.inPreferredConfig = Bitmap.Config.RGB_565;
 
         Point displaySize = Compatibility.getDisplaySize();
         this.maxWidth = displaySize.x - 25;
-- 
cgit v1.1


From 34c14bcdef79565d19b2fb7e176914294d8fa061 Mon Sep 17 00:00:00 2001
From: nebursc <rsalasc@gmail.com>
Date: Sat, 27 Apr 2013 13:17:39 +0300
Subject: One string translated and one fixed

I added one string that was not translated until now.
---
 main/res/values-es/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 0fe60b5..0f7433d 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -251,6 +251,7 @@
   <string name="caches_drop_all_ask">¿Quieres borrar todos los escondites guardados en el dispositivo?</string>
   <string name="caches_drop_stored">Descartar guardados</string>
   <string name="caches_drop_progress">Borrando escondites</string>
+  <string name="caches_drop_all_and_list">Descartar todos y borrar lista</string>
   <string name="caches_refresh_selected">Actualizar seleccionados</string>
   <string name="caches_refresh_all">Actualizar todos</string>
   <string name="caches_move_selected">Mover seleccionados</string>
@@ -263,7 +264,7 @@
   <string name="caches_recaptcha_continue">Continuar</string>
   <string name="caches_filter">Filtrar</string>
   <string name="caches_filter_title">Filtrar por</string>
-  <string name="caches_filter_size">tamaó</string>
+  <string name="caches_filter_size">tamaño</string>
   <string name="caches_filter_type">tipo</string>
   <string name="caches_filter_track">con rastreables</string>
   <string name="caches_filter_clear">limpiar filtros</string>
-- 
cgit v1.1


From a0f722b4ec8e4994e39c2723696d9a92f238b5de Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 28 Apr 2013 14:44:11 +0200
Subject: refactoring: rename cgeo activity to MainActivity

* this avoids compiler errors when using fully qualified class names as
they all start with cgeo.subpackage
---
 main/AndroidManifest.xml                           |   2 +-
 main/src/cgeo/geocaching/MainActivity.java         | 796 +++++++++++++++++++++
 main/src/cgeo/geocaching/SearchActivity.java       |   2 +-
 .../cgeo/geocaching/activity/ActivityMixin.java    |   4 +-
 main/src/cgeo/geocaching/apps/AbstractApp.java     |   4 +-
 main/src/cgeo/geocaching/cgeo.java                 | 796 ---------------------
 main/src/cgeo/geocaching/cgeoapplication.java      |   4 +-
 7 files changed, 804 insertions(+), 804 deletions(-)
 create mode 100644 main/src/cgeo/geocaching/MainActivity.java
 delete mode 100644 main/src/cgeo/geocaching/cgeo.java

(limited to 'main')

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index e69af11..8745ae8 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
 			android:name="com.google.android.backup.api_key"
 			android:value="AEdPqrEAAAAIsvD_aUSDMwWOf9NkwwxZ4kJJI_AG2EaxjSu2jw" />
 		<activity
-			android:name=".cgeo"
+			android:name=".MainActivity"
 			android:label="@string/app_name"
 			android:windowSoftInputMode="stateHidden"
 			android:theme="@style/cgeo_main"
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
new file mode 100644
index 0000000..6f62cd8
--- /dev/null
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -0,0 +1,796 @@
+package cgeo.geocaching;
+
+import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.activity.ActivityMixin;
+import cgeo.geocaching.connector.gc.Login;
+import cgeo.geocaching.enumerations.CacheType;
+import cgeo.geocaching.enumerations.StatusCode;
+import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.geopoint.Units;
+import cgeo.geocaching.maps.CGeoMap;
+import cgeo.geocaching.ui.Formatter;
+import cgeo.geocaching.utils.GeoDirHandler;
+import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.RunnableWithArgument;
+import cgeo.geocaching.utils.Version;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.SearchManager;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.location.Address;
+import android.location.Geocoder;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+
+public class MainActivity extends AbstractActivity {
+
+    private static final String SCAN_INTENT = "com.google.zxing.client.android.SCAN";
+    private static final int SCAN_REQUEST_CODE = 1;
+    public static final int SEARCH_REQUEST_CODE = 2;
+
+    private int version = 0;
+    private TextView filterTitle = null;
+    private boolean cleanupRunning = false;
+    private int countBubbleCnt = 0;
+    private Geopoint addCoords = null;
+    private List<Address> addresses = null;
+    private boolean addressObtaining = false;
+    private boolean initialized = false;
+
+    final private UpdateLocation locationUpdater = new UpdateLocation();
+
+    private Handler updateUserInfoHandler = new Handler() {
+
+        @Override
+        public void handleMessage(Message msg) {
+
+            TextView userInfoView = (TextView) findViewById(R.id.user_info);
+
+            StringBuilder userInfo = new StringBuilder("geocaching.com").append(Formatter.SEPARATOR);
+            if (Login.isActualLoginStatus()) {
+                userInfo.append(Login.getActualUserName());
+                if (Login.getActualCachesFound() >= 0) {
+                    userInfo.append(" (").append(String.valueOf(Login.getActualCachesFound())).append(')');
+                }
+                userInfo.append(Formatter.SEPARATOR);
+            }
+            userInfo.append(Login.getActualStatus());
+
+            userInfoView.setText(userInfo.toString());
+        }
+    };
+
+    private Handler obtainAddressHandler = new Handler() {
+
+        @Override
+        public void handleMessage(Message msg) {
+            try {
+                if (CollectionUtils.isNotEmpty(addresses)) {
+                    final Address address = addresses.get(0);
+                    final StringBuilder addText = new StringBuilder();
+
+                    if (address.getCountryName() != null) {
+                        addText.append(address.getCountryName());
+                    }
+                    if (address.getLocality() != null) {
+                        if (addText.length() > 0) {
+                            addText.append(", ");
+                        }
+                        addText.append(address.getLocality());
+                    } else if (address.getAdminArea() != null) {
+                        if (addText.length() > 0) {
+                            addText.append(", ");
+                        }
+                        addText.append(address.getAdminArea());
+                    }
+
+                    addCoords = app.currentGeo().getCoords();
+
+                    TextView navLocation = (TextView) findViewById(R.id.nav_location);
+                    navLocation.setText(addText.toString());
+                }
+            } catch (Exception e) {
+                // nothing
+            }
+
+            addresses = null;
+        }
+    };
+
+    private class SatellitesHandler extends GeoDirHandler {
+
+        private boolean gpsEnabled = false;
+        private int satellitesFixed = 0;
+        private int satellitesVisible = 0;
+
+        @Override
+        public void updateGeoData(final IGeoData data) {
+            if (data.getGpsEnabled() == gpsEnabled &&
+                    data.getSatellitesFixed() == satellitesFixed &&
+                    data.getSatellitesVisible() == satellitesVisible) {
+                return;
+            }
+            gpsEnabled = data.getGpsEnabled();
+            satellitesFixed = data.getSatellitesFixed();
+            satellitesVisible = data.getSatellitesVisible();
+
+            final TextView navSatellites = (TextView) findViewById(R.id.nav_satellites);
+            if (gpsEnabled) {
+                if (satellitesFixed > 0) {
+                    navSatellites.setText(res.getString(R.string.loc_sat) + ": " + satellitesFixed + '/' + satellitesVisible);
+                } else if (satellitesVisible >= 0) {
+                    navSatellites.setText(res.getString(R.string.loc_sat) + ": 0/" + satellitesVisible);
+                }
+            } else {
+                navSatellites.setText(res.getString(R.string.loc_gps_disabled));
+            }
+        }
+
+    }
+
+    private SatellitesHandler satellitesHandler = new SatellitesHandler();
+
+    private Handler firstLoginHandler = new Handler() {
+
+        @Override
+        public void handleMessage(Message msg) {
+            try {
+                final StatusCode reason = (StatusCode) msg.obj;
+
+                if (reason != null && reason != StatusCode.NO_ERROR) { //LoginFailed
+                    showToast(res.getString(reason == StatusCode.MAINTENANCE ? reason.getErrorString() : R.string.err_login_failed_toast));
+                }
+            } catch (Exception e) {
+                Log.w("cgeo.firstLoginHander", e);
+            }
+        }
+    };
+
+    public MainActivity() {
+        super("c:geo-main-screen");
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
+            // If we had been open already, start from the last used activity.
+            finish();
+            return;
+        }
+
+        setContentView(R.layout.main);
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); // type to search
+
+        version = Version.getVersionCode(this);
+        Log.i("Starting " + getPackageName() + ' ' + version + " a.k.a " + Version.getVersionName(this));
+
+        try {
+            if (!Settings.isHelpShown()) {
+                final RelativeLayout helper = (RelativeLayout) findViewById(R.id.helper);
+                if (helper != null) {
+                    helper.setVisibility(View.VISIBLE);
+                    helper.setClickable(true);
+                    helper.setOnClickListener(new View.OnClickListener() {
+
+                        @Override
+                        public void onClick(View view) {
+                            ActivityMixin.goManual(MainActivity.this, "c:geo-intro");
+                            view.setVisibility(View.GONE);
+                        }
+                    });
+                    Settings.setHelpShown();
+                }
+            }
+        } catch (Exception e) {
+            // nothing
+        }
+
+        init();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        init();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        locationUpdater.startGeo();
+        satellitesHandler.startGeo();
+        updateUserInfoHandler.sendEmptyMessage(-1);
+        init();
+    }
+
+    @Override
+    public void onDestroy() {
+        initialized = false;
+        app.showLoginToast = true;
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onStop() {
+        initialized = false;
+        super.onStop();
+    }
+
+    @Override
+    public void onPause() {
+        initialized = false;
+        locationUpdater.stopGeo();
+        satellitesHandler.stopGeo();
+        super.onPause();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_options, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.menu_scan);
+        if (item != null) {
+            item.setEnabled(isIntentAvailable(SCAN_INTENT));
+        }
+        return true;
+    }
+
+    public static boolean isIntentAvailable(String intent) {
+        final PackageManager packageManager = cgeoapplication.getInstance().getPackageManager();
+        final List<ResolveInfo> list = packageManager.queryIntentActivities(
+                new Intent(intent), PackageManager.MATCH_DEFAULT_ONLY);
+
+        return CollectionUtils.isNotEmpty(list);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        switch (id) {
+            case R.id.menu_about:
+                showAbout(null);
+                return true;
+            case R.id.menu_helpers:
+                startActivity(new Intent(this, UsefulAppsActivity.class));
+                return true;
+            case R.id.menu_settings:
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.menu_history:
+                cgeocaches.startActivityHistory(this);
+                return true;
+            case R.id.menu_scan:
+                startScannerApplication();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+    }
+
+    private void startScannerApplication() {
+        Intent intent = new Intent(SCAN_INTENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); // when resuming our app, cancel this activity
+        intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
+        startActivityForResult(intent, SCAN_REQUEST_CODE);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        if (requestCode == SCAN_REQUEST_CODE) {
+            // Only handle positive results, don't do anything if cancelled.
+            if (resultCode == RESULT_OK) {
+                String scan = intent.getStringExtra("SCAN_RESULT");
+                if (StringUtils.isBlank(scan)) {
+                    return;
+                }
+
+                SearchActivity.startActivityScan(scan, this);
+            }
+        } else if (requestCode == SEARCH_REQUEST_CODE) {
+            // SearchActivity activity returned without making a search
+            if (resultCode == RESULT_CANCELED) {
+                String query = intent.getStringExtra(SearchManager.QUERY);
+                if (query == null) {
+                    query = "";
+                }
+                new AlertDialog.Builder(this)
+                        .setMessage(res.getString(R.string.unknown_scan) + "\n\n" + query)
+                .setPositiveButton(getString(android.R.string.ok), null)
+                .create()
+                .show();
+            }
+        }
+    }
+
+    private void setFilterTitle() {
+        if (filterTitle == null) {
+            filterTitle = (TextView) findViewById(R.id.filter_button_title);
+        }
+        filterTitle.setText(Settings.getCacheType().getL10n());
+    }
+
+    private void init() {
+        if (initialized) {
+            return;
+        }
+
+        initialized = true;
+
+        Settings.setLanguage(Settings.isUseEnglish());
+        Settings.getLogin();
+
+        if (app.firstRun) {
+            (new FirstLoginThread()).start();
+        }
+
+        final View findOnMap = findViewById(R.id.map);
+        findOnMap.setClickable(true);
+        findOnMap.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cgeoFindOnMap(v);
+            }
+        });
+
+        final View findByOffline = findViewById(R.id.search_offline);
+        findByOffline.setClickable(true);
+        findByOffline.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cgeoFindByOffline(v);
+            }
+        });
+        findByOffline.setOnLongClickListener(new View.OnLongClickListener() {
+
+            @Override
+            public boolean onLongClick(View v) {
+                new StoredList.UserInterface(MainActivity.this).promptForListSelection(R.string.list_title, new RunnableWithArgument<Integer>() {
+
+                    @Override
+                    public void run(Integer selectedListId) {
+                        Settings.saveLastList(selectedListId);
+                        cgeocaches.startActivityOffline(MainActivity.this);
+                    }
+                });
+                return true;
+            }
+        });
+        findByOffline.setLongClickable(true);
+
+        final View advanced = findViewById(R.id.advanced_button);
+        advanced.setClickable(true);
+        advanced.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cgeoSearch(v);
+            }
+        });
+
+        final View any = findViewById(R.id.any_button);
+        any.setClickable(true);
+        any.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cgeoPoint(v);
+            }
+        });
+
+        final View filter = findViewById(R.id.filter_button);
+        filter.setClickable(true);
+        filter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                selectGlobalTypeFilter();
+            }
+        });
+        filter.setOnLongClickListener(new View.OnLongClickListener() {
+
+            @Override
+            public boolean onLongClick(View v) {
+                selectGlobalTypeFilter();
+                return true;
+            }
+        });
+
+        updateCacheCounter();
+
+        setFilterTitle();
+        checkRestore();
+        (new CleanDatabaseThread()).start();
+    }
+
+    protected void selectGlobalTypeFilter() {
+        final List<CacheType> cacheTypes = new ArrayList<CacheType>();
+
+        //first add the most used types
+        cacheTypes.add(CacheType.ALL);
+        cacheTypes.add(CacheType.TRADITIONAL);
+        cacheTypes.add(CacheType.MULTI);
+        cacheTypes.add(CacheType.MYSTERY);
+
+        // then add all other cache types sorted alphabetically
+        List<CacheType> sorted = new ArrayList<CacheType>();
+        sorted.addAll(Arrays.asList(CacheType.values()));
+        sorted.removeAll(cacheTypes);
+
+        Collections.sort(sorted, new Comparator<CacheType>() {
+
+            @Override
+            public int compare(CacheType left, CacheType right) {
+                return left.getL10n().compareToIgnoreCase(right.getL10n());
+            }
+        });
+
+        cacheTypes.addAll(sorted);
+
+        int checkedItem = cacheTypes.indexOf(Settings.getCacheType());
+        if (checkedItem < 0) {
+            checkedItem = 0;
+        }
+
+        String[] items = new String[cacheTypes.size()];
+        for (int i = 0; i < cacheTypes.size(); i++) {
+            items[i] = cacheTypes.get(i).getL10n();
+        }
+
+        Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.menu_filter);
+        builder.setSingleChoiceItems(items, checkedItem, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int position) {
+                CacheType cacheType = cacheTypes.get(position);
+                Settings.setCacheType(cacheType);
+                setFilterTitle();
+                dialog.dismiss();
+            }
+
+        });
+        builder.create().show();
+    }
+
+    void updateCacheCounter() {
+        (new CountBubbleUpdateThread()).start();
+    }
+
+    private void checkRestore() {
+        if (!cgData.isNewlyCreatedDatebase() || null == cgData.getRestoreFile()) {
+            return;
+        }
+        new AlertDialog.Builder(this)
+                .setTitle(res.getString(R.string.init_backup_restore))
+                .setMessage(res.getString(R.string.init_restore_confirm))
+                .setCancelable(false)
+                .setPositiveButton(getString(android.R.string.yes), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.dismiss();
+                        cgData.resetNewlyCreatedDatabase();
+                        app.restoreDatabase(MainActivity.this);
+                    }
+                })
+                .setNegativeButton(getString(android.R.string.no), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.cancel();
+                        cgData.resetNewlyCreatedDatabase();
+                    }
+                })
+                .create()
+                .show();
+    }
+
+    private class UpdateLocation extends GeoDirHandler {
+
+        @Override
+        public void updateGeoData(final IGeoData geo) {
+            final View nearestView = findViewById(R.id.nearest);
+            final TextView navType = (TextView) findViewById(R.id.nav_type);
+            final TextView navAccuracy = (TextView) findViewById(R.id.nav_accuracy);
+            final TextView navLocation = (TextView) findViewById(R.id.nav_location);
+            try {
+                if (geo.getCoords() != null) {
+                    if (!nearestView.isClickable()) {
+                        nearestView.setFocusable(true);
+                        nearestView.setClickable(true);
+                        nearestView.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                cgeoFindNearest(v);
+                            }
+                        });
+                        nearestView.setBackgroundResource(R.drawable.main_nearby);
+                    }
+
+                    navType.setText(res.getString(geo.getLocationProvider().resourceId));
+
+                    if (geo.getAccuracy() >= 0) {
+                        int speed = Math.round(geo.getSpeed()) * 60 * 60 / 1000;
+                        navAccuracy.setText("±" + Units.getDistanceFromMeters(geo.getAccuracy()) + Formatter.SEPARATOR + Units.getSpeed(speed));
+                    } else {
+                        navAccuracy.setText(null);
+                    }
+
+                    if (Settings.isShowAddress()) {
+                        if (addCoords == null) {
+                            navLocation.setText(res.getString(R.string.loc_no_addr));
+                        }
+                        if (addCoords == null || (geo.getCoords().distanceTo(addCoords) > 0.5 && !addressObtaining)) {
+                            (new ObtainAddressThread()).start();
+                        }
+                    } else {
+                        if (geo.getAltitude() != 0.0) {
+                            final String humanAlt = Units.getDistanceFromKilometers((float) geo.getAltitude() / 1000);
+                            navLocation.setText(geo.getCoords() + " | " + humanAlt);
+                        } else {
+                            navLocation.setText(geo.getCoords().toString());
+                        }
+                    }
+                } else {
+                    if (nearestView.isClickable()) {
+                        nearestView.setFocusable(false);
+                        nearestView.setClickable(false);
+                        nearestView.setOnClickListener(null);
+                        nearestView.setBackgroundResource(R.drawable.main_nearby_disabled);
+                    }
+                    navType.setText(null);
+                    navAccuracy.setText(null);
+                    navLocation.setText(res.getString(R.string.loc_trying));
+                }
+            } catch (Exception e) {
+                Log.w("Failed to update location.");
+            }
+        }
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoFindOnMap(View v) {
+        findViewById(R.id.map).setPressed(true);
+        CGeoMap.startActivityLiveMap(this);
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoFindNearest(View v) {
+        if (app.currentGeo().getCoords() == null) {
+            return;
+        }
+
+        findViewById(R.id.nearest).setPressed(true);
+        cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoFindByOffline(View v) {
+        findViewById(R.id.search_offline).setPressed(true);
+        cgeocaches.startActivityOffline(this);
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoSearch(View v) {
+        findViewById(R.id.advanced_button).setPressed(true);
+        startActivity(new Intent(this, SearchActivity.class));
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoPoint(View v) {
+        findViewById(R.id.any_button).setPressed(true);
+        startActivity(new Intent(this, NavigateAnyPointActivity.class));
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoFilter(View v) {
+        findViewById(R.id.filter_button).setPressed(true);
+        findViewById(R.id.filter_button).performClick();
+    }
+
+    /**
+     * @param v
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void cgeoNavSettings(View v) {
+        startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+    }
+
+    private class CountBubbleUpdateThread extends Thread {
+        private Handler countBubbleHandler = new Handler() {
+            private TextView countBubble = null;
+
+            @Override
+            public void handleMessage(Message msg) {
+                try {
+                    if (countBubble == null) {
+                        countBubble = (TextView) findViewById(R.id.offline_count);
+                    }
+
+                    if (countBubbleCnt == 0) {
+                        countBubble.setVisibility(View.GONE);
+                    } else {
+                        countBubble.setText(Integer.toString(countBubbleCnt));
+                        countBubble.bringToFront();
+                        countBubble.setVisibility(View.VISIBLE);
+                    }
+                } catch (Exception e) {
+                    Log.w("cgeo.countBubbleHander", e);
+                }
+            }
+        };
+
+        @Override
+        public void run() {
+            if (app == null) {
+                return;
+            }
+
+            int checks = 0;
+            while (!cgData.isInitialized()) {
+                try {
+                    wait(500);
+                    checks++;
+                } catch (Exception e) {
+                    // nothing;
+                }
+
+                if (checks > 10) {
+                    return;
+                }
+            }
+
+            countBubbleCnt = cgData.getAllCachesCount();
+
+            countBubbleHandler.sendEmptyMessage(0);
+        }
+    }
+
+    private class CleanDatabaseThread extends Thread {
+
+        @Override
+        public void run() {
+            if (app == null) {
+                return;
+            }
+            if (cleanupRunning) {
+                return;
+            }
+
+            boolean more = false;
+            if (version != Settings.getVersion()) {
+                Log.i("Initializing hard cleanup - version changed from " + Settings.getVersion() + " to " + version + ".");
+
+                more = true;
+            }
+
+            cleanupRunning = true;
+            cgData.clean(more);
+            cleanupRunning = false;
+
+            if (version > 0) {
+                Settings.setVersion(version);
+            }
+        }
+    }
+
+    private class FirstLoginThread extends Thread {
+
+        @Override
+        public void run() {
+            if (app == null) {
+                return;
+            }
+
+            // login
+            final StatusCode status = Login.login();
+
+            if (status == StatusCode.NO_ERROR) {
+                app.firstRun = false;
+                Login.detectGcCustomDate();
+                updateUserInfoHandler.sendEmptyMessage(-1);
+            }
+
+            if (app.showLoginToast) {
+                firstLoginHandler.sendMessage(firstLoginHandler.obtainMessage(0, status));
+                app.showLoginToast = false;
+
+                // invoke settings activity to insert login details
+                if (status == StatusCode.NO_LOGIN_INFO_STORED) {
+                    SettingsActivity.startActivity(MainActivity.this);
+                }
+            }
+        }
+    }
+
+    private class ObtainAddressThread extends Thread {
+
+        public ObtainAddressThread() {
+            setPriority(Thread.MIN_PRIORITY);
+        }
+
+        @Override
+        public void run() {
+            if (addressObtaining) {
+                return;
+            }
+            addressObtaining = true;
+
+            try {
+                final Geocoder geocoder = new Geocoder(MainActivity.this, Locale.getDefault());
+                final Geopoint coords = app.currentGeo().getCoords();
+                addresses = geocoder.getFromLocation(coords.getLatitude(), coords.getLongitude(), 1);
+            } catch (Exception e) {
+                Log.i("Failed to obtain address");
+            }
+
+            obtainAddressHandler.sendEmptyMessage(0);
+
+            addressObtaining = false;
+        }
+    }
+
+    /**
+     * @param view
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void showAbout(View view) {
+        startActivity(new Intent(this, AboutActivity.class));
+    }
+
+    /**
+     * @param view
+     *            unused here but needed since this method is referenced from XML layout
+     */
+    public void goSearch(View view) {
+        onSearchRequested();
+    }
+
+}
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 6fdff5a..ecbd2b2 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -432,6 +432,6 @@ public class SearchActivity extends AbstractActivity {
         searchIntent.setAction(Intent.ACTION_SEARCH).
                 putExtra(SearchManager.QUERY, scan).
                 putExtra(Intents.EXTRA_KEYWORD_SEARCH, false);
-        fromActivity.startActivityForResult(searchIntent, cgeo.SEARCH_REQUEST_CODE);
+        fromActivity.startActivityForResult(searchIntent, MainActivity.SEARCH_REQUEST_CODE);
     }
 }
diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index c97cb9a..8432243 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.activity;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgeo;
+import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.compatibility.Compatibility;
 
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ import gnu.android.app.appmanualclient.AppManualReaderClient;
 public final class ActivityMixin {
 
     public final static void goHome(final Activity fromActivity) {
-        final Intent intent = new Intent(fromActivity, cgeo.class);
+        final Intent intent = new Intent(fromActivity, MainActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
         fromActivity.startActivity(intent);
diff --git a/main/src/cgeo/geocaching/apps/AbstractApp.java b/main/src/cgeo/geocaching/apps/AbstractApp.java
index c95e8b4..ef56f87 100644
--- a/main/src/cgeo/geocaching/apps/AbstractApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractApp.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.apps;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.cgeo;
+import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.utils.ProcessUtils;
 
@@ -29,7 +29,7 @@ public abstract class AbstractApp implements App {
         if (ProcessUtils.isInstalled(packageName)) {
             return true;
         }
-        return cgeo.isIntentAvailable(intent);
+        return MainActivity.isIntentAvailable(intent);
     }
 
     protected Intent getLaunchIntent() {
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
deleted file mode 100644
index 0140c3a..0000000
--- a/main/src/cgeo/geocaching/cgeo.java
+++ /dev/null
@@ -1,796 +0,0 @@
-package cgeo.geocaching;
-
-import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.connector.gc.Login;
-import cgeo.geocaching.enumerations.CacheType;
-import cgeo.geocaching.enumerations.StatusCode;
-import cgeo.geocaching.geopoint.Geopoint;
-import cgeo.geocaching.geopoint.Units;
-import cgeo.geocaching.maps.CGeoMap;
-import cgeo.geocaching.ui.Formatter;
-import cgeo.geocaching.utils.GeoDirHandler;
-import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.RunnableWithArgument;
-import cgeo.geocaching.utils.Version;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.SearchManager;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Configuration;
-import android.location.Address;
-import android.location.Geocoder;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-
-public class cgeo extends AbstractActivity {
-
-    private static final String SCAN_INTENT = "com.google.zxing.client.android.SCAN";
-    private static final int SCAN_REQUEST_CODE = 1;
-    public static final int SEARCH_REQUEST_CODE = 2;
-
-    private int version = 0;
-    private TextView filterTitle = null;
-    private boolean cleanupRunning = false;
-    private int countBubbleCnt = 0;
-    private Geopoint addCoords = null;
-    private List<Address> addresses = null;
-    private boolean addressObtaining = false;
-    private boolean initialized = false;
-
-    final private UpdateLocation locationUpdater = new UpdateLocation();
-
-    private Handler updateUserInfoHandler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-
-            TextView userInfoView = (TextView) findViewById(R.id.user_info);
-
-            StringBuilder userInfo = new StringBuilder("geocaching.com").append(Formatter.SEPARATOR);
-            if (Login.isActualLoginStatus()) {
-                userInfo.append(Login.getActualUserName());
-                if (Login.getActualCachesFound() >= 0) {
-                    userInfo.append(" (").append(String.valueOf(Login.getActualCachesFound())).append(')');
-                }
-                userInfo.append(Formatter.SEPARATOR);
-            }
-            userInfo.append(Login.getActualStatus());
-
-            userInfoView.setText(userInfo.toString());
-        }
-    };
-
-    private Handler obtainAddressHandler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            try {
-                if (CollectionUtils.isNotEmpty(addresses)) {
-                    final Address address = addresses.get(0);
-                    final StringBuilder addText = new StringBuilder();
-
-                    if (address.getCountryName() != null) {
-                        addText.append(address.getCountryName());
-                    }
-                    if (address.getLocality() != null) {
-                        if (addText.length() > 0) {
-                            addText.append(", ");
-                        }
-                        addText.append(address.getLocality());
-                    } else if (address.getAdminArea() != null) {
-                        if (addText.length() > 0) {
-                            addText.append(", ");
-                        }
-                        addText.append(address.getAdminArea());
-                    }
-
-                    addCoords = app.currentGeo().getCoords();
-
-                    TextView navLocation = (TextView) findViewById(R.id.nav_location);
-                    navLocation.setText(addText.toString());
-                }
-            } catch (Exception e) {
-                // nothing
-            }
-
-            addresses = null;
-        }
-    };
-
-    private class SatellitesHandler extends GeoDirHandler {
-
-        private boolean gpsEnabled = false;
-        private int satellitesFixed = 0;
-        private int satellitesVisible = 0;
-
-        @Override
-        public void updateGeoData(final IGeoData data) {
-            if (data.getGpsEnabled() == gpsEnabled &&
-                    data.getSatellitesFixed() == satellitesFixed &&
-                    data.getSatellitesVisible() == satellitesVisible) {
-                return;
-            }
-            gpsEnabled = data.getGpsEnabled();
-            satellitesFixed = data.getSatellitesFixed();
-            satellitesVisible = data.getSatellitesVisible();
-
-            final TextView navSatellites = (TextView) findViewById(R.id.nav_satellites);
-            if (gpsEnabled) {
-                if (satellitesFixed > 0) {
-                    navSatellites.setText(res.getString(R.string.loc_sat) + ": " + satellitesFixed + '/' + satellitesVisible);
-                } else if (satellitesVisible >= 0) {
-                    navSatellites.setText(res.getString(R.string.loc_sat) + ": 0/" + satellitesVisible);
-                }
-            } else {
-                navSatellites.setText(res.getString(R.string.loc_gps_disabled));
-            }
-        }
-
-    }
-
-    private SatellitesHandler satellitesHandler = new SatellitesHandler();
-
-    private Handler firstLoginHandler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            try {
-                final StatusCode reason = (StatusCode) msg.obj;
-
-                if (reason != null && reason != StatusCode.NO_ERROR) { //LoginFailed
-                    showToast(res.getString(reason == StatusCode.MAINTENANCE ? reason.getErrorString() : R.string.err_login_failed_toast));
-                }
-            } catch (Exception e) {
-                Log.w("cgeo.firstLoginHander", e);
-            }
-        }
-    };
-
-    public cgeo() {
-        super("c:geo-main-screen");
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
-            // If we had been open already, start from the last used activity.
-            finish();
-            return;
-        }
-
-        setContentView(R.layout.main);
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); // type to search
-
-        version = Version.getVersionCode(this);
-        Log.i("Starting " + getPackageName() + ' ' + version + " a.k.a " + Version.getVersionName(this));
-
-        try {
-            if (!Settings.isHelpShown()) {
-                final RelativeLayout helper = (RelativeLayout) findViewById(R.id.helper);
-                if (helper != null) {
-                    helper.setVisibility(View.VISIBLE);
-                    helper.setClickable(true);
-                    helper.setOnClickListener(new View.OnClickListener() {
-
-                        @Override
-                        public void onClick(View view) {
-                            ActivityMixin.goManual(cgeo.this, "c:geo-intro");
-                            view.setVisibility(View.GONE);
-                        }
-                    });
-                    Settings.setHelpShown();
-                }
-            }
-        } catch (Exception e) {
-            // nothing
-        }
-
-        init();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-
-        init();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        locationUpdater.startGeo();
-        satellitesHandler.startGeo();
-        updateUserInfoHandler.sendEmptyMessage(-1);
-        init();
-    }
-
-    @Override
-    public void onDestroy() {
-        initialized = false;
-        app.showLoginToast = true;
-
-        super.onDestroy();
-    }
-
-    @Override
-    public void onStop() {
-        initialized = false;
-        super.onStop();
-    }
-
-    @Override
-    public void onPause() {
-        initialized = false;
-        locationUpdater.stopGeo();
-        satellitesHandler.stopGeo();
-        super.onPause();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.main_options, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        MenuItem item = menu.findItem(R.id.menu_scan);
-        if (item != null) {
-            item.setEnabled(isIntentAvailable(SCAN_INTENT));
-        }
-        return true;
-    }
-
-    public static boolean isIntentAvailable(String intent) {
-        final PackageManager packageManager = cgeoapplication.getInstance().getPackageManager();
-        final List<ResolveInfo> list = packageManager.queryIntentActivities(
-                new Intent(intent), PackageManager.MATCH_DEFAULT_ONLY);
-
-        return CollectionUtils.isNotEmpty(list);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        final int id = item.getItemId();
-        switch (id) {
-            case R.id.menu_about:
-                showAbout(null);
-                return true;
-            case R.id.menu_helpers:
-                startActivity(new Intent(this, UsefulAppsActivity.class));
-                return true;
-            case R.id.menu_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                return true;
-            case R.id.menu_history:
-                cgeocaches.startActivityHistory(this);
-                return true;
-            case R.id.menu_scan:
-                startScannerApplication();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-
-    private void startScannerApplication() {
-        Intent intent = new Intent(SCAN_INTENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); // when resuming our app, cancel this activity
-        intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
-        startActivityForResult(intent, SCAN_REQUEST_CODE);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (requestCode == SCAN_REQUEST_CODE) {
-            // Only handle positive results, don't do anything if cancelled.
-            if (resultCode == RESULT_OK) {
-                String scan = intent.getStringExtra("SCAN_RESULT");
-                if (StringUtils.isBlank(scan)) {
-                    return;
-                }
-
-                SearchActivity.startActivityScan(scan, this);
-            }
-        } else if (requestCode == SEARCH_REQUEST_CODE) {
-            // SearchActivity activity returned without making a search
-            if (resultCode == RESULT_CANCELED) {
-                String query = intent.getStringExtra(SearchManager.QUERY);
-                if (query == null) {
-                    query = "";
-                }
-                new AlertDialog.Builder(this)
-                        .setMessage(res.getString(R.string.unknown_scan) + "\n\n" + query)
-                .setPositiveButton(getString(android.R.string.ok), null)
-                .create()
-                .show();
-            }
-        }
-    }
-
-    private void setFilterTitle() {
-        if (filterTitle == null) {
-            filterTitle = (TextView) findViewById(R.id.filter_button_title);
-        }
-        filterTitle.setText(Settings.getCacheType().getL10n());
-    }
-
-    private void init() {
-        if (initialized) {
-            return;
-        }
-
-        initialized = true;
-
-        Settings.setLanguage(Settings.isUseEnglish());
-        Settings.getLogin();
-
-        if (app.firstRun) {
-            (new FirstLoginThread()).start();
-        }
-
-        final View findOnMap = findViewById(R.id.map);
-        findOnMap.setClickable(true);
-        findOnMap.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cgeoFindOnMap(v);
-            }
-        });
-
-        final View findByOffline = findViewById(R.id.search_offline);
-        findByOffline.setClickable(true);
-        findByOffline.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cgeoFindByOffline(v);
-            }
-        });
-        findByOffline.setOnLongClickListener(new View.OnLongClickListener() {
-
-            @Override
-            public boolean onLongClick(View v) {
-                new StoredList.UserInterface(cgeo.this).promptForListSelection(R.string.list_title, new RunnableWithArgument<Integer>() {
-
-                    @Override
-                    public void run(Integer selectedListId) {
-                        Settings.saveLastList(selectedListId);
-                        cgeocaches.startActivityOffline(cgeo.this);
-                    }
-                });
-                return true;
-            }
-        });
-        findByOffline.setLongClickable(true);
-
-        final View advanced = findViewById(R.id.advanced_button);
-        advanced.setClickable(true);
-        advanced.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cgeoSearch(v);
-            }
-        });
-
-        final View any = findViewById(R.id.any_button);
-        any.setClickable(true);
-        any.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cgeoPoint(v);
-            }
-        });
-
-        final View filter = findViewById(R.id.filter_button);
-        filter.setClickable(true);
-        filter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                selectGlobalTypeFilter();
-            }
-        });
-        filter.setOnLongClickListener(new View.OnLongClickListener() {
-
-            @Override
-            public boolean onLongClick(View v) {
-                selectGlobalTypeFilter();
-                return true;
-            }
-        });
-
-        updateCacheCounter();
-
-        setFilterTitle();
-        checkRestore();
-        (new CleanDatabaseThread()).start();
-    }
-
-    protected void selectGlobalTypeFilter() {
-        final List<CacheType> cacheTypes = new ArrayList<CacheType>();
-
-        //first add the most used types
-        cacheTypes.add(CacheType.ALL);
-        cacheTypes.add(CacheType.TRADITIONAL);
-        cacheTypes.add(CacheType.MULTI);
-        cacheTypes.add(CacheType.MYSTERY);
-
-        // then add all other cache types sorted alphabetically
-        List<CacheType> sorted = new ArrayList<CacheType>();
-        sorted.addAll(Arrays.asList(CacheType.values()));
-        sorted.removeAll(cacheTypes);
-
-        Collections.sort(sorted, new Comparator<CacheType>() {
-
-            @Override
-            public int compare(CacheType left, CacheType right) {
-                return left.getL10n().compareToIgnoreCase(right.getL10n());
-            }
-        });
-
-        cacheTypes.addAll(sorted);
-
-        int checkedItem = cacheTypes.indexOf(Settings.getCacheType());
-        if (checkedItem < 0) {
-            checkedItem = 0;
-        }
-
-        String[] items = new String[cacheTypes.size()];
-        for (int i = 0; i < cacheTypes.size(); i++) {
-            items[i] = cacheTypes.get(i).getL10n();
-        }
-
-        Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.menu_filter);
-        builder.setSingleChoiceItems(items, checkedItem, new DialogInterface.OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int position) {
-                CacheType cacheType = cacheTypes.get(position);
-                Settings.setCacheType(cacheType);
-                setFilterTitle();
-                dialog.dismiss();
-            }
-
-        });
-        builder.create().show();
-    }
-
-    void updateCacheCounter() {
-        (new CountBubbleUpdateThread()).start();
-    }
-
-    private void checkRestore() {
-        if (!cgData.isNewlyCreatedDatebase() || null == cgData.getRestoreFile()) {
-            return;
-        }
-        new AlertDialog.Builder(this)
-                .setTitle(res.getString(R.string.init_backup_restore))
-                .setMessage(res.getString(R.string.init_restore_confirm))
-                .setCancelable(false)
-                .setPositiveButton(getString(android.R.string.yes), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.dismiss();
-                        cgData.resetNewlyCreatedDatabase();
-                        app.restoreDatabase(cgeo.this);
-                    }
-                })
-                .setNegativeButton(getString(android.R.string.no), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.cancel();
-                        cgData.resetNewlyCreatedDatabase();
-                    }
-                })
-                .create()
-                .show();
-    }
-
-    private class UpdateLocation extends GeoDirHandler {
-
-        @Override
-        public void updateGeoData(final IGeoData geo) {
-            final View nearestView = findViewById(R.id.nearest);
-            final TextView navType = (TextView) findViewById(R.id.nav_type);
-            final TextView navAccuracy = (TextView) findViewById(R.id.nav_accuracy);
-            final TextView navLocation = (TextView) findViewById(R.id.nav_location);
-            try {
-                if (geo.getCoords() != null) {
-                    if (!nearestView.isClickable()) {
-                        nearestView.setFocusable(true);
-                        nearestView.setClickable(true);
-                        nearestView.setOnClickListener(new OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                cgeoFindNearest(v);
-                            }
-                        });
-                        nearestView.setBackgroundResource(R.drawable.main_nearby);
-                    }
-
-                    navType.setText(res.getString(geo.getLocationProvider().resourceId));
-
-                    if (geo.getAccuracy() >= 0) {
-                        int speed = Math.round(geo.getSpeed()) * 60 * 60 / 1000;
-                        navAccuracy.setText("±" + Units.getDistanceFromMeters(geo.getAccuracy()) + Formatter.SEPARATOR + Units.getSpeed(speed));
-                    } else {
-                        navAccuracy.setText(null);
-                    }
-
-                    if (Settings.isShowAddress()) {
-                        if (addCoords == null) {
-                            navLocation.setText(res.getString(R.string.loc_no_addr));
-                        }
-                        if (addCoords == null || (geo.getCoords().distanceTo(addCoords) > 0.5 && !addressObtaining)) {
-                            (new ObtainAddressThread()).start();
-                        }
-                    } else {
-                        if (geo.getAltitude() != 0.0) {
-                            final String humanAlt = Units.getDistanceFromKilometers((float) geo.getAltitude() / 1000);
-                            navLocation.setText(geo.getCoords() + " | " + humanAlt);
-                        } else {
-                            navLocation.setText(geo.getCoords().toString());
-                        }
-                    }
-                } else {
-                    if (nearestView.isClickable()) {
-                        nearestView.setFocusable(false);
-                        nearestView.setClickable(false);
-                        nearestView.setOnClickListener(null);
-                        nearestView.setBackgroundResource(R.drawable.main_nearby_disabled);
-                    }
-                    navType.setText(null);
-                    navAccuracy.setText(null);
-                    navLocation.setText(res.getString(R.string.loc_trying));
-                }
-            } catch (Exception e) {
-                Log.w("Failed to update location.");
-            }
-        }
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoFindOnMap(View v) {
-        findViewById(R.id.map).setPressed(true);
-        CGeoMap.startActivityLiveMap(this);
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoFindNearest(View v) {
-        if (app.currentGeo().getCoords() == null) {
-            return;
-        }
-
-        findViewById(R.id.nearest).setPressed(true);
-        cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoFindByOffline(View v) {
-        findViewById(R.id.search_offline).setPressed(true);
-        cgeocaches.startActivityOffline(this);
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoSearch(View v) {
-        findViewById(R.id.advanced_button).setPressed(true);
-        startActivity(new Intent(this, SearchActivity.class));
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoPoint(View v) {
-        findViewById(R.id.any_button).setPressed(true);
-        startActivity(new Intent(this, NavigateAnyPointActivity.class));
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoFilter(View v) {
-        findViewById(R.id.filter_button).setPressed(true);
-        findViewById(R.id.filter_button).performClick();
-    }
-
-    /**
-     * @param v
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void cgeoNavSettings(View v) {
-        startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-    }
-
-    private class CountBubbleUpdateThread extends Thread {
-        private Handler countBubbleHandler = new Handler() {
-            private TextView countBubble = null;
-
-            @Override
-            public void handleMessage(Message msg) {
-                try {
-                    if (countBubble == null) {
-                        countBubble = (TextView) findViewById(R.id.offline_count);
-                    }
-
-                    if (countBubbleCnt == 0) {
-                        countBubble.setVisibility(View.GONE);
-                    } else {
-                        countBubble.setText(Integer.toString(countBubbleCnt));
-                        countBubble.bringToFront();
-                        countBubble.setVisibility(View.VISIBLE);
-                    }
-                } catch (Exception e) {
-                    Log.w("cgeo.countBubbleHander", e);
-                }
-            }
-        };
-
-        @Override
-        public void run() {
-            if (app == null) {
-                return;
-            }
-
-            int checks = 0;
-            while (!cgData.isInitialized()) {
-                try {
-                    wait(500);
-                    checks++;
-                } catch (Exception e) {
-                    // nothing;
-                }
-
-                if (checks > 10) {
-                    return;
-                }
-            }
-
-            countBubbleCnt = cgData.getAllCachesCount();
-
-            countBubbleHandler.sendEmptyMessage(0);
-        }
-    }
-
-    private class CleanDatabaseThread extends Thread {
-
-        @Override
-        public void run() {
-            if (app == null) {
-                return;
-            }
-            if (cleanupRunning) {
-                return;
-            }
-
-            boolean more = false;
-            if (version != Settings.getVersion()) {
-                Log.i("Initializing hard cleanup - version changed from " + Settings.getVersion() + " to " + version + ".");
-
-                more = true;
-            }
-
-            cleanupRunning = true;
-            cgData.clean(more);
-            cleanupRunning = false;
-
-            if (version > 0) {
-                Settings.setVersion(version);
-            }
-        }
-    }
-
-    private class FirstLoginThread extends Thread {
-
-        @Override
-        public void run() {
-            if (app == null) {
-                return;
-            }
-
-            // login
-            final StatusCode status = Login.login();
-
-            if (status == StatusCode.NO_ERROR) {
-                app.firstRun = false;
-                Login.detectGcCustomDate();
-                updateUserInfoHandler.sendEmptyMessage(-1);
-            }
-
-            if (app.showLoginToast) {
-                firstLoginHandler.sendMessage(firstLoginHandler.obtainMessage(0, status));
-                app.showLoginToast = false;
-
-                // invoke settings activity to insert login details
-                if (status == StatusCode.NO_LOGIN_INFO_STORED) {
-                    SettingsActivity.startActivity(cgeo.this);
-                }
-            }
-        }
-    }
-
-    private class ObtainAddressThread extends Thread {
-
-        public ObtainAddressThread() {
-            setPriority(Thread.MIN_PRIORITY);
-        }
-
-        @Override
-        public void run() {
-            if (addressObtaining) {
-                return;
-            }
-            addressObtaining = true;
-
-            try {
-                final Geocoder geocoder = new Geocoder(cgeo.this, Locale.getDefault());
-                final Geopoint coords = app.currentGeo().getCoords();
-                addresses = geocoder.getFromLocation(coords.getLatitude(), coords.getLongitude(), 1);
-            } catch (Exception e) {
-                Log.i("Failed to obtain address");
-            }
-
-            obtainAddressHandler.sendEmptyMessage(0);
-
-            addressObtaining = false;
-        }
-    }
-
-    /**
-     * @param view
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void showAbout(View view) {
-        startActivity(new Intent(this, AboutActivity.class));
-    }
-
-    /**
-     * @param view
-     *            unused here but needed since this method is referenced from XML layout
-     */
-    public void goSearch(View view) {
-        onSearchRequested();
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index a1fd7d1..b8f63ee 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -103,8 +103,8 @@ public class cgeoapplication extends Application {
                     boolean restored = atomic.get();
                     String message = restored ? res.getString(R.string.init_restore_success) : res.getString(R.string.init_restore_failed);
                     ActivityMixin.helpDialog(fromActivity, res.getString(R.string.init_backup_restore), message);
-                    if (fromActivity instanceof cgeo) {
-                        ((cgeo) fromActivity).updateCacheCounter();
+                    if (fromActivity instanceof MainActivity) {
+                        ((MainActivity) fromActivity).updateCacheCounter();
                     }
                 }
             };
-- 
cgit v1.1


From 3f4d5dc01e3b6a7395e1f79aab0e807e3f4c9ba2 Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Thu, 25 Apr 2013 22:50:42 +0200
Subject: fixes #2533 - added image scaling

modifications suggested by Bananeweizen

next recommended changes and scaling now on leaving ImageSelectActivity

fixed wrong spelling
---
 main/res/layout/visit_image.xml                   |  7 ++++
 main/res/values-de/strings.xml                    | 10 ++++-
 main/res/values/strings.xml                       |  8 ++++
 main/res/values/strings_not_translatable.xml      | 12 +++++-
 main/src/cgeo/geocaching/ImageSelectActivity.java | 50 +++++++++++++++++++++++
 main/src/cgeo/geocaching/Settings.java            | 15 +++++++
 main/src/cgeo/geocaching/utils/ImageHelper.java   | 38 ++++++++++++++++-
 7 files changed, 137 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index 7997406..c9d4be2 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -98,6 +98,13 @@
                 android:minLines="5"
                 android:singleLine="false" />
 
+            <Spinner
+                android:id="@+id/logImageScale"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/log_image_scale"
+                android:entries="@array/log_image_scales"/>
+            
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 048991b..ab0b11e 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -125,7 +125,15 @@
   <string name="log_image_camera">Neu</string>
   <string name="log_image_caption">Überschrift</string>
   <string name="log_image_description">Beschreibung</string>
-
+  <string name="log_image_scale">Skalierung</string>
+  <string-array name="log_image_scales">
+      <item>Keine Skalierung</item>
+      <item>512 px</item>
+      <item>640 px</item>
+      <item>800 px</item>
+      <item>1024 px</item>
+  </string-array>
+  
 <!-- translation -->
   <string name="translate_to_sys_lang">Übersetze in %s</string>
   <string name="translate_to_english">Übersetze in Englisch</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index d35a982..28a57e0 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -126,6 +126,14 @@
   <string name="log_image_camera">New</string>
   <string name="log_image_caption">Caption</string>
   <string name="log_image_description">Description</string>
+  <string name="log_image_scale">Scaling</string>
+  <string-array name="log_image_scales">
+      <item>No scaling</item>
+      <item>512 px</item>
+      <item>640 px</item>
+      <item>800 px</item>
+      <item>1024 px</item>
+  </string-array>
   
   <!-- translation -->
   <string name="translate_to_sys_lang">Translate to %s</string>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index b392d73..1eddfc6 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -28,6 +28,15 @@
   <string name="init_select_gpx_exportdir" translatable="false">…</string>
   <string name="init_select_gpx_importdir" translatable="false">…</string>
   
+  <!-- upload image scaling -->
+  <integer-array name="log_image_scale_values">
+      <item>-1</item>
+      <item>512</item>
+      <item>640</item>
+      <item>800</item>
+      <item>1024</item>
+  </integer-array>
+  
   <!-- contributors -->
   <string name="contributors" translatable="false">\n
     · <a href="http://carnero.cc/">carnero</a> as the father of c:geo\n
@@ -89,7 +98,8 @@
   <string name="changelog" translatable="false">\n
     <b>Next release</b>\n\n
     <b>New Features/Functions:</b>\n
-    · ...\n
+    · Log images can be scaled before upload to save traffic
+    · \n
     \n
     <b>Bugfixing:</b>\n
     · Do not apply encryption/decryption when clicking on a link in a log\n
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index 347cd86..597a7bd 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -2,6 +2,7 @@ package cgeo.geocaching;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.compatibility.Compatibility;
+import cgeo.geocaching.utils.ImageHelper;
 import cgeo.geocaching.utils.Log;
 
 import org.apache.commons.lang3.StringUtils;
@@ -10,14 +11,18 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.provider.MediaStore.MediaColumns;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.Spinner;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -28,20 +33,24 @@ public class ImageSelectActivity extends AbstractActivity {
     static final String EXTRAS_CAPTION = "caption";
     static final String EXTRAS_DESCRIPTION = "description";
     static final String EXTRAS_URI_AS_STRING = "uri";
+    static final String EXTRAS_SCALE = "scale";
 
     private static final String SAVED_STATE_IMAGE_CAPTION = "cgeo.geocaching.saved_state_image_caption";
     private static final String SAVED_STATE_IMAGE_DESCRIPTION = "cgeo.geocaching.saved_state_image_description";
     private static final String SAVED_STATE_IMAGE_URI = "cgeo.geocaching.saved_state_image_uri";
+    private static final String SAVED_STATE_IMAGE_SCALE = "cgeo.geocaching.saved_state_image_scale";
 
     private static final int SELECT_NEW_IMAGE = 1;
     private static final int SELECT_STORED_IMAGE = 2;
 
     private EditText captionView;
     private EditText descriptionView;
+    private Spinner scaleView;
 
     // Data to be saved while reconfiguring
     private String imageCaption;
     private String imageDescription;
+    private int scaleChoiceIndex;
     private Uri imageUri;
 
     public ImageSelectActivity() {
@@ -56,6 +65,7 @@ public class ImageSelectActivity extends AbstractActivity {
         setContentView(R.layout.visit_image);
         setTitle(res.getString(R.string.log_image));
 
+        scaleChoiceIndex = Settings.getLogImageScale();
         imageCaption = "";
         imageDescription = "";
         imageUri = Uri.EMPTY;
@@ -66,6 +76,7 @@ public class ImageSelectActivity extends AbstractActivity {
             imageCaption = extras.getString(EXTRAS_CAPTION);
             imageDescription = extras.getString(EXTRAS_DESCRIPTION);
             imageUri = Uri.parse(extras.getString(EXTRAS_URI_AS_STRING));
+            scaleChoiceIndex = extras.getInt(EXTRAS_SCALE, scaleChoiceIndex);
         }
 
         // Restore previous state
@@ -73,6 +84,7 @@ public class ImageSelectActivity extends AbstractActivity {
             imageCaption = savedInstanceState.getString(SAVED_STATE_IMAGE_CAPTION);
             imageDescription = savedInstanceState.getString(SAVED_STATE_IMAGE_DESCRIPTION);
             imageUri = Uri.parse(savedInstanceState.getString(SAVED_STATE_IMAGE_URI));
+            scaleChoiceIndex = savedInstanceState.getInt(SAVED_STATE_IMAGE_SCALE);
         }
 
         final Button cameraButton = (Button) findViewById(R.id.camera);
@@ -103,6 +115,20 @@ public class ImageSelectActivity extends AbstractActivity {
             descriptionView.setText(imageDescription);
         }
 
+        scaleView = (Spinner) findViewById(R.id.logImageScale);
+        scaleView.setSelection(scaleChoiceIndex);
+        scaleView.setOnItemSelectedListener(new OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
+                scaleChoiceIndex = scaleView.getSelectedItemPosition();
+                Settings.setLogImageScale(scaleChoiceIndex);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> arg0) {
+            }
+        });
+
         final Button saveButton = (Button) findViewById(R.id.save);
         saveButton.setOnClickListener(new View.OnClickListener() {
 
@@ -131,15 +157,19 @@ public class ImageSelectActivity extends AbstractActivity {
         outState.putString(SAVED_STATE_IMAGE_CAPTION, imageCaption);
         outState.putString(SAVED_STATE_IMAGE_DESCRIPTION, imageDescription);
         outState.putString(SAVED_STATE_IMAGE_URI, imageUri != null ? imageUri.getPath() : StringUtils.EMPTY);
+        outState.putInt(SAVED_STATE_IMAGE_SCALE, scaleChoiceIndex);
     }
 
     public void saveImageInfo(boolean saveInfo) {
         if (saveInfo) {
+            String filename = writeScaledImage(imageUri.getPath());
+            imageUri = Uri.parse(filename);
             Intent intent = new Intent();
             syncEditTexts();
             intent.putExtra(EXTRAS_CAPTION, imageCaption);
             intent.putExtra(EXTRAS_DESCRIPTION, imageDescription);
             intent.putExtra(EXTRAS_URI_AS_STRING, imageUri.toString());
+            intent.putExtra(EXTRAS_SCALE, scaleChoiceIndex);
 
             setResult(RESULT_OK, intent);
         } else {
@@ -152,6 +182,7 @@ public class ImageSelectActivity extends AbstractActivity {
     private void syncEditTexts() {
         imageCaption = captionView.getText().toString();
         imageDescription = descriptionView.getText().toString();
+        scaleChoiceIndex = scaleView.getSelectedItemPosition();
     }
 
     private void selectImageFromCamera() {
@@ -231,6 +262,25 @@ public class ImageSelectActivity extends AbstractActivity {
         loadImagePreview();
     }
 
+    /**
+     * Scales and writes the scaled image.
+     *
+     * @param filePath
+     * @return
+     */
+    private String writeScaledImage(String filePath) {
+        Bitmap image = BitmapFactory.decodeFile(filePath);
+        scaleChoiceIndex = scaleView.getSelectedItemPosition();
+        int maxXY = getResources().getIntArray(R.array.log_image_scale_values)[scaleChoiceIndex];
+        String uploadFilename = filePath;
+        if (maxXY > 0) {
+            BitmapDrawable scaledImage = ImageHelper.scaleBitmapTo(image, maxXY, maxXY);
+            uploadFilename = getOutputImageFile().getPath();
+            ImageHelper.storeBitmap(scaledImage.getBitmap(), Bitmap.CompressFormat.JPEG, 75, uploadFilename);
+        }
+        return uploadFilename;
+    }
+
     private void showFailure() {
         showToast(getResources().getString(R.string.err_aquire_image_failed));
     }
diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 93bfa9b..b5c8a6e 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -112,6 +112,7 @@ public final class Settings {
     private static final String KEY_MAP_DIRECTORY = "mapDirectory";
     private static final String KEY_CONNECTOR_OC_ACTIVE = "connectorOCActive";
     private static final String KEY_CONNECTOR_OC_USER = "connectorOCUser";
+    private static final String KEY_LOG_IMAGE_SCALE = "logImageScale";
 
     private final static int unitsMetric = 1;
 
@@ -1439,4 +1440,18 @@ public final class Settings {
     public static void setCacheTwitterMessage(final String message) {
         cacheTwitterMessage = message;
     }
+
+    public static int getLogImageScale() {
+        return sharedPrefs.getInt(KEY_LOG_IMAGE_SCALE, -1);
+    }
+
+    public static void setLogImageScale(final int scale) {
+        editSharedSettings(new PrefRunnable() {
+
+            @Override
+            public void edit(Editor edit) {
+                edit.putInt(KEY_LOG_IMAGE_SCALE, scale);
+            }
+        });
+    }
 }
diff --git a/main/src/cgeo/geocaching/utils/ImageHelper.java b/main/src/cgeo/geocaching/utils/ImageHelper.java
index 98cad64..ec77018 100644
--- a/main/src/cgeo/geocaching/utils/ImageHelper.java
+++ b/main/src/cgeo/geocaching/utils/ImageHelper.java
@@ -8,6 +8,9 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+
 public class ImageHelper {
 
     // Do not let this class be instantiated, this is a utility class.
@@ -22,11 +25,21 @@ public class ImageHelper {
      * @return BitmapDrawable The scaled image
      */
     public static BitmapDrawable scaleBitmapToFitDisplay(final Bitmap image) {
-        final cgeoapplication app = cgeoapplication.getInstance();
         Point displaySize = Compatibility.getDisplaySize();
         final int maxWidth = displaySize.x - 25;
         final int maxHeight = displaySize.y - 25;
+        return scaleBitmapTo(image, maxWidth, maxHeight);
+    }
 
+    /**
+     * Scales a bitmap to the given bounds if it is larger, otherwise returns the original bitmap.
+     *
+     * @param image
+     *            The bitmap to scale
+     * @return BitmapDrawable The scaled image
+     */
+    public static BitmapDrawable scaleBitmapTo(final Bitmap image, final int maxWidth, final int maxHeight) {
+        final cgeoapplication app = cgeoapplication.getInstance();
         Bitmap result = image;
         int width = image.getWidth();
         int height = image.getHeight();
@@ -43,4 +56,27 @@ public class ImageHelper {
         return resultDrawable;
     }
 
+    /**
+     * Store a bitmap to file.
+     *
+     * @param bitmap
+     *            The bitmap to store
+     * @param format
+     *            The image format
+     * @param quality
+     *            The image quality
+     * @param pathOfOutputImage
+     *            Path to store to
+     */
+    public static void storeBitmap(final Bitmap bitmap, final Bitmap.CompressFormat format, final int quality, final String pathOfOutputImage) {
+        try {
+            FileOutputStream out = new FileOutputStream(pathOfOutputImage);
+            BufferedOutputStream bos = new BufferedOutputStream(out);
+            bitmap.compress(format, quality, bos);
+            bos.flush();
+            bos.close();
+        } catch (Exception e) {
+            Log.e("Image", e);
+        }
+    }
 }
-- 
cgit v1.1


From 9f21d5569f1a954660d9e7fadc39565802fcb996 Mon Sep 17 00:00:00 2001
From: nebursc <rsalasc@gmail.com>
Date: Mon, 29 Apr 2013 19:18:05 +0300
Subject: Localization review according to regular Spanish and GC.com in
 Spanish (1st part)

This is the first part of my review for the Spanish localization. I have done three actions: add missed strings in Spanish from English XML; review existing strings to adapt them to "usual Spanish spoken in Spain" and used at GC.com in Spanish; and fix some little errors (misprints).

My main skills to do this: I'm Spanish from Spain and I play geocaching since 2006 (user: Nebur). Of course, I'm also a programmer in several languages :)

Modules reviewed in this proposal:
- Basics
- Caches
- Cache sizes
- Waypoints
- Logs
---
 main/res/values-es/strings.xml | 88 ++++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 30 deletions(-)

(limited to 'main')

diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 0f7433d..b3096eb 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -11,6 +11,8 @@
   <string name="helpers">¿Qué instalar?</string>
   <string name="about">Sobre c:geo</string>
   <string name="helper">Si quieres aprender cosas sobre <b>c:geo</b>?\nEcha un ojo a nuestro manual.</string>
+  <string name="latitude">Latitud</string>
+  <string name="longitude">Longitud</string>
 
   <!-- actionbar -->
   <string name="action_bar_share_title">Compartir enlace a escondite</string>
@@ -19,19 +21,20 @@
   <string name="all_types">Todos los escondites</string>
   <string name="traditional">Tradicionales</string>
   <string name="multi">Multis</string>
-  <string name="mystery">Desconocidos</string>
+  <string name="mystery">Desconocidos/Mistery</string>
   <string name="letterbox">Buzón híbrido</string>
-  <string name="event">Por pistas</string>
-  <string name="mega">Mega-eventos</string>
+  <string name="event">Eventos</string>
+  <string name="mega">Mega-Eventos</string>
   <string name="earth">Educativos (Earth)</string>
-  <string name="cito">Limpieza de escondites</string>
+  <string name="cito">Eventos Limpieza(CITO)</string>
   <string name="webcam">Webcams</string>
   <string name="virtual">Virtuales</string>
   <string name="wherigo">Wherigo</string>
-  <string name="lostfound">Perdidos y encontrados</string>
+  <string name="lostfound">Eventos Perdidos y Encontrados</string>
   <string name="ape">Proyecto APE</string>
   <string name="gchq">Groundspeak HQ</string>
-  <string name="gps">Exhibición de escondites GPS </string>
+  <string name="gps">Exhibición de escondites GPS</string>
+  <string name="unknown">De tipo desconocido</string>
 
   <!-- cache sizes -->
   <string name="cache_size_micro">micro</string>
@@ -46,36 +49,43 @@
   <!-- waypoints -->
   <string name="wp_final">Ubicación final</string>
   <string name="wp_stage">Etapa de multi escondite</string>
-  <string name="wp_puzzle">Preguntar sin contestar</string>
+  <string name="wp_puzzle">Preguntar a contestar</string>
   <string name="wp_pkg">Zona de aparcamiento</string>
   <string name="wp_trailhead">Sendero</string>
   <string name="wp_waypoint">Punto de referencia</string>
+  <string name="wp_original">Coordenadas originales</string>
 
   <!-- logs -->
   <string name="log_found">Encontrado</string>
   <string name="log_dnf">No encontrado</string>
   <string name="log_note">Nota</string>
   <string name="log_published">Publicado</string>
-  <string name="log_enabled">Activo</string>
-  <string name="log_disabled">Inactivo</string>
-  <string name="log_attend">Iré</string>
+  <string name="log_enabled">Activado</string>
+  <string name="log_disabled">Desactivado</string>
+  <string name="log_attend">Asistiré</string>
   <string name="log_attended">Asistí</string>
-  <string name="log_retrieved">Obtenido</string>
-  <string name="log_placed">Colocado</string>
-  <string name="log_grabbed">Guardado en alguna parte</string>
+  <string name="log_retrieved">Recogido</string>
+  <string name="log_placed">Depositado</string>
+  <string name="log_grabbed">Recogido de alguna parte</string>
+  <string name="log_movecollection">Mover a la colección</string>
+	<string name="log_moveinventory">Mover al inventario</string>
   <string name="log_maintained">Mantenimiento efectuado</string>
   <string name="log_maintenance_needed">Necesita mantenimiento</string>
   <string name="log_update">Coordenadas actualizadas</string>
   <string name="log_archived">Archivado</string>
+  <string name="log_unarchived">Desarchivado</string>
   <string name="log_needs_archived">Necesita ser archivado</string>
   <string name="log_discovered">Descubierto</string>
   <string name="log_reviewer">Nota del revisor</string>
+  <string name="log_retractlisting">Retirar ficha del escondite</string>
+	<string name="log_marked_missing">Marcado como perdido</string>
   <string name="log_tb_nothing">No hacer nada</string>
-  <string name="log_tb_visit">Visita</string>
-  <string name="log_tb_drop">Colocar aquí</string>
+  <string name="log_tb_visit">Visitado</string>
+  <string name="log_tb_drop">Dejar aquí</string>
   <string name="log_tb_changeall">Cambiar todo</string>
   <string name="log_save">Guardar</string>
-  <string name="log_saving">Guardando registo…</string>
+  <string name="log_saving">Enviando registo…</string>
+  <string name="log_saving_and_uploading">Enviando registro y subiendo imagen…</string>
   <string name="log_clear">Limpiar</string>
   <string name="log_post">Enviar registro</string>
   <string name="log_post_rate">Enviar registro y puntuación</string>
@@ -84,27 +94,45 @@
   <string name="log_rating">Puntuación</string>
   <string name="log_no_rating">Sin puntuación</string>
   <string name="log_stars_1">1 estrella</string>
-<string name="log_stars_15">1,5  estrellas</string>
+  <string name="log_stars_15">1,5 estrellas</string>
   <string name="log_stars_2">2 estrellas</string>
-  <string name="log_stars_25">2,5  estrellas</string>
+  <string name="log_stars_25">2,5 estrellas</string>
   <string name="log_stars_3">3 estrellas</string>
-  <string name="log_stars_35">3,5  estrellas</string>
+  <string name="log_stars_35">3,5 estrellas</string>
   <string name="log_stars_4">4 estrellas</string>
-  <string name="log_stars_45">4,5  estrellas</string>
+  <string name="log_stars_45">4,5 estrellas</string>
   <string name="log_stars_5">5 estrellas</string>
-<string name="log_stars_1_description">poor</string>
-  <string name="log_stars_15_description">fairly poor</string>
-  <string name="log_stars_2_description">below average</string>
-  <string name="log_stars_25_description">not so bad</string>
-  <string name="log_stars_3_description">average </string>
-  <string name="log_stars_35_description">not bad at all</string>
-  <string name="log_stars_4_description">better than average</string>
-  <string name="log_stars_45_description">very good</string>
-  <string name="log_stars_5_description">awesome</string>
+  <string name="log_stars_1_description">malísimo</string>
+  <string name="log_stars_15_description">muy malo</string>
+  <string name="log_stars_2_description">malo</string>
+  <string name="log_stars_25_description">un poco malo</string>
+  <string name="log_stars_3_description">aceptable</string>
+  <string name="log_stars_35_description">algo bueno</string>
+  <string name="log_stars_4_description">bueno</string>
+  <string name="log_stars_45_description">muy bueno</string>
+  <string name="log_stars_5_description">buenísimo</string>
   <string name="log_webcam">Foto de webcam tomada</string>
   <string name="log_new_log">Registro</string>
   <string name="log_new_log_text">Texto del registro</string>
   <string name="log_announcement">Aviso</string>
+  <string name="log_today">Hoy</string>
+  <string name="log_yesterday">Ayer</string>
+  <string name="log_smilies">Emoticonos</string>
+  <string name="log_image">Imagen</string>
+  <string name="log_image_attach">Adjuntar imagen</string>
+  <string name="log_image_edit">Editar imagen</string>
+  <string name="log_image_stored">Galería</string>
+  <string name="log_image_camera">Tomar foto</string>
+  <string name="log_image_caption">Título</string>
+  <string name="log_image_description">Descripción</string>
+  <string name="log_image_scale">Redimensionamiento</string>
+  <string-array name="log_image_scales">
+      <item>Sin redimensionar</item>
+      <item>512 px</item>
+      <item>640 px</item>
+      <item>800 px</item>
+      <item>1024 px</item>
+  </string-array>
 
   <!-- errors, warnings, info toasts -->
   <string name="err_none">Aceptar</string>
@@ -402,7 +430,7 @@
   <string name="cache_attributes">Atributos</string>
   <string name="cache_inventory">Inventario</string>
   <string name="cache_log_offline">Registro desconectado</string>
-  <string name="cache_log_images_title">Imagen de resgistro</string>
+  <string name="cache_log_images_title">Imagen de registro</string>
   <string name="cache_log_image_default_title">Foto</string>
   <string name="cache_personal_note">Nota personal</string>
   <string name="cache_description">Descripción</string>
-- 
cgit v1.1


From 74fce89a36e8d130851145941459966aed1176c3 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 28 Apr 2013 14:18:29 +0200
Subject: #2684: use view injection library

* If you have compile errors after pulling, please consult the issue on
github.
---
 main/.classpath                                    |   5 +
 main/.factorypath                                  |   3 +
 main/.settings/org.eclipse.jdt.apt.core.prefs      |   4 +
 main/.settings/org.eclipse.jdt.core.prefs          | 735 +++++++++++----------
 main/AndroidManifest.xml                           |  46 +-
 main/libs/butterknife-1.3.2.jar                    | Bin 0 -> 12597 bytes
 main/proguard.cfg                                  |   4 +
 main/src/cgeo/geocaching/AboutActivity.java        |  17 +-
 .../src/cgeo/geocaching/AbstractPopupActivity.java |   1 -
 main/src/cgeo/geocaching/AddressListActivity.java  |   6 +-
 main/src/cgeo/geocaching/CacheDetailActivity.java  |   7 +-
 main/src/cgeo/geocaching/EditWaypointActivity.java |  84 ++-
 main/src/cgeo/geocaching/GpxFileListActivity.java  |   5 -
 main/src/cgeo/geocaching/ImageSelectActivity.java  |   6 +-
 main/src/cgeo/geocaching/LogTrackableActivity.java |   6 +-
 main/src/cgeo/geocaching/MainActivity.java         |  58 +-
 .../cgeo/geocaching/NavigateAnyPointActivity.java  |   6 +-
 main/src/cgeo/geocaching/SearchActivity.java       |   1 -
 .../src/cgeo/geocaching/SelectMapfileActivity.java |   5 -
 main/src/cgeo/geocaching/SettingsActivity.java     |   8 +-
 main/src/cgeo/geocaching/StaticMapsActivity.java   |   6 +-
 main/src/cgeo/geocaching/TrackableActivity.java    |   6 +-
 main/src/cgeo/geocaching/UsefulAppsActivity.java   |  30 +-
 main/src/cgeo/geocaching/VisitCacheActivity.java   |   6 +-
 .../cgeo/geocaching/activity/AbstractActivity.java |  50 +-
 .../geocaching/activity/AbstractListActivity.java  |  21 +-
 .../cgeo/geocaching/activity/ActivityMixin.java    |   4 +-
 main/src/cgeo/geocaching/cgeonavigate.java         |   6 +-
 .../geocaching/files/AbstractFileListActivity.java |   6 -
 .../cgeo/geocaching/files/SimpleDirChooser.java    |  11 +-
 .../twitter/TwitterAuthorizationActivity.java      |  12 +-
 31 files changed, 568 insertions(+), 597 deletions(-)
 create mode 100644 main/.factorypath
 create mode 100644 main/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 main/libs/butterknife-1.3.2.jar

(limited to 'main')

diff --git a/main/.classpath b/main/.classpath
index 2905a42..d7bcabc 100644
--- a/main/.classpath
+++ b/main/.classpath
@@ -11,6 +11,11 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="annotation_gen">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="libs/commons-lang3-3.1.jar"/>
 	<classpathentry kind="lib" path="libs/locus-api-4.0.jar"/>
 	<classpathentry kind="lib" path="libs/commons-collections-3.2.1.jar"/>
diff --git a/main/.factorypath b/main/.factorypath
new file mode 100644
index 0000000..d54f9b4
--- /dev/null
+++ b/main/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="WKSPJAR" id="/cgeo/libs/butterknife-1.3.2.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/main/.settings/org.eclipse.jdt.apt.core.prefs b/main/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..813e822
--- /dev/null
+++ b/main/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=annotation_gen
+org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/main/.settings/org.eclipse.jdt.core.prefs b/main/.settings/org.eclipse.jdt.core.prefs
index 3c08e45..41c73f0 100644
--- a/main/.settings/org.eclipse.jdt.core.prefs
+++ b/main/.settings/org.eclipse.jdt.core.prefs
@@ -1,367 +1,368 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 8745ae8..3fb5ff1 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
 		</activity>
 		<activity
 			android:name=".SearchActivity"
-			android:label="@string/app_name"
+			android:label="@string/search"
 			android:launchMode="singleTop"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
@@ -63,49 +63,49 @@
 		</activity>
 		<activity
 			android:name=".AboutActivity"
-			android:label="@string/app_name"
+			android:label="@string/about"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".UsefulAppsActivity"
-			android:label="@string/app_name"
+			android:label="@string/helper"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".twitter.TwitterAuthorizationActivity"
-			android:label="@string/app_name"
+			android:label="@string/auth_twitter"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".EditWaypointActivity"
-			android:label="@string/app_name"
+			android:label="@string/waypoint_edit_title"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".NavigateAnyPointActivity"
-			android:label="@string/app_name"
+			android:label="@string/search_destination"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".AddressListActivity"
-			android:label="@string/app_name"
+			android:label="@string/search_address_result"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".SettingsActivity"
-			android:label="@string/app_name"
+			android:label="@string/settings"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".cgeocaches"
-			android:label="@string/app_name"
+			android:label="@string/stored_caches_button"
 			android:configChanges="keyboardHidden|orientation|screenSize" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -124,27 +124,27 @@
         </activity>		    		
 		<activity
 			android:name=".maps.google.GoogleMapActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 		<activity
 			android:name=".maps.mapsforge.MapsforgeMapActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 		<activity
 			android:name=".maps.mapsforge.v024.MapsforgeMapActivity024"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 				<activity
 			android:name=".StaticMapsActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_static_title" >
 		</activity>
 		<activity
 			android:name=".VisitCacheActivity"
-			android:label="@string/app_name">
+			android:label="@string/log_new_log">
 		</activity>
 		<activity
 			android:name=".LogTrackableActivity"
-			android:label="@string/app_name"
+			android:label="@string/trackable_touch"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
@@ -154,7 +154,7 @@
 		</activity>
 		<activity
 				android:name=".CacheDetailActivity"
-				android:label="@string/app_name"
+				android:label="@string/cache"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="wikitudeapi.arcallback" />
@@ -181,7 +181,7 @@
 		</activity>
 		<activity
 				android:name="cgeo.geocaching.TrackableActivity"
-				android:label="@string/app_name"
+				android:label="@string/trackable"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
@@ -204,32 +204,32 @@
 		</activity>
 		<activity
 				android:name=".cgeonavigate"
-				android:label="@string/app_name_compass">
+				android:label="@string/compass_title">
 		</activity>
 		<activity
 			android:name=".GpxFileListActivity"
-			android:label="@string/app_name"
+			android:label="@string/gpx_import_title"
 			android:configChanges="keyboardHidden|orientation" >
     	</activity>
 		<activity
 			android:name=".SelectMapfileActivity"
-			android:label="@string/app_name"
+			android:label="@string/map_file_select_title"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<provider android:name=".apps.LocusDataStorageProvider" 
             android:authorities="cgeo.geocaching.apps.locusdatastorageprovider" />
 		<activity android:name="WaypointPopup"
-		    android:label="@string/app_name"
+		    android:label="@string/waypoint"
 			android:windowSoftInputMode="stateHidden"
 			android:theme="@style/popup_dark"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity android:name=".files.SimpleDirChooser"
-		    android:label="@string/app_name">
+		    android:label="@string/simple_dir_chooser_title">
 		</activity>
 		<activity
 			android:name=".ImageSelectActivity"
-			android:label="@string/app_name">
+			android:label="@string/log_image">
 		</activity>		
 	</application>
 </manifest>
diff --git a/main/libs/butterknife-1.3.2.jar b/main/libs/butterknife-1.3.2.jar
new file mode 100644
index 0000000..1bd6fe6
Binary files /dev/null and b/main/libs/butterknife-1.3.2.jar differ
diff --git a/main/proguard.cfg b/main/proguard.cfg
index ee4d81a..4a8ef4b 100644
--- a/main/proguard.cfg
+++ b/main/proguard.cfg
@@ -63,3 +63,7 @@
 -keepclassmembers class cgeo.geocaching.compatibility.AndroidLevel8 {
     public static <methods>;
 }
+
+# Butter knife view injection, see http://jakewharton.github.io/butterknife/
+-dontwarn butterknife.Views$InjectViewProcessor
+-keepclassmembers class **$$ViewInjector
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index c154ffb..3b76b6c 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.utils.Version;
 
@@ -11,18 +13,17 @@ import android.view.View;
 import android.widget.TextView;
 
 public class AboutActivity extends AbstractActivity {
+    @InjectView(R.id.about_version_string) protected TextView version;
+    @InjectView(R.id.contributors) protected TextView contributors;
+    @InjectView(R.id.changelog) protected TextView changeLog;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.about_activity);
-        setTitle(res.getString(R.string.about));
+        super.onCreate(savedInstanceState, R.layout.about_activity);
 
-        ((TextView) findViewById(R.id.about_version_string)).setText(Version.getVersionName(this));
-        ((TextView) findViewById(R.id.contributors)).setMovementMethod(LinkMovementMethod.getInstance());
-        ((TextView) findViewById(R.id.changelog)).setMovementMethod(LinkMovementMethod.getInstance());
+        version.setText(Version.getVersionName(this));
+        contributors.setMovementMethod(LinkMovementMethod.getInstance());
+        changeLog.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 44acfc5..5769887 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -144,7 +144,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         this.setTheme(ActivityMixin.getDialogTheme());
         // set layout
         setContentView(layout);
-        setTitle(res.getString(R.string.detail));
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/AddressListActivity.java b/main/src/cgeo/geocaching/AddressListActivity.java
index b1de065..150bbc5 100644
--- a/main/src/cgeo/geocaching/AddressListActivity.java
+++ b/main/src/cgeo/geocaching/AddressListActivity.java
@@ -20,11 +20,7 @@ public class AddressListActivity extends AbstractListActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.addresses);
-        setTitle(res.getString(R.string.search_address_result));
+        super.onCreate(savedInstanceState, R.layout.addresses);
 
         // get parameters
         final String keyword = getIntent().getStringExtra(Intents.EXTRA_KEYWORD);
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 074f111..d9ef503 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -199,12 +199,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // initialize the main view and set a default title
-        setTheme();
-        setContentView(R.layout.cacheview);
-        setTitle(res.getString(R.string.cache));
+        super.onCreate(savedInstanceState, R.layout.cacheview);
 
         String geocode = null;
 
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 7f011fc..b937ba0 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ConnectorFactory;
@@ -37,6 +39,7 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Spinner;
 
 import java.util.ArrayList;
@@ -44,6 +47,19 @@ import java.util.EnumSet;
 import java.util.List;
 
 public class EditWaypointActivity extends AbstractActivity {
+    @InjectView(R.id.buttonLatitude) protected Button buttonLat;
+    @InjectView(R.id.buttonLongitude) protected Button buttonLon;
+    @InjectView(R.id.add_waypoint) protected Button addWaypoint;
+    @InjectView(R.id.note) protected EditText note;
+    @InjectView(R.id.wpt_visited_checkbox) protected CheckBox visitedCheckBox;
+    @InjectView(R.id.name) protected AutoCompleteTextView waypointName;
+    @InjectView(R.id.type) protected Spinner waypointTypeSelector;
+    @InjectView(R.id.distance) protected EditText distanceView;
+    @InjectView(R.id.modify_cache_coordinates_group) protected RadioGroup coordinatesGroup;
+    @InjectView(R.id.modify_cache_coordinates_local_and_remote) protected RadioButton modifyBoth;
+    @InjectView(R.id.distanceUnit) protected Spinner distanceUnitSelector;
+    @InjectView(R.id.bearing) protected EditText bearing;
+    @InjectView(R.id.modify_cache_coordinates_local) protected RadioButton modifyLocal;
 
     private String geocode = null;
     private int id = -1;
@@ -78,15 +94,15 @@ public class EditWaypointActivity extends AbstractActivity {
                     visited = waypoint.isVisited();
 
                     if (waypoint.getCoords() != null) {
-                        ((Button) findViewById(R.id.buttonLatitude)).setText(waypoint.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE));
-                        ((Button) findViewById(R.id.buttonLongitude)).setText(waypoint.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE));
+                        buttonLat.setText(waypoint.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE));
+                        buttonLon.setText(waypoint.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE));
                     }
-                    ((EditText) findViewById(R.id.name)).setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getName())).toString());
+                    waypointName.setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getName())).toString());
                     if (BaseUtils.containsHtml(waypoint.getNote())) {
-                        ((EditText) findViewById(R.id.note)).setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getNote())).toString());
+                        note.setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getNote())).toString());
                     }
                     else {
-                        ((EditText) findViewById(R.id.note)).setText(StringUtils.trimToEmpty(waypoint.getNote()));
+                        note.setText(StringUtils.trimToEmpty(waypoint.getNote()));
                     }
                     Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_ONLY);
                     setCoordsModificationVisibility(ConnectorFactory.getConnector(geocode), cache);
@@ -95,7 +111,7 @@ public class EditWaypointActivity extends AbstractActivity {
                 if (own) {
                     initializeWaypointTypeSelector();
                 }
-                ((CheckBox) findViewById(R.id.wpt_visited_checkbox)).setChecked(visited);
+                visitedCheckBox.setChecked(visited);
 
                 initializeDistanceUnitSelector();
             } catch (Exception e) {
@@ -111,11 +127,7 @@ public class EditWaypointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.edit_waypoint_activity);
-        setTitle("waypoint");
+        super.onCreate(savedInstanceState, R.layout.edit_waypoint_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
@@ -138,24 +150,19 @@ public class EditWaypointActivity extends AbstractActivity {
             setTitle(res.getString(R.string.waypoint_edit_title));
         }
 
-        Button buttonLat = (Button) findViewById(R.id.buttonLatitude);
         buttonLat.setOnClickListener(new CoordDialogListener());
-        Button buttonLon = (Button) findViewById(R.id.buttonLongitude);
         buttonLon.setOnClickListener(new CoordDialogListener());
 
-        Button addWaypoint = (Button) findViewById(R.id.add_waypoint);
         addWaypoint.setOnClickListener(new CoordsListener());
 
         List<String> wayPointNames = new ArrayList<String>();
         for (WaypointType wpt : WaypointType.ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL) {
             wayPointNames.add(wpt.getL10n());
         }
-        AutoCompleteTextView textView = (AutoCompleteTextView) findViewById(R.id.name);
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_dropdown_item_1line, wayPointNames);
-        textView.setAdapter(adapter);
+        waypointName.setAdapter(adapter);
 
         if (id > 0) {
-            Spinner waypointTypeSelector = (Spinner) findViewById(R.id.type);
             waypointTypeSelector.setVisibility(View.GONE);
 
             waitDialog = ProgressDialog.show(this, null, res.getString(R.string.waypoint_loading), true);
@@ -171,7 +178,6 @@ public class EditWaypointActivity extends AbstractActivity {
             IConnector con = ConnectorFactory.getConnector(geocode);
             setCoordsModificationVisibility(con, cache);
         }
-        CheckBox visitedCheckBox = ((CheckBox) findViewById(R.id.wpt_visited_checkbox));
         visitedCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -181,16 +187,16 @@ public class EditWaypointActivity extends AbstractActivity {
 
         initializeDistanceUnitSelector();
 
-        disableSuggestions((EditText) findViewById(R.id.distance));
+        disableSuggestions(distanceView);
     }
 
     private void setCoordsModificationVisibility(IConnector con, Geocache cache) {
         if (cache != null && (cache.getType() == CacheType.MYSTERY || cache.getType() == CacheType.MULTI)) {
-            findViewById(R.id.modify_cache_coordinates_group).setVisibility(View.VISIBLE);
-            findViewById(R.id.modify_cache_coordinates_local_and_remote).setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE);
+            coordinatesGroup.setVisibility(View.VISIBLE);
+            modifyBoth.setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE);
         } else {
-            findViewById(R.id.modify_cache_coordinates_group).setVisibility(View.GONE);
-            findViewById(R.id.modify_cache_coordinates_local_and_remote).setVisibility(View.GONE);
+            coordinatesGroup.setVisibility(View.GONE);
+            modifyBoth.setVisibility(View.GONE);
         }
     }
 
@@ -227,9 +233,6 @@ public class EditWaypointActivity extends AbstractActivity {
     }
 
     private void initializeWaypointTypeSelector() {
-
-        Spinner waypointTypeSelector = (Spinner) findViewById(R.id.type);
-
         wpTypes = new ArrayList<WaypointType>(WaypointType.ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL);
         ArrayAdapter<WaypointType> wpAdapter = new ArrayAdapter<WaypointType>(this, android.R.layout.simple_spinner_item, wpTypes.toArray(new WaypointType[wpTypes.size()]));
         wpAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -247,9 +250,6 @@ public class EditWaypointActivity extends AbstractActivity {
     }
 
     private void initializeDistanceUnitSelector() {
-
-        Spinner distanceUnitSelector = (Spinner) findViewById(R.id.distanceUnit);
-
         if (StringUtils.isBlank(distanceUnit)) {
             if (Settings.isUseMetricUnits()) {
                 distanceUnitSelector.setSelection(0); // m
@@ -271,10 +271,8 @@ public class EditWaypointActivity extends AbstractActivity {
             }
 
             try {
-                Button bLat = (Button) findViewById(R.id.buttonLatitude);
-                Button bLon = (Button) findViewById(R.id.buttonLongitude);
-                bLat.setHint(geo.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE_RAW));
-                bLon.setHint(geo.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE_RAW));
+                buttonLat.setHint(geo.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE_RAW));
+                buttonLon.setHint(geo.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE_RAW));
             } catch (final Exception e) {
                 Log.e("failed to update location", e);
             }
@@ -311,8 +309,8 @@ public class EditWaypointActivity extends AbstractActivity {
             coordsDialog.setOnCoordinateUpdate(new CoordinatesInputDialog.CoordinateUpdate() {
                 @Override
                 public void update(final Geopoint gp) {
-                    ((Button) findViewById(R.id.buttonLatitude)).setText(gp.format(GeopointFormatter.Format.LAT_DECMINUTE));
-                    ((Button) findViewById(R.id.buttonLongitude)).setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE));
+                    buttonLat.setText(gp.format(GeopointFormatter.Format.LAT_DECMINUTE));
+                    buttonLon.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE));
                     if (waypoint != null) {
                         waypoint.setCoords(gp);
                     } else {
@@ -378,11 +376,11 @@ public class EditWaypointActivity extends AbstractActivity {
 
         @Override
         public void onClick(View arg0) {
-            final String bearingText = ((EditText) findViewById(R.id.bearing)).getText().toString();
+            final String bearingText = bearing.getText().toString();
             // combine distance from EditText and distanceUnit saved from Spinner
-            final String distanceText = ((EditText) findViewById(R.id.distance)).getText().toString() + distanceUnit;
-            final String latText = ((Button) findViewById(R.id.buttonLatitude)).getText().toString();
-            final String lonText = ((Button) findViewById(R.id.buttonLongitude)).getText().toString();
+            final String distanceText = distanceView.getText().toString() + distanceUnit;
+            final String latText = buttonLat.getText().toString();
+            final String lonText = buttonLon.getText().toString();
 
             if (StringUtils.isBlank(bearingText) && StringUtils.isBlank(distanceText)
                     && StringUtils.isBlank(latText) && StringUtils.isBlank(lonText)) {
@@ -430,9 +428,9 @@ public class EditWaypointActivity extends AbstractActivity {
             }
 
             // if no name is given, just give the waypoint its number as name
-            final String givenName = ((EditText) findViewById(R.id.name)).getText().toString().trim();
+            final String givenName = waypointName.getText().toString().trim();
             final String name = StringUtils.isNotEmpty(givenName) ? givenName : res.getString(R.string.waypoint) + " " + (wpCount + 1);
-            final String note = ((EditText) findViewById(R.id.note)).getText().toString().trim();
+            final String noteText = note.getText().toString().trim();
             final Geopoint coordsToSave = coords;
             final ProgressDialog progress = ProgressDialog.show(EditWaypointActivity.this, getString(R.string.cache), getString(R.string.waypoint_being_saved), true);
             final Handler finishHandler = new Handler() {
@@ -483,7 +481,7 @@ public class EditWaypointActivity extends AbstractActivity {
                     waypoint.setPrefix(prefix);
                     waypoint.setLookup(lookup);
                     waypoint.setCoords(coordsToSave);
-                    waypoint.setNote(note);
+                    waypoint.setNote(noteText);
                     waypoint.setVisited(visited);
                     waypoint.setId(id);
 
@@ -501,8 +499,6 @@ public class EditWaypointActivity extends AbstractActivity {
                                 StaticMapsProvider.storeWaypointStaticMap(cache, waypoint, false);
                             }
                         }
-                        final RadioButton modifyLocal = (RadioButton) findViewById(R.id.modify_cache_coordinates_local);
-                        final RadioButton modifyBoth = (RadioButton) findViewById(R.id.modify_cache_coordinates_local_and_remote);
                         if (modifyLocal.isChecked() || modifyBoth.isChecked()) {
                             if (!cache.hasUserModifiedCoords()) {
                                 final Waypoint origWaypoint = new Waypoint(cgeoapplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
diff --git a/main/src/cgeo/geocaching/GpxFileListActivity.java b/main/src/cgeo/geocaching/GpxFileListActivity.java
index f12a30c..201565e 100644
--- a/main/src/cgeo/geocaching/GpxFileListActivity.java
+++ b/main/src/cgeo/geocaching/GpxFileListActivity.java
@@ -31,11 +31,6 @@ public class GpxFileListActivity extends AbstractFileListActivity<GPXListAdapter
         return Collections.singletonList(new File(Settings.getGpxImportDir()));
     }
 
-    @Override
-    protected void setTitle() {
-        setTitle(res.getString(R.string.gpx_import_title));
-    }
-
     public static void startSubActivity(Activity fromActivity, int listId) {
         final Intent intent = new Intent(fromActivity, GpxFileListActivity.class);
         intent.putExtra(Intents.EXTRA_LIST_ID, listId);
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index 597a7bd..34b433d 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -59,11 +59,7 @@ public class ImageSelectActivity extends AbstractActivity {
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.visit_image);
-        setTitle(res.getString(R.string.log_image));
+        super.onCreate(savedInstanceState, R.layout.visit_image);
 
         scaleChoiceIndex = Settings.getLogImageScale();
         imageCaption = "";
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index b8983ba..6b68225 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -110,11 +110,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.touch);
-        setTitle(res.getString(R.string.trackable_touch));
+        super.onCreate(savedInstanceState, R.layout.touch);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 6f62cd8..0843f66 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -1,5 +1,8 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+import butterknife.Views;
+
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.gc.Login;
@@ -46,13 +49,26 @@ import java.util.List;
 import java.util.Locale;
 
 public class MainActivity extends AbstractActivity {
+    @InjectView(R.id.user_info) protected TextView userInfoView;
+    @InjectView(R.id.nav_satellites) protected TextView navSatellites;
+    @InjectView(R.id.helper) protected RelativeLayout helper;
+    @InjectView(R.id.filter_button_title)protected TextView filterTitle;
+    @InjectView(R.id.map) protected View findOnMap;
+    @InjectView(R.id.search_offline) protected View findByOffline;
+    @InjectView(R.id.advanced_button) protected View advanced;
+    @InjectView(R.id.any_button) protected View any;
+    @InjectView(R.id.filter_button) protected View filter;
+    @InjectView(R.id.nearest) protected View nearestView ;
+    @InjectView(R.id.nav_type) protected TextView navType ;
+    @InjectView(R.id.nav_accuracy) protected TextView navAccuracy ;
+    @InjectView(R.id.nav_location) protected TextView navLocation ;
+    @InjectView(R.id.offline_count) protected TextView countBubble ;
 
     private static final String SCAN_INTENT = "com.google.zxing.client.android.SCAN";
     private static final int SCAN_REQUEST_CODE = 1;
     public static final int SEARCH_REQUEST_CODE = 2;
 
     private int version = 0;
-    private TextView filterTitle = null;
     private boolean cleanupRunning = false;
     private int countBubbleCnt = 0;
     private Geopoint addCoords = null;
@@ -67,8 +83,6 @@ public class MainActivity extends AbstractActivity {
         @Override
         public void handleMessage(Message msg) {
 
-            TextView userInfoView = (TextView) findViewById(R.id.user_info);
-
             StringBuilder userInfo = new StringBuilder("geocaching.com").append(Formatter.SEPARATOR);
             if (Login.isActualLoginStatus()) {
                 userInfo.append(Login.getActualUserName());
@@ -109,7 +123,6 @@ public class MainActivity extends AbstractActivity {
 
                     addCoords = app.currentGeo().getCoords();
 
-                    TextView navLocation = (TextView) findViewById(R.id.nav_location);
                     navLocation.setText(addText.toString());
                 }
             } catch (Exception e) {
@@ -137,7 +150,6 @@ public class MainActivity extends AbstractActivity {
             satellitesFixed = data.getSatellitesFixed();
             satellitesVisible = data.getSatellitesVisible();
 
-            final TextView navSatellites = (TextView) findViewById(R.id.nav_satellites);
             if (gpsEnabled) {
                 if (satellitesFixed > 0) {
                     navSatellites.setText(res.getString(R.string.loc_sat) + ": " + satellitesFixed + '/' + satellitesVisible);
@@ -175,7 +187,10 @@ public class MainActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // don't call the super implementation with the layout argument, as that would set the wrong theme
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+        Views.inject(this);
 
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
             // If we had been open already, start from the last used activity.
@@ -183,7 +198,6 @@ public class MainActivity extends AbstractActivity {
             return;
         }
 
-        setContentView(R.layout.main);
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); // type to search
 
         version = Version.getVersionCode(this);
@@ -191,7 +205,6 @@ public class MainActivity extends AbstractActivity {
 
         try {
             if (!Settings.isHelpShown()) {
-                final RelativeLayout helper = (RelativeLayout) findViewById(R.id.helper);
                 if (helper != null) {
                     helper.setVisibility(View.VISIBLE);
                     helper.setClickable(true);
@@ -337,9 +350,6 @@ public class MainActivity extends AbstractActivity {
     }
 
     private void setFilterTitle() {
-        if (filterTitle == null) {
-            filterTitle = (TextView) findViewById(R.id.filter_button_title);
-        }
         filterTitle.setText(Settings.getCacheType().getL10n());
     }
 
@@ -357,7 +367,6 @@ public class MainActivity extends AbstractActivity {
             (new FirstLoginThread()).start();
         }
 
-        final View findOnMap = findViewById(R.id.map);
         findOnMap.setClickable(true);
         findOnMap.setOnClickListener(new OnClickListener() {
             @Override
@@ -366,7 +375,6 @@ public class MainActivity extends AbstractActivity {
             }
         });
 
-        final View findByOffline = findViewById(R.id.search_offline);
         findByOffline.setClickable(true);
         findByOffline.setOnClickListener(new OnClickListener() {
             @Override
@@ -391,7 +399,6 @@ public class MainActivity extends AbstractActivity {
         });
         findByOffline.setLongClickable(true);
 
-        final View advanced = findViewById(R.id.advanced_button);
         advanced.setClickable(true);
         advanced.setOnClickListener(new OnClickListener() {
             @Override
@@ -400,7 +407,6 @@ public class MainActivity extends AbstractActivity {
             }
         });
 
-        final View any = findViewById(R.id.any_button);
         any.setClickable(true);
         any.setOnClickListener(new OnClickListener() {
             @Override
@@ -409,7 +415,6 @@ public class MainActivity extends AbstractActivity {
             }
         });
 
-        final View filter = findViewById(R.id.filter_button);
         filter.setClickable(true);
         filter.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -518,10 +523,6 @@ public class MainActivity extends AbstractActivity {
 
         @Override
         public void updateGeoData(final IGeoData geo) {
-            final View nearestView = findViewById(R.id.nearest);
-            final TextView navType = (TextView) findViewById(R.id.nav_type);
-            final TextView navAccuracy = (TextView) findViewById(R.id.nav_accuracy);
-            final TextView navLocation = (TextView) findViewById(R.id.nav_location);
             try {
                 if (geo.getCoords() != null) {
                     if (!nearestView.isClickable()) {
@@ -582,7 +583,7 @@ public class MainActivity extends AbstractActivity {
      *            unused here but needed since this method is referenced from XML layout
      */
     public void cgeoFindOnMap(View v) {
-        findViewById(R.id.map).setPressed(true);
+        findOnMap.setPressed(true);
         CGeoMap.startActivityLiveMap(this);
     }
 
@@ -595,7 +596,7 @@ public class MainActivity extends AbstractActivity {
             return;
         }
 
-        findViewById(R.id.nearest).setPressed(true);
+        nearestView.setPressed(true);
         cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
     }
 
@@ -604,7 +605,7 @@ public class MainActivity extends AbstractActivity {
      *            unused here but needed since this method is referenced from XML layout
      */
     public void cgeoFindByOffline(View v) {
-        findViewById(R.id.search_offline).setPressed(true);
+        findByOffline.setPressed(true);
         cgeocaches.startActivityOffline(this);
     }
 
@@ -613,7 +614,7 @@ public class MainActivity extends AbstractActivity {
      *            unused here but needed since this method is referenced from XML layout
      */
     public void cgeoSearch(View v) {
-        findViewById(R.id.advanced_button).setPressed(true);
+        advanced.setPressed(true);
         startActivity(new Intent(this, SearchActivity.class));
     }
 
@@ -622,7 +623,7 @@ public class MainActivity extends AbstractActivity {
      *            unused here but needed since this method is referenced from XML layout
      */
     public void cgeoPoint(View v) {
-        findViewById(R.id.any_button).setPressed(true);
+        any.setPressed(true);
         startActivity(new Intent(this, NavigateAnyPointActivity.class));
     }
 
@@ -631,8 +632,8 @@ public class MainActivity extends AbstractActivity {
      *            unused here but needed since this method is referenced from XML layout
      */
     public void cgeoFilter(View v) {
-        findViewById(R.id.filter_button).setPressed(true);
-        findViewById(R.id.filter_button).performClick();
+        filter.setPressed(true);
+        filter.performClick();
     }
 
     /**
@@ -645,15 +646,10 @@ public class MainActivity extends AbstractActivity {
 
     private class CountBubbleUpdateThread extends Thread {
         private Handler countBubbleHandler = new Handler() {
-            private TextView countBubble = null;
 
             @Override
             public void handleMessage(Message msg) {
                 try {
-                    if (countBubble == null) {
-                        countBubble = (TextView) findViewById(R.id.offline_count);
-                    }
-
                     if (countBubbleCnt == 0) {
                         countBubble.setVisibility(View.GONE);
                     } else {
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index 74f656b..746842d 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -108,11 +108,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.point);
-        setTitle(res.getString(R.string.search_destination));
+        super.onCreate(savedInstanceState, R.layout.point);
 
         createHistoryView();
 
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index ecbd2b2..a3a0797 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -64,7 +64,6 @@ public class SearchActivity extends AbstractActivity {
 
         setTheme();
         setContentView(R.layout.search);
-        setTitle(res.getString(R.string.search));
 
         init();
     }
diff --git a/main/src/cgeo/geocaching/SelectMapfileActivity.java b/main/src/cgeo/geocaching/SelectMapfileActivity.java
index 9557f3e..aa6d46a 100644
--- a/main/src/cgeo/geocaching/SelectMapfileActivity.java
+++ b/main/src/cgeo/geocaching/SelectMapfileActivity.java
@@ -55,11 +55,6 @@ public class SelectMapfileActivity extends AbstractFileListActivity<FileSelectio
     }
 
     @Override
-    protected void setTitle() {
-        setTitle(res.getString(R.string.map_file_select_title));
-    }
-
-    @Override
     public String getCurrentFile() {
         return mapFile;
     }
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index 0678617..d094358 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -129,13 +129,7 @@ public class SettingsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // init
-
-        setTheme();
-        setContentView(R.layout.init);
-        setTitle(res.getString(R.string.settings));
+        super.onCreate(savedInstanceState, R.layout.init);
 
         init();
     }
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index 005ee9e..3b32067 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -88,11 +88,7 @@ public class StaticMapsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.map_static);
-        setTitle(res.getString(R.string.map_static_title));
+        super.onCreate(savedInstanceState, R.layout.map_static);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index fea4521..9f71f69 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -114,11 +114,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.trackable_activity);
-        setTitle(res.getString(R.string.trackable));
+        super.onCreate(savedInstanceState, R.layout.trackable_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index af643b3..ce8bbdd 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+
 import cgeo.geocaching.activity.AbstractActivity;
 
 import android.content.Intent;
@@ -15,17 +17,11 @@ import java.util.Locale;
 
 public class UsefulAppsActivity extends AbstractActivity {
 
-    private LinearLayout parentLayout;
+    @InjectView(R.id.parent) protected LinearLayout parentLayout;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // init
-        setTheme();
-        setContentView(R.layout.useful_apps);
-        setTitle(res.getString(R.string.helpers));
-        parentLayout = (LinearLayout) findViewById(R.id.parent);
+        super.onCreate(savedInstanceState, R.layout.useful_apps);
 
         final Locale loc = Locale.getDefault();
         final String language = loc.getLanguage();
@@ -45,12 +41,6 @@ public class UsefulAppsActivity extends AbstractActivity {
         addApp(R.string.helper_barcode_title, R.string.helper_barcode_description, R.drawable.helper_barcode, "com.google.zxing.client.android");
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-    }
-
     private void installFromMarket(String marketId) {
         try {
             startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + marketId)));
@@ -62,18 +52,18 @@ public class UsefulAppsActivity extends AbstractActivity {
     }
 
     private void addApp(final int titleId, final int descriptionId, final int imageId, final String marketUrl) {
-        final LinearLayout layout = (LinearLayout) getLayoutInflater().inflate(R.layout.useful_apps_item, null);
-        ((TextView) layout.findViewById(R.id.title)).setText(res.getString(titleId));
-        ((ImageView) layout.findViewById(R.id.image)).setImageDrawable(res.getDrawable(imageId));
-        ((TextView) layout.findViewById(R.id.description)).setText(res.getString(descriptionId));
-        layout.findViewById(R.id.app_layout).setOnClickListener(new OnClickListener() {
+        final View appLayout = getLayoutInflater().inflate(R.layout.useful_apps_item, null);
+        ((TextView) appLayout.findViewById(R.id.title)).setText(res.getString(titleId));
+        ((ImageView) appLayout.findViewById(R.id.image)).setImageDrawable(res.getDrawable(imageId));
+        ((TextView) appLayout.findViewById(R.id.description)).setText(res.getString(descriptionId));
+        appLayout.findViewById(R.id.app_layout).setOnClickListener(new OnClickListener() {
 
             @Override
             public void onClick(View v) {
                 installFromMarket(marketUrl);
             }
         });
-        parentLayout.addView(layout);
+        parentLayout.addView(appLayout);
     }
 
 }
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 74890f4..864ebf8 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -244,11 +244,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.visit);
-        setTitle(res.getString(R.string.log_new_log));
+        super.onCreate(savedInstanceState, R.layout.visit);
 
         // Get parameters from intent and basic cache information from database
         final Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 557665e..ad65ca3 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.activity;
 
+import butterknife.Views;
+
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.compatibility.Compatibility;
@@ -43,15 +45,15 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         ActivityMixin.goManual(this, helpTopic);
     }
 
-    final public void setTitle(final String title) {
+    final protected void setTitle(final String title) {
         ActivityMixin.setTitle(this, title);
     }
 
-    final public void showProgress(final boolean show) {
+    final protected void showProgress(final boolean show) {
         ActivityMixin.showProgress(this, show);
     }
 
-    final public void setTheme() {
+    final protected void setTheme() {
         ActivityMixin.setTheme(this);
     }
 
@@ -70,22 +72,14 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         ActivityMixin.helpDialog(this, title, message);
     }
 
-    public final void helpDialog(final String title, final String message, final Drawable icon) {
+    protected final void helpDialog(final String title, final String message, final Drawable icon) {
         ActivityMixin.helpDialog(this, title, message, icon);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        // init
-        res = this.getResources();
-        app = (cgeoapplication) this.getApplication();
-
-        // Restore cookie store if needed
-        Cookies.restoreCookieStore(Settings.getCookieStore());
-
-        ActivityMixin.keepScreenOn(this, keepScreenOn);
+        initializeCommonFields();
     }
 
     protected static void disableSuggestions(final EditText edit) {
@@ -128,4 +122,34 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         editText.setSelection(newCursor, newCursor);
     }
 
+    protected void onCreate(final Bundle savedInstanceState, final int resourceLayoutID) {
+        super.onCreate(savedInstanceState);
+
+        initializeCommonFields();
+
+        // non declarative part of layout
+        setTheme();
+        setContentView(resourceLayoutID);
+
+        // create view variables
+        Views.inject(this);
+    }
+
+    private void initializeCommonFields() {
+        // initialize commonly used members
+        res = this.getResources();
+        app = (cgeoapplication) this.getApplication();
+
+        // only needed in some activities, but implemented in super class nonetheless
+        Cookies.restoreCookieStore(Settings.getCookieStore());
+        ActivityMixin.keepScreenOn(this, keepScreenOn);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        super.setContentView(layoutResID);
+
+        // initialize the action bar title with the activity title for single source
+        ActivityMixin.setTitle(this, getTitle());
+    }
 }
diff --git a/main/src/cgeo/geocaching/activity/AbstractListActivity.java b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
index f96a769..ead47bd 100644
--- a/main/src/cgeo/geocaching/activity/AbstractListActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
@@ -71,7 +71,10 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initializeCommonFields();
+    }
 
+    private void initializeCommonFields() {
         // init
         res = this.getResources();
         app = (cgeoapplication) this.getApplication();
@@ -79,7 +82,7 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
         ActivityMixin.keepScreenOn(this, keepScreenOn);
     }
 
-    final public void setTitle(final String title) {
+    final protected void setTitle(final String title) {
         ActivityMixin.setTitle(this, title);
     }
 
@@ -87,4 +90,20 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
     public void invalidateOptionsMenuCompatible() {
         Compatibility.invalidateOptionsMenu(this);
     }
+
+    public void onCreate(Bundle savedInstanceState, int resourceLayoutID) {
+        super.onCreate(savedInstanceState);
+        initializeCommonFields();
+
+        setTheme();
+        setContentView(resourceLayoutID);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        super.setContentView(layoutResID);
+
+        // initialize action bar title with activity title
+        ActivityMixin.setTitle(this, getTitle());
+    }
 }
diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index 8432243..bc524ec 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.activity;
 
+import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.compatibility.Compatibility;
 
 import org.apache.commons.lang3.StringUtils;
@@ -48,7 +48,7 @@ public final class ActivityMixin {
         }
     }
 
-    public static void setTitle(final Activity activity, final String text) {
+    public static void setTitle(final Activity activity, final CharSequence text) {
         if (StringUtils.isBlank(text)) {
             return;
         }
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index 929f0a3..b5205a6 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -52,11 +52,7 @@ public class cgeonavigate extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.navigate);
-        setTitle(res.getString(R.string.compass_title));
+        super.onCreate(savedInstanceState, R.layout.navigate);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
index 5ff0d91..8b02eeb 100644
--- a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
+++ b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
@@ -89,7 +89,6 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
 
         setTheme();
         setContentView(R.layout.gpx);
-        setTitle();
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
@@ -146,11 +145,6 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
      */
     protected abstract List<File> getBaseFolders();
 
-    /**
-     * Triggers the deriving class to set the title
-     */
-    protected abstract void setTitle();
-
     private class SearchFilesThread extends Thread {
 
         private final FileListSelector selector = new FileListSelector();
diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 844287c..824173c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -2,11 +2,11 @@ package cgeo.geocaching.files;
 
 import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
+import cgeo.geocaching.activity.AbstractListActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 
 import org.apache.commons.lang3.StringUtils;
 
-import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * Dialog for choosing a file or directory.
  */
-public class SimpleDirChooser extends ListActivity {
+public class SimpleDirChooser extends AbstractListActivity {
     private static final String PARENT_DIR = "..        ";
     private File currentDir;
     private FileArrayAdapter adapter;
@@ -46,7 +46,6 @@ public class SimpleDirChooser extends ListActivity {
 
         ActivityMixin.setTheme(this);
         setContentView(R.layout.simple_dir_chooser);
-        setTitle(this.getResources().getString(R.string.simple_dir_chooser_title));
 
         fill(currentDir);
 
@@ -106,13 +105,13 @@ public class SimpleDirChooser extends ListActivity {
 
     public class FileArrayAdapter extends ArrayAdapter<Option> {
 
-        private Context content;
+        private Context context;
         private int id;
         private List<Option> items;
 
         public FileArrayAdapter(Context context, int simpleDirItemResId, List<Option> objects) {
             super(context, simpleDirItemResId, objects);
-            this.content = context;
+            this.context = context;
             this.id = simpleDirItemResId;
             this.items = objects;
         }
@@ -126,7 +125,7 @@ public class SimpleDirChooser extends ListActivity {
         public View getView(int position, View convertView, ViewGroup parent) {
             View v = convertView;
             if (v == null) {
-                LayoutInflater vi = (LayoutInflater) content.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                LayoutInflater vi = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                 v = vi.inflate(id, null);
             }
 
diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 3d9f283..3bc1dec 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -89,21 +89,11 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTheme();
-        setContentView(R.layout.twitter_authorization_activity);
-        setTitle(res.getString(R.string.auth_twitter));
+        super.onCreate(savedInstanceState, R.layout.twitter_authorization_activity);
 
         init();
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-    }
-
     private void init() {
         startButton = (Button) findViewById(R.id.start);
         pinEntry = (EditText) findViewById(R.id.pin);
-- 
cgit v1.1


From 9eae0750719e94dab9dae6540095e19fa7b11ff9 Mon Sep 17 00:00:00 2001
From: koem <koem@petoria.de>
Date: Tue, 30 Apr 2013 16:50:25 -0500
Subject: issue2662 OC: leichtes Klettern

---
 main/project/attributes/iconlist.txt               |   3 +-
 main/project/attributes/svgs/easy_climbing.svg     |  84 +++++++++++++++++++++
 main/res/drawable-mdpi/attribute_easy_climbing.png | Bin 0 -> 1236 bytes
 main/res/values-de/strings.xml                     |   2 +
 main/res/values/strings.xml                        |   2 +
 main/src/cgeo/geocaching/cgData.java               |  12 ++-
 .../geocaching/enumerations/CacheAttribute.java    |  27 +++----
 7 files changed, 110 insertions(+), 20 deletions(-)
 create mode 100644 main/project/attributes/svgs/easy_climbing.svg
 create mode 100644 main/res/drawable-mdpi/attribute_easy_climbing.png

(limited to 'main')

diff --git a/main/project/attributes/iconlist.txt b/main/project/attributes/iconlist.txt
index 046add1..8b75ab6 100644
--- a/main/project/attributes/iconlist.txt
+++ b/main/project/attributes/iconlist.txt
@@ -27,7 +27,7 @@ kids              |   6  |  59  |  x  | PD      |                           | ht
 onehour           |   7  |      |  x  | CC0     | The Noun Project          | http://thenounproject.com/noun/clock/#icon-No2306
 scenic            |   8  |      |     | PD      | USA National Park Service | http://thenounproject.com/noun/binoculars/#icon-No112
 hiking            |   9  |  25  |     | PD      | USA National Park Service | http://thenounproject.com/noun/hiker/#icon-No562
-climbing          |  10  |  28  |     | PD      | USA National Park Service | http://thenounproject.com/noun/climbing/#icon-No526
+climbing          |  10  |      |     | PD      | USA National Park Service | http://thenounproject.com/noun/climbing/#icon-No526
 wading            |  11  |      |  x  | PD      | USA National Park Service | http://thenounproject.com/noun/wading/#icon-No581
 swimming          |  12  |  29  |     | PD      | USA National Park Service | http://thenounproject.com/noun/swimming/#icon-No226
 available         |  13  |  38  |  x  | PD      | koem                      | selfmade
@@ -86,6 +86,7 @@ railway           |      |  10  |     | CC0     |                           | ht
 syringe           |      |  23  |     | CC0     | Betovarg Jabib            | http://thenounproject.com/noun/syringe/#icon-No1508
 swamp             |      |  26  |  x  | CC0     | Megan Strickland          | http://thenounproject.com/noun/hand/#icon-No1477
 hills             |      |  27  |  x  | PD      | koem                      | selfmade
+easy_climbing     |      |  28  |  x  | PD      | USA National Park Service | http://thenounproject.com/noun/climbing/#icon-No526
 poi               |      |  30  |     | PD      |                           | http://thenounproject.com/noun/point-of-interest/#icon-No522
 moving_target     |      |  31  |  x  | PD      |                           | http://thenounproject.com/noun/running/#icon-No246
 webcam            |      |  32  |     | PD      |                           | http://thenounproject.com/noun/video-camera/#icon-No637
diff --git a/main/project/attributes/svgs/easy_climbing.svg b/main/project/attributes/svgs/easy_climbing.svg
new file mode 100644
index 0000000..682b053
--- /dev/null
+++ b/main/project/attributes/svgs/easy_climbing.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="96.114998"
+   height="94.002548"
+   viewBox="0 0 96.114999 94.002552"
+   enable-background="new 0 0 99.572 99.993"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="easy_climbing.svg"><metadata
+   id="metadata2876"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2874"><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 49.996498 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="99.571999 : 49.996498 : 1"
+     inkscape:persp3d-origin="49.785999 : 33.330999 : 1"
+     id="perspective2878" /></defs><sodipodi:namedview
+   pagecolor="#009674"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="1"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1317"
+   inkscape:window-height="744"
+   id="namedview2872"
+   showgrid="false"
+   inkscape:zoom="3.3377778"
+   inkscape:cx="46.452495"
+   inkscape:cy="45.214888"
+   inkscape:window-x="49"
+   inkscape:window-y="24"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+
+<path
+   d="m 77.215999,51.217552 7.57,-1.002 6.642,-27.295 4.687,0.25 0,66.571 c 0,2.356 -1.904,4.261003 -4.26,4.261003 L 2.1299988,93.927555 -1.1822193e-6,84.804552 23.584999,79.566552 l 3.685,-8.748 21.756,-7.77 16.636,7.369 6.392,-2.081 5.162,-17.119 z"
+   id="path2866"
+   style="fill:#ffffff"
+   inkscape:connector-curvature="0" />
+<g
+   id="g2986"
+   transform="matrix(0.74143286,0,0,0.74143286,0.25199462,0)"><path
+     style="fill:#ffffff"
+     id="path2864"
+     d="m 11.271,42.81 c -0.451,0.927 -0.777,1.955 -0.952,3.058 -0.075,0.552 -0.126,1.103 -0.126,1.654 l 0.401,25.259 -8.723,18.798 c -0.301,0.552 -0.526,1.203 -0.626,1.88 -0.477,3.107 1.654,5.99 4.762,6.467 2.406,0.376 4.712,-0.853 5.815,-2.883 l 9.6,-20.553 c 0.2,-0.477 0.376,-0.978 0.451,-1.529 0.024,-0.25 0.05,-0.525 0.05,-0.776 l -0.075,-15.608 14.738,6.435 2.381,15.265 c 0.477,2.23 2.306,4.01 4.688,4.386 3.107,0.451 5.99,-1.679 6.466,-4.763 0.075,-0.525 0.075,-1.053 0.025,-1.553 L 47.238,59.93 c -0.352,-1.78 -1.529,-3.309 -3.184,-4.086 l -13.184,-5.865 8.396,-14.613 4.161,5.289 c 0.426,0.477 0.977,0.877 1.604,1.128 l 15.866,4.637 c 2.105,0.451 4.261,-0.652 5.088,-2.682 0.928,-2.306 -0.176,-4.913 -2.456,-5.84 -0.075,-0.025 -0.15,-0.05 -0.226,-0.075 L 49.517,33.762 39.143,21.305 C 37.588,19.651 35.508,18.473 33.102,18.097 28.891,17.47 24.906,19.475 22.8,22.884 L 11.271,42.81 z"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     id="path2868"
+     d="m 38.24,16.994 c 4.687,0 8.496,-3.81 8.496,-8.497 C 46.736,3.81 42.927,0 38.24,0 c -4.688,0 -8.497,3.81 -8.497,8.497 0,4.687 3.81,8.497 8.497,8.497 z"
+     inkscape:connector-curvature="0" /></g>
+
+<g
+   transform="matrix(0.44375412,0,0,0.44375412,51.851618,11.258457)"
+   id="g2986-6"><path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff"
+     id="path2864-9"
+     d="m 11.271,42.81 c -0.451,0.927 -0.777,1.955 -0.952,3.058 -0.075,0.552 -0.126,1.103 -0.126,1.654 l 0.401,25.259 -8.723,18.798 c -0.301,0.552 -0.526,1.203 -0.626,1.88 -0.477,3.107 1.654,5.99 4.762,6.467 2.406,0.376 4.712,-0.853 5.815,-2.883 l 9.6,-20.553 c 0.2,-0.477 0.376,-0.978 0.451,-1.529 0.024,-0.25 0.05,-0.525 0.05,-0.776 l -0.075,-15.608 14.738,6.435 2.381,15.265 c 0.477,2.23 2.306,4.01 4.688,4.386 3.107,0.451 5.99,-1.679 6.466,-4.763 0.075,-0.525 0.075,-1.053 0.025,-1.553 L 47.238,59.93 c -0.352,-1.78 -1.529,-3.309 -3.184,-4.086 l -13.184,-5.865 8.396,-14.613 4.161,5.289 c 0.426,0.477 0.977,0.877 1.604,1.128 l 15.866,4.637 c 2.105,0.451 4.261,-0.652 5.088,-2.682 0.928,-2.306 -0.176,-4.913 -2.456,-5.84 -0.075,-0.025 -0.15,-0.05 -0.226,-0.075 L 49.517,33.762 39.143,21.305 C 37.588,19.651 35.508,18.473 33.102,18.097 28.891,17.47 24.906,19.475 22.8,22.884 L 11.271,42.81 z" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff"
+     id="path2868-3"
+     d="m 38.24,16.994 c 4.687,0 8.496,-3.81 8.496,-8.497 C 46.736,3.81 42.927,0 38.24,0 c -4.688,0 -8.497,3.81 -8.497,8.497 0,4.687 3.81,8.497 8.497,8.497 z" /></g></svg>
\ No newline at end of file
diff --git a/main/res/drawable-mdpi/attribute_easy_climbing.png b/main/res/drawable-mdpi/attribute_easy_climbing.png
new file mode 100644
index 0000000..ecf10b8
Binary files /dev/null and b/main/res/drawable-mdpi/attribute_easy_climbing.png differ
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index ab0b11e..37aa5aa 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -991,6 +991,8 @@
   <string name="attribute_swamp_no">Nicht sumpfig / kein matschiges Gelände</string>
   <string name="attribute_hills_yes">Hügeliges Gelände</string>
   <string name="attribute_hills_no">Kein hügeliges Gelände</string>
+  <string name="attribute_easy_climbing_yes">Einfaches Klettern</string>
+  <string name="attribute_easy_climbing_no">Kein einfaches Klettern</string>
   <string name="attribute_poi_yes">Interessanter Ort</string>
   <string name="attribute_poi_no">Uninteressanter Ort</string>
   <string name="attribute_moving_target_yes">Bewegliches Ziel</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 28a57e0..b08ad5a 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1005,6 +1005,8 @@
   <string name="attribute_swamp_no">No swamp or marsh</string>
   <string name="attribute_hills_yes">Hilly area</string>
   <string name="attribute_hills_no">No hilly area</string>
+  <string name="attribute_easy_climbing_yes">Easy climbing</string>
+  <string name="attribute_easy_climbing_no">No easy climbing</string>
   <string name="attribute_poi_yes">Point of interest</string>
   <string name="attribute_poi_no">No point of interest</string>
   <string name="attribute_moving_target_yes">Moving target</string>
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 86821fb..8a6d718 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -86,7 +86,7 @@ public class cgData {
     private static int[] cacheColumnIndex;
     private static CacheCache cacheCache = new CacheCache();
     private static SQLiteDatabase database = null;
-    private static final int dbVersion = 66;
+    private static final int dbVersion = 67;
     public static final int customListIdOffset = 10;
     private static final String dbName = "data";
     private static final String dbTableCaches = "cg_caches";
@@ -675,6 +675,16 @@ public class cgData {
 
                         }
                     }
+                    // issue2662 OC: Leichtes Klettern / Easy climbing
+                    if (oldVersion < 67) {
+                        try {
+                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_yes' where geocode like 'O%' and attribute = 'climbing_yes'");
+                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_no' where geocode like 'O%' and attribute = 'climbing_no'");
+                        } catch (Exception e) {
+                            Log.e("Failed to upgrade to ver. 67", e);
+
+                        }
+                    }
                 }
 
                 db.setTransactionSuccessful();
diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 530869f..339516b 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -12,8 +12,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum CacheAttribute {
-    // THIS LIST IS GENERATED: don't change anything here but in
-    // project/attributes/makeEnum.sh
+    // THIS LIST IS GENERATED: don't change anything here but read
+    // project/attributes/readme.txt
     DOGS(1, -1, "dogs", R.drawable.attribute_dogs, R.string.attribute_dogs_yes, R.string.attribute_dogs_no),
     BICYCLES(32, -1, "bicycles", R.drawable.attribute_bicycles, R.string.attribute_bicycles_yes, R.string.attribute_bicycles_no),
     MOTORCYCLES(33, -1, "motorcycles", R.drawable.attribute_motorcycles, R.string.attribute_motorcycles_yes, R.string.attribute_motorcycles_no),
@@ -27,7 +27,7 @@ public enum CacheAttribute {
     ONEHOUR(7, -1, "onehour", R.drawable.attribute_onehour, R.string.attribute_onehour_yes, R.string.attribute_onehour_no),
     SCENIC(8, -1, "scenic", R.drawable.attribute_scenic, R.string.attribute_scenic_yes, R.string.attribute_scenic_no),
     HIKING(9, 25, "hiking", R.drawable.attribute_hiking, R.string.attribute_hiking_yes, R.string.attribute_hiking_no),
-    CLIMBING(10, 28, "climbing", R.drawable.attribute_climbing, R.string.attribute_climbing_yes, R.string.attribute_climbing_no),
+    CLIMBING(10, -1, "climbing", R.drawable.attribute_climbing, R.string.attribute_climbing_yes, R.string.attribute_climbing_no),
     WADING(11, -1, "wading", R.drawable.attribute_wading, R.string.attribute_wading_yes, R.string.attribute_wading_no),
     SWIMMING(12, 29, "swimming", R.drawable.attribute_swimming, R.string.attribute_swimming_yes, R.string.attribute_swimming_no),
     AVAILABLE(13, 38, "available", R.drawable.attribute_available, R.string.attribute_available_yes, R.string.attribute_available_no),
@@ -86,6 +86,7 @@ public enum CacheAttribute {
     SYRINGE(-1, 23, "syringe", R.drawable.attribute_syringe, R.string.attribute_syringe_yes, R.string.attribute_syringe_no),
     SWAMP(-1, 26, "swamp", R.drawable.attribute_swamp, R.string.attribute_swamp_yes, R.string.attribute_swamp_no),
     HILLS(-1, 27, "hills", R.drawable.attribute_hills, R.string.attribute_hills_yes, R.string.attribute_hills_no),
+    EASY_CLIMBING(-1, 28, "easy_climbing", R.drawable.attribute_easy_climbing, R.string.attribute_easy_climbing_yes, R.string.attribute_easy_climbing_no),
     POI(-1, 30, "poi", R.drawable.attribute_poi, R.string.attribute_poi_yes, R.string.attribute_poi_no),
     MOVING_TARGET(-1, 31, "moving_target", R.drawable.attribute_moving_target, R.string.attribute_moving_target_yes, R.string.attribute_moving_target_no),
     WEBCAM(-1, 32, "webcam", R.drawable.attribute_webcam, R.string.attribute_webcam_yes, R.string.attribute_webcam_no),
@@ -108,8 +109,8 @@ public enum CacheAttribute {
     OTHER_CACHE(-1, 57, "other_cache", R.drawable.attribute_other_cache, R.string.attribute_other_cache_yes, R.string.attribute_other_cache_no),
     ASK_OWNER(-1, 58, "ask_owner", R.drawable.attribute_ask_owner, R.string.attribute_ask_owner_yes, R.string.attribute_ask_owner_no),
     UNKNOWN(-1, -1, "unknown", R.drawable.attribute_unknown, R.string.attribute_unknown_yes, R.string.attribute_unknown_no);
-    // THIS LIST IS GENERATED: don't change anything here but in
-    // project/attributes/makeEnum.sh
+    // THIS LIST IS GENERATED: don't change anything here but read
+    // project/attributes/readme.txt
 
     private static final String INTERNAL_YES = "_yes";
     private static final String INTERNAL_NO = "_no";
@@ -146,30 +147,20 @@ public enum CacheAttribute {
     }
 
     private final static Map<String, CacheAttribute> FIND_BY_GCRAWNAME;
+    private final static SparseArray<CacheAttribute> FIND_BY_GCID = new SparseArray<CacheAttribute>();
+    private final static SparseArray<CacheAttribute> FIND_BY_OCID = new SparseArray<CacheAttribute>();
     static {
         final HashMap<String, CacheAttribute> mapGcRawNames = new HashMap<String, CacheAttribute>();
         for (CacheAttribute attr : values()) {
             mapGcRawNames.put(attr.rawName, attr);
-        }
-        FIND_BY_GCRAWNAME = Collections.unmodifiableMap(mapGcRawNames);
-    }
-
-    private final static SparseArray<CacheAttribute> FIND_BY_GCID = new SparseArray<CacheAttribute>();
-    static {
-        for (CacheAttribute attr : values()) {
             if (attr.gcid != NO_ID) {
                 FIND_BY_GCID.put(attr.gcid, attr);
             }
-        }
-    }
-
-    private final static SparseArray<CacheAttribute> FIND_BY_OCID = new SparseArray<CacheAttribute>();
-    static {
-        for (CacheAttribute attr : values()) {
             if (attr.ocid != NO_ID) {
                 FIND_BY_OCID.put(attr.ocid, attr);
             }
         }
+        FIND_BY_GCRAWNAME = Collections.unmodifiableMap(mapGcRawNames);
     }
 
     public static CacheAttribute getByRawName(final String rawName) {
-- 
cgit v1.1


From f1b416672ae6562e2521959066af2ae3c583c738 Mon Sep 17 00:00:00 2001
From: rsudev <rasch@munin-soft.de>
Date: Thu, 2 May 2013 18:44:12 +0200
Subject: Fixes #2692, NB 2013.05.02 crashes at start

Modified proguard.cfg to include all methods of the view injector
classes.
---
 main/proguard.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/proguard.cfg b/main/proguard.cfg
index 4a8ef4b..23d603d 100644
--- a/main/proguard.cfg
+++ b/main/proguard.cfg
@@ -66,4 +66,4 @@
 
 # Butter knife view injection, see http://jakewharton.github.io/butterknife/
 -dontwarn butterknife.Views$InjectViewProcessor
--keepclassmembers class **$$ViewInjector
\ No newline at end of file
+-keepclassmembers class **$$ViewInjector {*;}
\ No newline at end of file
-- 
cgit v1.1


From 6112434370cfbfb3be8fddf0dd75f87c563a2dde Mon Sep 17 00:00:00 2001
From: koem <koem@petoria.de>
Date: Fri, 3 May 2013 12:42:49 -0500
Subject: Database update

* changed from O% to OC% - at least in OC caches the attributes seem to be the same (across sites)
* changed english text
---
 main/res/values/strings.xml          | 4 ++--
 main/src/cgeo/geocaching/cgData.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index b08ad5a..b7e1f8d 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1005,8 +1005,8 @@
   <string name="attribute_swamp_no">No swamp or marsh</string>
   <string name="attribute_hills_yes">Hilly area</string>
   <string name="attribute_hills_no">No hilly area</string>
-  <string name="attribute_easy_climbing_yes">Easy climbing</string>
-  <string name="attribute_easy_climbing_no">No easy climbing</string>
+  <string name="attribute_easy_climbing_yes">Lightweight climbing</string>
+  <string name="attribute_easy_climbing_no">No lightweight climbing</string>
   <string name="attribute_poi_yes">Point of interest</string>
   <string name="attribute_poi_no">No point of interest</string>
   <string name="attribute_moving_target_yes">Moving target</string>
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 8a6d718..32d428a 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -678,8 +678,8 @@ public class cgData {
                     // issue2662 OC: Leichtes Klettern / Easy climbing
                     if (oldVersion < 67) {
                         try {
-                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_yes' where geocode like 'O%' and attribute = 'climbing_yes'");
-                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_no' where geocode like 'O%' and attribute = 'climbing_no'");
+                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_yes' where geocode like 'OC%' and attribute = 'climbing_yes'");
+                            db.execSQL("update " + dbTableAttributes + " set attribute = 'easy_climbing_no' where geocode like 'OC%' and attribute = 'climbing_no'");
                         } catch (Exception e) {
                             Log.e("Failed to upgrade to ver. 67", e);
 
-- 
cgit v1.1


From 31632416b2ff724488b0c9eeb09a92d2b37f0e17 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 4 May 2013 12:30:47 +0200
Subject: fix #2683: Enable GPX import in all lists

---
 main/src/cgeo/geocaching/GpxFileListActivity.java |  2 +-
 main/src/cgeo/geocaching/StoredList.java          | 10 ++++++++++
 main/src/cgeo/geocaching/cgeocaches.java          |  4 +---
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/GpxFileListActivity.java b/main/src/cgeo/geocaching/GpxFileListActivity.java
index 201565e..de0be21 100644
--- a/main/src/cgeo/geocaching/GpxFileListActivity.java
+++ b/main/src/cgeo/geocaching/GpxFileListActivity.java
@@ -33,7 +33,7 @@ public class GpxFileListActivity extends AbstractFileListActivity<GPXListAdapter
 
     public static void startSubActivity(Activity fromActivity, int listId) {
         final Intent intent = new Intent(fromActivity, GpxFileListActivity.class);
-        intent.putExtra(Intents.EXTRA_LIST_ID, listId);
+        intent.putExtra(Intents.EXTRA_LIST_ID, StoredList.getConcreteList(listId));
         fromActivity.startActivityForResult(intent, 0);
     }
 
diff --git a/main/src/cgeo/geocaching/StoredList.java b/main/src/cgeo/geocaching/StoredList.java
index 778c112..c505e3c 100644
--- a/main/src/cgeo/geocaching/StoredList.java
+++ b/main/src/cgeo/geocaching/StoredList.java
@@ -201,4 +201,14 @@ public class StoredList {
     protected String getTitle() {
         return title;
     }
+
+    /**
+     * Return the given list, if it is a concrete list. Return the default list otherwise.
+     */
+    public static int getConcreteList(int listId) {
+        if (listId == ALL_LIST_ID || listId == TEMPORARY_LIST_ID) {
+            return STANDARD_LIST_ID;
+        }
+        return listId;
+    }
 }
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 7888b14..097aef3 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -612,8 +612,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             setVisible(menu, MENU_EXPORT, !isEmpty);
             setVisible(menu, MENU_REMOVE_FROM_HISTORY, !isEmpty);
             setVisible(menu, MENU_CLEAR_OFFLINE_LOGS, !isEmpty && containsOfflineLogs());
-            setVisible(menu, MENU_IMPORT_GPX, isConcrete);
-            setVisible(menu, MENU_IMPORT_WEB, isConcrete);
 
             if (navigationMenu != null) {
                 navigationMenu.setVisible(!isEmpty);
@@ -1297,7 +1295,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
         public LoadFromWebThread(Handler handlerIn, int listId) {
             handler = handlerIn;
-            listIdLFW = listId;
+            listIdLFW = StoredList.getConcreteList(listId);
         }
 
         public void kill() {
-- 
cgit v1.1


From d4974e33bd2e7816d54709ee40869f79cf56d79c Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 4 May 2013 12:48:41 +0200
Subject: fix #2599: Typos in `strings.xml`

---
 main/res/drawable/favorite_background_dark.xml     | 11 ++++++++
 .../drawable/favorite_background_green_dark.xml    | 11 ++++++++
 .../drawable/favorite_background_green_light.xml   | 11 ++++++++
 main/res/drawable/favorite_background_light.xml    | 11 ++++++++
 .../drawable/favorite_background_orange_dark.xml   | 11 ++++++++
 .../drawable/favorite_background_orange_light.xml  | 11 ++++++++
 main/res/drawable/favorite_background_red_dark.xml | 11 ++++++++
 .../res/drawable/favorite_background_red_light.xml | 11 ++++++++
 main/res/drawable/favourite_background_dark.xml    | 11 --------
 .../drawable/favourite_background_green_dark.xml   | 11 --------
 .../drawable/favourite_background_green_light.xml  | 11 --------
 main/res/drawable/favourite_background_light.xml   | 11 --------
 .../drawable/favourite_background_orange_dark.xml  | 11 --------
 .../drawable/favourite_background_orange_light.xml | 11 --------
 .../res/drawable/favourite_background_red_dark.xml | 11 --------
 .../drawable/favourite_background_red_light.xml    | 11 --------
 main/res/layout/caches_item.xml                    |  4 +--
 main/res/values-cs/strings.xml                     | 12 ++++----
 main/res/values-de/strings.xml                     | 10 +++----
 main/res/values-es/strings.xml                     |  2 +-
 main/res/values-fr/strings.xml                     | 12 ++++----
 main/res/values-hu/strings.xml                     |  2 +-
 main/res/values-it/strings.xml                     | 12 ++++----
 main/res/values-ja/strings.xml                     | 10 +++----
 main/res/values-nl/strings.xml                     | 10 +++----
 main/res/values-pl/strings.xml                     | 10 +++----
 main/res/values-pt/strings.xml                     |  2 +-
 main/res/values-sk/strings.xml                     |  2 +-
 main/res/values-sv/strings.xml                     | 12 ++++----
 main/res/values/attrs.xml                          |  8 +++---
 main/res/values/strings.xml                        | 12 ++++----
 main/res/values/themes.xml                         | 32 +++++++++++-----------
 .../src/cgeo/geocaching/AbstractPopupActivity.java |  4 +--
 main/src/cgeo/geocaching/CacheDetailActivity.java  | 18 ++++++------
 main/src/cgeo/geocaching/Geocache.java             |  4 +--
 main/src/cgeo/geocaching/ImageSelectActivity.java  |  2 +-
 main/src/cgeo/geocaching/cgData.java               |  2 +-
 .../src/cgeo/geocaching/connector/gc/GCParser.java |  6 ++--
 main/src/cgeo/geocaching/ui/CacheListAdapter.java  | 24 ++++++++--------
 39 files changed, 194 insertions(+), 194 deletions(-)
 create mode 100644 main/res/drawable/favorite_background_dark.xml
 create mode 100644 main/res/drawable/favorite_background_green_dark.xml
 create mode 100644 main/res/drawable/favorite_background_green_light.xml
 create mode 100644 main/res/drawable/favorite_background_light.xml
 create mode 100644 main/res/drawable/favorite_background_orange_dark.xml
 create mode 100644 main/res/drawable/favorite_background_orange_light.xml
 create mode 100644 main/res/drawable/favorite_background_red_dark.xml
 create mode 100644 main/res/drawable/favorite_background_red_light.xml
 delete mode 100644 main/res/drawable/favourite_background_dark.xml
 delete mode 100644 main/res/drawable/favourite_background_green_dark.xml
 delete mode 100644 main/res/drawable/favourite_background_green_light.xml
 delete mode 100644 main/res/drawable/favourite_background_light.xml
 delete mode 100644 main/res/drawable/favourite_background_orange_dark.xml
 delete mode 100644 main/res/drawable/favourite_background_orange_light.xml
 delete mode 100644 main/res/drawable/favourite_background_red_dark.xml
 delete mode 100644 main/res/drawable/favourite_background_red_light.xml

(limited to 'main')

diff --git a/main/res/drawable/favorite_background_dark.xml b/main/res/drawable/favorite_background_dark.xml
new file mode 100644
index 0000000..b8aa8d3
--- /dev/null
+++ b/main/res/drawable/favorite_background_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99FFFFFF"
+			android:width="2px" />
+	<solid
+			android:color="#99FFFFFF" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_green_dark.xml b/main/res/drawable/favorite_background_green_dark.xml
new file mode 100644
index 0000000..3e1b545
--- /dev/null
+++ b/main/res/drawable/favorite_background_green_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99FFFFFF"
+			android:width="2px" />
+	<solid
+			android:color="#9900FF00" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_green_light.xml b/main/res/drawable/favorite_background_green_light.xml
new file mode 100644
index 0000000..a2070e7
--- /dev/null
+++ b/main/res/drawable/favorite_background_green_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99000000"
+			android:width="2px" />
+	<solid
+			android:color="#9900FF00" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_light.xml b/main/res/drawable/favorite_background_light.xml
new file mode 100644
index 0000000..60c0b2c
--- /dev/null
+++ b/main/res/drawable/favorite_background_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99000000"
+			android:width="2px" />
+	<solid
+			android:color="#99000000" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_orange_dark.xml b/main/res/drawable/favorite_background_orange_dark.xml
new file mode 100644
index 0000000..8730487
--- /dev/null
+++ b/main/res/drawable/favorite_background_orange_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99FFFFFF"
+			android:width="2px" />
+	<solid
+			android:color="#99FFAA00" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_orange_light.xml b/main/res/drawable/favorite_background_orange_light.xml
new file mode 100644
index 0000000..89ef726
--- /dev/null
+++ b/main/res/drawable/favorite_background_orange_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99000000"
+			android:width="2px" />
+	<solid
+			android:color="#99FFAA00" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_red_dark.xml b/main/res/drawable/favorite_background_red_dark.xml
new file mode 100644
index 0000000..2fb580e
--- /dev/null
+++ b/main/res/drawable/favorite_background_red_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99FFFFFF"
+			android:width="2px" />
+	<solid
+			android:color="#99FF0000" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favorite_background_red_light.xml b/main/res/drawable/favorite_background_red_light.xml
new file mode 100644
index 0000000..b16cb92
--- /dev/null
+++ b/main/res/drawable/favorite_background_red_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shape="rectangle">
+	<stroke
+			android:color="#99000000"
+			android:width="2px" />
+	<solid
+			android:color="#99FF0000" />
+	<corners
+			android:bottomLeftRadius="5dip" />
+</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_dark.xml b/main/res/drawable/favourite_background_dark.xml
deleted file mode 100644
index b8aa8d3..0000000
--- a/main/res/drawable/favourite_background_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99FFFFFF"
-			android:width="2px" />
-	<solid
-			android:color="#99FFFFFF" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_green_dark.xml b/main/res/drawable/favourite_background_green_dark.xml
deleted file mode 100644
index 3e1b545..0000000
--- a/main/res/drawable/favourite_background_green_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99FFFFFF"
-			android:width="2px" />
-	<solid
-			android:color="#9900FF00" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_green_light.xml b/main/res/drawable/favourite_background_green_light.xml
deleted file mode 100644
index a2070e7..0000000
--- a/main/res/drawable/favourite_background_green_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99000000"
-			android:width="2px" />
-	<solid
-			android:color="#9900FF00" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_light.xml b/main/res/drawable/favourite_background_light.xml
deleted file mode 100644
index 60c0b2c..0000000
--- a/main/res/drawable/favourite_background_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99000000"
-			android:width="2px" />
-	<solid
-			android:color="#99000000" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_orange_dark.xml b/main/res/drawable/favourite_background_orange_dark.xml
deleted file mode 100644
index 8730487..0000000
--- a/main/res/drawable/favourite_background_orange_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99FFFFFF"
-			android:width="2px" />
-	<solid
-			android:color="#99FFAA00" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_orange_light.xml b/main/res/drawable/favourite_background_orange_light.xml
deleted file mode 100644
index 89ef726..0000000
--- a/main/res/drawable/favourite_background_orange_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99000000"
-			android:width="2px" />
-	<solid
-			android:color="#99FFAA00" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_red_dark.xml b/main/res/drawable/favourite_background_red_dark.xml
deleted file mode 100644
index 2fb580e..0000000
--- a/main/res/drawable/favourite_background_red_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99FFFFFF"
-			android:width="2px" />
-	<solid
-			android:color="#99FF0000" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/drawable/favourite_background_red_light.xml b/main/res/drawable/favourite_background_red_light.xml
deleted file mode 100644
index b16cb92..0000000
--- a/main/res/drawable/favourite_background_red_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-	<stroke
-			android:color="#99000000"
-			android:width="2px" />
-	<solid
-			android:color="#99FF0000" />
-	<corners
-			android:bottomLeftRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml
index e3b861c..d4e7b27 100644
--- a/main/res/layout/caches_item.xml
+++ b/main/res/layout/caches_item.xml
@@ -159,14 +159,14 @@
             android:src="@drawable/trackable_all" />
 
         <TextView
-            android:id="@+id/favourite"
+            android:id="@+id/favorite"
             android:layout_width="35dip"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:layout_gravity="center"
             android:layout_marginTop="22dip"
-            android:background="?favourite"
+            android:background="?favorite"
             android:ellipsize="marquee"
             android:gravity="center"
             android:lines="1"
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 58e28ac..ac75564 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -175,7 +175,7 @@
   <string name="err_missing_device_name">Před registrací prosím zadej název zařízení.</string>
   <string name="err_favorite_failed">Označení oblíbenosti keše selhalo.</string>
   <string name="err_select_logimage_failed">Výběr obrázku pro zápis selhal.</string>
-  <string name="err_aquire_image_failed">Získání obrázku selhalo.</string>
+  <string name="err_acquire_image_failed">Získání obrázku selhalo.</string>
 
   <string name="err_tb_display">c:geo nemůže zobrazit sledovatelný předmět. Je to opravdu sledovatelný předmět?</string>
   <string name="err_tb_details_open">c:geo nemůže otevřít podrobnosti ke sledovatelnému předmětu.</string>
@@ -563,10 +563,10 @@
   <string name="cache_dialog_watchlist_add_message">Přidávání keše do tvého Watchlistu…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Odstraňování keše z tvého Watchlistu…</string>
-  <string name="cache_dialog_favourite_add_title">Oblíbené</string>
-  <string name="cache_dialog_favourite_add_message">Přidávání keše do Oblíbených…</string>
-  <string name="cache_dialog_favourite_remove_title">Oblíbené</string>
-  <string name="cache_dialog_favourite_remove_message">Odstraňování keše z Oblíbených…</string>
+  <string name="cache_dialog_favorite_add_title">Oblíbené</string>
+  <string name="cache_dialog_favorite_add_message">Přidávání keše do Oblíbených…</string>
+  <string name="cache_dialog_favorite_remove_title">Oblíbené</string>
+  <string name="cache_dialog_favorite_remove_message">Odstraňování keše z Oblíbených…</string>
   <string name="cache_menu_navigate">Navigovat</string>
   <string name="cache_menu_navigation_drive">Navigace (Řízení)</string>
   <string name="cache_menu_navigation_walk">Navigace (Chůze)</string>
@@ -608,7 +608,7 @@
   <string name="cache_rating">Hodnocení</string>
   <string name="cache_own_rating">Vlastní hodnocení</string>
   <string name="cache_rating_of">z</string>
-  <string name="cache_favourite">Oblíbená</string>
+  <string name="cache_favorite">Oblíbená</string>
   <string name="cache_owner">Zakladatel</string>
   <string name="cache_hidden">Skryta</string>
   <string name="cache_event">Datum</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 37aa5aa..26fd2d3 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -558,10 +558,10 @@
   <string name="cache_dialog_watchlist_add_message">Füge den Cache deiner Watchlist hinzu…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Entferne den Cache von deiner Watchlist…</string>
-  <string name="cache_dialog_favourite_add_title">Favorit</string>
-  <string name="cache_dialog_favourite_add_message">Füge den Cache als dein Favorit hinzu…</string>
-  <string name="cache_dialog_favourite_remove_title">Favorit</string>
-  <string name="cache_dialog_favourite_remove_message">Entferne den Cache von deinen Favoriten…</string>
+  <string name="cache_dialog_favorite_add_title">Favorit</string>
+  <string name="cache_dialog_favorite_add_message">Füge den Cache zu Favoriten hinzu…</string>
+  <string name="cache_dialog_favorite_remove_title">Favorit</string>
+  <string name="cache_dialog_favorite_remove_message">Entferne den Cache von deinen Favoriten…</string>
   <string name="cache_menu_navigate">Navigieren</string>
   <string name="cache_menu_navigation_drive">Navigation (Fahren)</string>
   <string name="cache_menu_navigation_walk">Navigation (Gehen)</string>
@@ -604,7 +604,7 @@
   <string name="cache_rating">Bewertung</string>
   <string name="cache_own_rating">Eigene Bewertung</string>
   <string name="cache_rating_of">von</string>
-  <string name="cache_favourite">Favorit</string>
+  <string name="cache_favorite">Favorit</string>
   <string name="cache_owner">Besitzer</string>
   <string name="cache_hidden">Versteckt</string>
   <string name="cache_event">Zeitangabe</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index b3096eb..f029d9b 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -485,7 +485,7 @@
   <string name="cache_terrain">Terreno</string>
   <string name="cache_rating">Puntuación</string>
   <string name="cache_rating_of">de</string>
-  <string name="cache_favourite">Favorito</string>
+  <string name="cache_favorite">Favorito</string>
   <string name="cache_owner">Propietario</string>
   <string name="cache_hidden">Oculto</string>
   <string name="cache_event">Fecha</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index f7a6fde..a0f86e6 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -175,7 +175,7 @@
   <string name="err_missing_device_name">Veuillez saisir un nom pour votre appareil avant l\'enregistrement.</string>
   <string name="err_favorite_failed">c:geo ne peut pas changer le status de favori.</string>
   <string name="err_select_logimage_failed">La sélection d\'une image pour la note a échoué.</string>
-  <string name="err_aquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string>
+  <string name="err_acquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string>
 
   <string name="err_tb_display">"c:geo ne peut pas afficher l\'objet voyageur demandé. Est-ce vraiment un objet voyageur?</string>
   <string name="err_tb_details_open">c:geo ne peut pas ouvrir le détail de l\'objet voyageur.</string>
@@ -561,10 +561,10 @@
   <string name="cache_dialog_watchlist_add_message">Ajout de la cache à votre liste de suivi…</string>
   <string name="cache_dialog_watchlist_remove_title">Liste de suivi</string>
   <string name="cache_dialog_watchlist_remove_message">Retrait de la cache de votre liste de suivi…</string>
-  <string name="cache_dialog_favourite_add_title">Favori</string>
-  <string name="cache_dialog_favourite_add_message">Ajout de la cache à vos favoris…</string>
-  <string name="cache_dialog_favourite_remove_title">Favori</string>
-  <string name="cache_dialog_favourite_remove_message">Suppression de la cache de vos favoris…</string>
+  <string name="cache_dialog_favorite_add_title">Favori</string>
+  <string name="cache_dialog_favorite_add_message">Ajout de la cache à vos favoris…</string>
+  <string name="cache_dialog_favorite_remove_title">Favori</string>
+  <string name="cache_dialog_favorite_remove_message">Suppression de la cache de vos favoris…</string>
   <string name="cache_menu_navigate">Navigation</string>
   <string name="cache_menu_navigation_drive">Navigation (voiture)</string>
   <string name="cache_menu_navigation_walk">Navigation (piéton)</string>
@@ -606,7 +606,7 @@
   <string name="cache_rating">Note</string>
   <string name="cache_own_rating">Note personnelle</string>
   <string name="cache_rating_of">de</string>
-  <string name="cache_favourite">Favori</string>
+  <string name="cache_favorite">Favori</string>
   <string name="cache_owner">Propriétaire</string>
   <string name="cache_hidden">Cachée</string>
   <string name="cache_event">Date</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 353aa10..e7018f9 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -568,7 +568,7 @@
   <string name="cache_rating">Osztályzat</string>
   <string name="cache_own_rating">Saját értékelés</string> 
   <string name="cache_rating_of">/</string>
-  <string name="cache_favourite">Kedvenc</string>
+  <string name="cache_favorite">Kedvenc</string>
   <string name="cache_owner">Tulajdonos</string>
   <string name="cache_hidden">Elrejtve</string>
   <string name="cache_event">Dátum</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 98a3f9c..ab43e86 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -176,7 +176,7 @@
   
   <string name="err_favorite_failed">Errore nella modifica dello stato preferiti.</string>
   <string name="err_select_logimage_failed">La selezione dell\'immagine per il log è fallita.</string>
-  <string name="err_aquire_image_failed">Acquisizione immagine fallita.</string> 
+  <string name="err_acquire_image_failed">Acquisizione immagine fallita.</string> 
 
   <string name="err_tb_display">c:geo non riesce a visualizzare il trackable che vuoi. È veramente un trackable?</string>
   <string name="err_tb_details_open">c:geo non riesce ad aprire i dettagli del trackable.</string>
@@ -556,10 +556,10 @@
   <string name="cache_dialog_watchlist_add_message">Aggiunto il cache alla watchlist in corso…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Rimozione dei cache dalla tua watchlist…</string>
-  <string name="cache_dialog_favourite_add_title">Preferiti</string>
-  <string name="cache_dialog_favourite_add_message">Aggiungi il cache ai tuoi preferiti…</string>
-  <string name="cache_dialog_favourite_remove_title">Preferiti</string>
-  <string name="cache_dialog_favourite_remove_message">Rimozione cache dai tuoi preferiti…</string>  
+  <string name="cache_dialog_favorite_add_title">Preferiti</string>
+  <string name="cache_dialog_favorite_add_message">Aggiungi il cache ai tuoi preferiti…</string>
+  <string name="cache_dialog_favorite_remove_title">Preferiti</string>
+  <string name="cache_dialog_favorite_remove_message">Rimozione cache dai tuoi preferiti…</string>  
   <string name="cache_menu_navigate">Naviga</string>
   <string name="cache_menu_navigation_drive">Naviga (in auto)</string>
   <string name="cache_menu_navigation_walk">Naviga (a piedi)</string>
@@ -601,7 +601,7 @@
   <string name="cache_rating">Voto</string>
   <string name="cache_own_rating">Il tuo voto</string>
   <string name="cache_rating_of">di</string>
-  <string name="cache_favourite">Popolarità</string>
+  <string name="cache_favorite">Popolarità</string>
   <string name="cache_owner">Proprietario</string>
   <string name="cache_hidden">Nascosto il</string>
   <string name="cache_event">Data</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 27ffbd3..5d7759e 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -540,10 +540,10 @@
   <string name="cache_dialog_watchlist_add_message">ウォッチリストに追加中…</string>
   <string name="cache_dialog_watchlist_remove_title">ウォッチリスト</string>
   <string name="cache_dialog_watchlist_remove_message">ウォッチリストから削除中…</string>
-  <string name="cache_dialog_favourite_add_title">お気に入り</string>
-  <string name="cache_dialog_favourite_add_message">お気に入りに追加中…</string>
-  <string name="cache_dialog_favourite_remove_title">お気に入り</string>
-  <string name="cache_dialog_favourite_remove_message">お気に入りから削除中…</string>
+  <string name="cache_dialog_favorite_add_title">お気に入り</string>
+  <string name="cache_dialog_favorite_add_message">お気に入りに追加中…</string>
+  <string name="cache_dialog_favorite_remove_title">お気に入り</string>
+  <string name="cache_dialog_favorite_remove_message">お気に入りから削除中…</string>
   <string name="cache_menu_navigate">ナビゲーション</string>
   <string name="cache_menu_navigation_drive">ナビゲーション(自動車)</string>
   <string name="cache_menu_navigation_walk">ナビゲーション(徒歩)</string>
@@ -586,7 +586,7 @@
   <string name="cache_rating">評価</string>
   <string name="cache_own_rating">Own Rating</string>
   <string name="cache_rating_of">/</string>
-  <string name="cache_favourite">お気に入り</string>
+  <string name="cache_favorite">お気に入り</string>
   <string name="cache_owner">所有者</string>
   <string name="cache_hidden">隠した日</string>
   <string name="cache_event">イベント日付</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 557aa79..8ce95a5 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -546,10 +546,10 @@
   <string name="cache_dialog_watchlist_add_message">Voeg cache toe aan watchlist…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Verwijder cache van watchlist…</string>
-  <string name="cache_dialog_favourite_add_title">Favoriet</string>
-  <string name="cache_dialog_favourite_add_message">Voeg cache toe aan favorieten…</string>
-  <string name="cache_dialog_favourite_remove_title">Favoriet</string>
-  <string name="cache_dialog_favourite_remove_message">Verwijder cache van je favorieten…</string>
+  <string name="cache_dialog_favorite_add_title">Favoriet</string>
+  <string name="cache_dialog_favorite_add_message">Voeg cache toe aan favorieten…</string>
+  <string name="cache_dialog_favorite_remove_title">Favoriet</string>
+  <string name="cache_dialog_favorite_remove_message">Verwijder cache van je favorieten…</string>
   <string name="cache_menu_navigate">Navigeer</string>
   <string name="cache_menu_navigation_drive">Navigeer (rijden)</string>
   <string name="cache_menu_navigation_walk">Navigeer (lopen)</string>
@@ -591,7 +591,7 @@
   <string name="cache_rating">Waardering</string>
   <string name="cache_own_rating">Eigen waardering</string>
   <string name="cache_rating_of">van</string>
-  <string name="cache_favourite">Favoriet</string>
+  <string name="cache_favorite">Favoriet</string>
   <string name="cache_owner">Eigenaar</string>
   <string name="cache_hidden">Verstopt</string>
   <string name="cache_event">Datum</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 1f23f63..b4fbca7 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -533,10 +533,10 @@
   <string name="cache_dialog_watchlist_add_message">Dodaję skrzynkę do listy obserwowanych…</string>
   <string name="cache_dialog_watchlist_remove_title">Lista obserwowanych</string>
   <string name="cache_dialog_watchlist_remove_message">Usuwam skrzynkę z listy obserwowanych…</string>
-  <string name="cache_dialog_favourite_add_title">Ulubione</string>
-  <string name="cache_dialog_favourite_add_message">Dodaję skrzynkę do listy ulubionych…</string>
-  <string name="cache_dialog_favourite_remove_title">Ulubione</string>
-  <string name="cache_dialog_favourite_remove_message">Usuwam skrzynkę z listy ulubionych…</string>
+  <string name="cache_dialog_favorite_add_title">Ulubione</string>
+  <string name="cache_dialog_favorite_add_message">Dodaję skrzynkę do listy ulubionych…</string>
+  <string name="cache_dialog_favorite_remove_title">Ulubione</string>
+  <string name="cache_dialog_favorite_remove_message">Usuwam skrzynkę z listy ulubionych…</string>
   <string name="cache_menu_navigate">Nawiguj</string>
   <string name="cache_menu_navigation_drive">Nawigacja (jazda)</string>
   <string name="cache_menu_navigation_walk">Nawigacja (pieszo)</string>
@@ -578,7 +578,7 @@
   <string name="cache_rating">Ocena</string>
   <string name="cache_own_rating">Własna ocena</string>
   <string name="cache_rating_of">od</string>
-  <string name="cache_favourite">Ulubiona</string>
+  <string name="cache_favorite">Ulubiona</string>
   <string name="cache_owner">Właściciel</string>
   <string name="cache_hidden">Ukryta</string>
   <string name="cache_event">Data</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index d6ee413..e4bcfd4 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -571,7 +571,7 @@
   <string name="cache_rating">Pontuação</string>
   <string name="cache_own_rating">A minha pontuação</string>
   <string name="cache_rating_of">de</string>
-  <string name="cache_favourite">Favorita</string>
+  <string name="cache_favorite">Favorita</string>
   <string name="cache_owner">Dono</string>
   <string name="cache_hidden">Escondida</string>
   <string name="cache_event">Data</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index ef316ea..616bd44 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -570,7 +570,7 @@
   <string name="cache_rating">Hodnotenie</string>
   <string name="cache_own_rating">Vlastné hodnotenie</string>
   <string name="cache_rating_of">z</string>
-  <string name="cache_favourite">Obľúbené</string>
+  <string name="cache_favorite">Obľúbené</string>
   <string name="cache_owner">Vlastník</string>
   <string name="cache_hidden">Skrytá</string>
   <string name="cache_event">Dátum</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index b68de4c..0f23eed 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -176,7 +176,7 @@
   <string name="err_favorite_failed">Misslyckades att ändra favoritstatus.</string>
 
   <string name="err_select_logimage_failed">Misslyckades att välja bild till loggen.</string>
-  <string name="err_aquire_image_failed">Hämtning av bilden misslyckades.</string>
+  <string name="err_acquire_image_failed">Hämtning av bilden misslyckades.</string>
   <string name="err_tb_display">Tyvärr kan c:geo inte visa den trackable du önskar. Är den verkligen trackable?</string>
   <string name="err_tb_details_open">Tyvärr kan c:geo inte öppna detaljer för trackable.</string>
   <string name="err_tb_forgot_saw">Tyvärr glömde c:geo vilken trackable du såg.</string>
@@ -561,10 +561,10 @@
   <string name="cache_dialog_watchlist_add_message">Lägger till cachen till din watchlist…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Tar bort cachen från din watchlist…</string>
-  <string name="cache_dialog_favourite_add_title">Favorit</string>
-  <string name="cache_dialog_favourite_add_message">Lägger till cachen till dina favoriter…</string>
-  <string name="cache_dialog_favourite_remove_title">Favorit</string>
-  <string name="cache_dialog_favourite_remove_message">Tar bort cachen från dina favoriter…</string>
+  <string name="cache_dialog_favorite_add_title">Favorit</string>
+  <string name="cache_dialog_favorite_add_message">Lägger till cachen till dina favoriter…</string>
+  <string name="cache_dialog_favorite_remove_title">Favorit</string>
+  <string name="cache_dialog_favorite_remove_message">Tar bort cachen från dina favoriter…</string>
   <string name="cache_menu_navigate">Navigera</string>
   <string name="cache_menu_navigation_drive">Navigering (med bil)</string>
   <string name="cache_menu_navigation_walk">Navigering (till fots)</string>
@@ -606,7 +606,7 @@
   <string name="cache_rating">Betyg</string>
   <string name="cache_own_rating">Eget betyg</string>
   <string name="cache_rating_of">av</string>
-  <string name="cache_favourite">Favorit</string>
+  <string name="cache_favorite">Favorit</string>
   <string name="cache_owner">Ägare</string>
   <string name="cache_hidden">Gömd</string>
   <string name="cache_event">Datum</string>
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml
index 558c353..092d307 100644
--- a/main/res/values/attrs.xml
+++ b/main/res/values/attrs.xml
@@ -22,10 +22,10 @@
   <attr name="button" format="integer" />
   <attr name="input" format="integer" />
   <attr name="inventory" format="integer" />
-  <attr name="favourite" format="integer" />
-  <attr name="favourite_r" format="integer" />
-  <attr name="favourite_o" format="integer" />
-  <attr name="favourite_g" format="integer" />
+  <attr name="favorite" format="integer" />
+  <attr name="favorite_r" format="integer" />
+  <attr name="favorite_o" format="integer" />
+  <attr name="favorite_g" format="integer" />
   <attr name="close" format="integer" />
   <attr name="log_img_icon" format="integer" />
   <attr name="actionbar_compass" format="integer" />
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index b7e1f8d..42abb8f 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -183,7 +183,7 @@
   <string name="err_missing_device_name">Please enter a device name before registering.</string>
   <string name="err_favorite_failed">Changing favorite status failed.</string>
   <string name="err_select_logimage_failed">Selecting an image for the log failed.</string>
-  <string name="err_aquire_image_failed">Acquiring an image failed.</string>
+  <string name="err_acquire_image_failed">Acquiring an image failed.</string>
   
   <string name="err_tb_display">c:geo can\'t display trackable you want. Is it really a trackable?</string>
   <string name="err_tb_details_open">c:geo can\'t open trackable details.</string>
@@ -569,10 +569,10 @@
   <string name="cache_dialog_watchlist_add_message">Adding cache to your watchlist…</string>
   <string name="cache_dialog_watchlist_remove_title">Watchlist</string>
   <string name="cache_dialog_watchlist_remove_message">Removing cache from your watchlist…</string>
-  <string name="cache_dialog_favourite_add_title">Favourite</string>
-  <string name="cache_dialog_favourite_add_message">Adding cache to your favourites…</string>
-  <string name="cache_dialog_favourite_remove_title">Favourite</string>
-  <string name="cache_dialog_favourite_remove_message">Removing cache from your favourites…</string>
+  <string name="cache_dialog_favorite_add_title">Favorite</string>
+  <string name="cache_dialog_favorite_add_message">Adding cache to your favorites…</string>
+  <string name="cache_dialog_favorite_remove_title">Favorite</string>
+  <string name="cache_dialog_favorite_remove_message">Removing cache from your favorites…</string>
   <string name="cache_menu_navigate">Navigate</string>
   <string name="cache_menu_navigation_drive">Navigation (Driving)</string>
   <string name="cache_menu_navigation_walk">Navigation (Walking)</string>
@@ -616,7 +616,7 @@
   <string name="cache_rating">Rating</string>
   <string name="cache_own_rating">Own Rating</string>
   <string name="cache_rating_of">of</string>
-  <string name="cache_favourite">Favorite</string>
+  <string name="cache_favorite">Favorite</string>
   <string name="cache_owner">Owner</string>
   <string name="cache_hidden">Hidden</string>
   <string name="cache_event">Date</string>
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index fdc2eeb..655d9e1 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -36,10 +36,10 @@
         <item name="button">@drawable/action_button_dark</item>
         <item name="input">@drawable/input_bcg_dark</item>
         <item name="inventory">@drawable/inventory_background_dark</item>
-        <item name="favourite">@drawable/favourite_background_dark</item>
-        <item name="favourite_r">@drawable/favourite_background_red_dark</item>
-        <item name="favourite_o">@drawable/favourite_background_orange_dark</item>
-        <item name="favourite_g">@drawable/favourite_background_green_dark</item>
+        <item name="favorite">@drawable/favorite_background_dark</item>
+        <item name="favorite_r">@drawable/favorite_background_red_dark</item>
+        <item name="favorite_o">@drawable/favorite_background_orange_dark</item>
+        <item name="favorite_g">@drawable/favorite_background_green_dark</item>
         <item name="close">@drawable/map_close_dark</item>
         <item name="log_img_icon">@drawable/log_img_dark</item>
         <item name="actionbar_compass">@drawable/actionbar_compass_dark</item>
@@ -67,10 +67,10 @@
         <item name="button">@drawable/action_button_light</item>
         <item name="input">@drawable/input_bcg_light</item>
         <item name="inventory">@drawable/inventory_background_light</item>
-        <item name="favourite">@drawable/favourite_background_light</item>
-        <item name="favourite_r">@drawable/favourite_background_red_light</item>
-        <item name="favourite_o">@drawable/favourite_background_orange_light</item>
-        <item name="favourite_g">@drawable/favourite_background_green_light</item>
+        <item name="favorite">@drawable/favorite_background_light</item>
+        <item name="favorite_r">@drawable/favorite_background_red_light</item>
+        <item name="favorite_o">@drawable/favorite_background_orange_light</item>
+        <item name="favorite_g">@drawable/favorite_background_green_light</item>
         <item name="close">@drawable/map_close_light</item>
         <item name="log_img_icon">@drawable/log_img_light</item>
         <item name="actionbar_compass">@drawable/actionbar_compass_light</item>
@@ -109,10 +109,10 @@
         <item name="button">@drawable/action_button_dark</item>
         <item name="input">@drawable/input_bcg_dark</item>
         <item name="inventory">@drawable/inventory_background_dark</item>
-        <item name="favourite">@drawable/favourite_background_dark</item>
-        <item name="favourite_r">@drawable/favourite_background_red_dark</item>
-        <item name="favourite_o">@drawable/favourite_background_orange_dark</item>
-        <item name="favourite_g">@drawable/favourite_background_green_dark</item>
+        <item name="favorite">@drawable/favorite_background_dark</item>
+        <item name="favorite_r">@drawable/favorite_background_red_dark</item>
+        <item name="favorite_o">@drawable/favorite_background_orange_dark</item>
+        <item name="favorite_g">@drawable/favorite_background_green_dark</item>
         <item name="close">@drawable/map_close_dark</item>
         <item name="log_img_icon">@drawable/log_img_dark</item>
         <item name="actionbar_compass">@drawable/actionbar_compass_dark</item>
@@ -141,10 +141,10 @@
         <item name="button">@drawable/action_button_light</item>
         <item name="input">@drawable/input_bcg_light</item>
         <item name="inventory">@drawable/inventory_background_light</item>
-        <item name="favourite">@drawable/favourite_background_light</item>
-        <item name="favourite_r">@drawable/favourite_background_red_light</item>
-        <item name="favourite_o">@drawable/favourite_background_orange_light</item>
-        <item name="favourite_g">@drawable/favourite_background_green_light</item>
+        <item name="favorite">@drawable/favorite_background_light</item>
+        <item name="favorite_r">@drawable/favorite_background_red_light</item>
+        <item name="favorite_o">@drawable/favorite_background_orange_light</item>
+        <item name="favorite_g">@drawable/favorite_background_green_light</item>
         <item name="close">@drawable/map_close_light</item>
         <item name="log_img_icon">@drawable/log_img_light</item>
         <item name="actionbar_compass">@drawable/actionbar_compass_light</item>
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 5769887..5ad89fb 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -278,8 +278,8 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             aquireGCVote();
         }
 
-        // favourite count
-        details.add(R.string.cache_favourite, cache.getFavoritePoints() + "×");
+        // favorite count
+        details.add(R.string.cache_favorite, cache.getFavoritePoints() + "×");
 
         // more details
         final Button buttonMore = (Button) findViewById(R.id.more_details);
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d9ef503..fd42f07 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1163,7 +1163,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
             // favorite count
             if (cache.getFavoritePoints() > 0) {
-                details.add(R.string.cache_favourite, cache.getFavoritePoints() + "×");
+                details.add(R.string.cache_favorite, cache.getFavoritePoints() + "×");
             }
 
             // own rating
@@ -1487,7 +1487,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
         }
 
-        /** Thread to add this cache to the favourite list of the user */
+        /** Thread to add this cache to the favorite list of the user */
         private class FavoriteAddThread extends Thread {
             private final Handler handler;
 
@@ -1501,7 +1501,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
         }
 
-        /** Thread to remove this cache to the favourite list of the user */
+        /** Thread to remove this cache to the favorite list of the user */
         private class FavoriteRemoveThread extends Thread {
             private final Handler handler;
 
@@ -1528,25 +1528,25 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         }
 
         /**
-         * Listener for "add to favourites" button
+         * Listener for "add to favorites" button
          */
         private class FavoriteAddClickListener extends AbstractWatchlistClickListener {
             @Override
             public void onClick(View arg0) {
-                doExecute(R.string.cache_dialog_favourite_add_title,
-                        R.string.cache_dialog_favourite_add_message,
+                doExecute(R.string.cache_dialog_favorite_add_title,
+                        R.string.cache_dialog_favorite_add_message,
                         new FavoriteAddThread(new FavoriteUpdateHandler()));
             }
         }
 
         /**
-         * Listener for "remove from favourites" button
+         * Listener for "remove from favorites" button
          */
         private class FavoriteRemoveClickListener extends AbstractWatchlistClickListener {
             @Override
             public void onClick(View arg0) {
-                doExecute(R.string.cache_dialog_favourite_remove_title,
-                        R.string.cache_dialog_favourite_remove_message,
+                doExecute(R.string.cache_dialog_favorite_remove_title,
+                        R.string.cache_dialog_favorite_remove_message,
                         new FavoriteRemoveThread(new FavoriteUpdateHandler()));
             }
         }
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 000435e..705f2ed 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -763,8 +763,8 @@ public class Geocache implements ICache, IWaypoint {
         return favorite;
     }
 
-    public void setFavorite(boolean favourite) {
-        this.favorite = favourite;
+    public void setFavorite(boolean favorite) {
+        this.favorite = favorite;
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index 34b433d..7c8df5a 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -278,7 +278,7 @@ public class ImageSelectActivity extends AbstractActivity {
     }
 
     private void showFailure() {
-        showToast(getResources().getString(R.string.err_aquire_image_failed));
+        showToast(getResources().getString(R.string.err_acquire_image_failed));
     }
 
     private void loadImagePreview() {
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 32d428a..d5002a0 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -108,7 +108,7 @@ public class cgData {
             + "detailedupdate long, "
             + "visiteddate long, "
             + "geocode text unique not null, "
-            + "reason integer not null default 0, " // cached, favourite...
+            + "reason integer not null default 0, " // cached, favorite...
             + "cacheid text, "
             + "guid text, "
             + "type text, "
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index d566b2f..4273da5 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -215,7 +215,7 @@ public abstract class GCParser {
                     cache.setFavoritePoints(Integer.parseInt(result));
                 }
             } catch (NumberFormatException e) {
-                Log.w("GCParser.parseSearch: Failed to parse favourite count");
+                Log.w("GCParser.parseSearch: Failed to parse favorite count");
             }
 
             searchResult.addCache(cache);
@@ -424,11 +424,11 @@ public abstract class GCParser {
                 Log.w("GCParser.parseCache: Failed to parse cache hidden (event) date");
             }
 
-            // favourite
+            // favorite
             try {
                 cache.setFavoritePoints(Integer.parseInt(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_FAVORITECOUNT, true, "0")));
             } catch (NumberFormatException e) {
-                Log.e("Error parsing favourite count", e);
+                Log.e("Error parsing favorite count", e);
             }
 
             // cache size
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index 4965e0b..b60586e 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -79,13 +79,13 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
     private static final int[] RATING_BACKGROUND = new int[3];
     static {
         if (Settings.isLightSkin()) {
-            RATING_BACKGROUND[0] = R.drawable.favourite_background_red_light;
-            RATING_BACKGROUND[1] = R.drawable.favourite_background_orange_light;
-            RATING_BACKGROUND[2] = R.drawable.favourite_background_green_light;
+            RATING_BACKGROUND[0] = R.drawable.favorite_background_red_light;
+            RATING_BACKGROUND[1] = R.drawable.favorite_background_orange_light;
+            RATING_BACKGROUND[2] = R.drawable.favorite_background_green_light;
         } else {
-            RATING_BACKGROUND[0] = R.drawable.favourite_background_red_dark;
-            RATING_BACKGROUND[1] = R.drawable.favourite_background_orange_dark;
-            RATING_BACKGROUND[2] = R.drawable.favourite_background_green_dark;
+            RATING_BACKGROUND[0] = R.drawable.favorite_background_red_dark;
+            RATING_BACKGROUND[1] = R.drawable.favorite_background_orange_dark;
+            RATING_BACKGROUND[2] = R.drawable.favorite_background_green_dark;
         }
     }
 
@@ -97,7 +97,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
         CheckBox checkbox;
         ImageView logStatusMark;
         TextView text;
-        TextView favourite;
+        TextView favorite;
         TextView info;
         ImageView inventory;
         RelativeLayout directionLayout;
@@ -364,7 +364,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
             holder.dirImgLayout = (RelativeLayout) v.findViewById(R.id.dirimg_layout);
             holder.dirImg = (ImageView) v.findViewById(R.id.dirimg);
             holder.inventory = (ImageView) v.findViewById(R.id.inventory);
-            holder.favourite = (TextView) v.findViewById(R.id.favourite);
+            holder.favorite = (TextView) v.findViewById(R.id.favorite);
             holder.info = (TextView) v.findViewById(R.id.info);
 
             v.setTag(holder);
@@ -494,14 +494,14 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
             }
         }
 
-        holder.favourite.setText(Integer.toString(cache.getFavoritePoints()));
+        holder.favorite.setText(Integer.toString(cache.getFavoritePoints()));
 
         int favoriteBack;
         // set default background, neither vote nor rating may be available
         if (lightSkin) {
-            favoriteBack = R.drawable.favourite_background_light;
+            favoriteBack = R.drawable.favorite_background_light;
         } else {
-            favoriteBack = R.drawable.favourite_background_dark;
+            favoriteBack = R.drawable.favorite_background_dark;
         }
         final float myVote = cache.getMyVote();
         if (myVote > 0) { // use my own rating for display, if I have voted
@@ -522,7 +522,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
                 favoriteBack = RATING_BACKGROUND[0];
             }
         }
-        holder.favourite.setBackgroundResource(favoriteBack);
+        holder.favorite.setBackgroundResource(favoriteBack);
 
         if (cacheListType == CacheListType.HISTORY && cache.getVisitedDate() > 0) {
             holder.info.setText(Formatter.formatCacheInfoHistory(cache));
-- 
cgit v1.1


From d1acac75b6af3239701a2df020488db2af2dcb05 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 4 May 2013 15:31:44 +0200
Subject: refactoring: unify the action bar layout

---
 main/res/layout-land/coords.xml                    |  7 +----
 main/res/layout-land/navigate.xml                  | 18 +-----------
 main/res/layout/about_activity.xml                 | 11 +-------
 main/res/layout/actionbar.xml                      |  6 ++++
 main/res/layout/actionbar_button_compass.xml       | 15 ++++++++++
 main/res/layout/actionbar_button_manual.xml        | 14 +++++++++
 main/res/layout/actionbar_button_map.xml           | 13 +++++++++
 main/res/layout/actionbar_button_myposition.xml    | 12 ++++++++
 main/res/layout/actionbar_button_search.xml        | 13 +++++++++
 main/res/layout/actionbar_progress.xml             |  4 +++
 main/res/layout/actionbar_title.xml                | 16 +++++++++++
 main/res/layout/actionbar_with_manual.xml          |  9 ++++++
 main/res/layout/addresses.xml                      | 11 +-------
 main/res/layout/caches.xml                         | 33 ++++------------------
 main/res/layout/cacheview.xml                      | 24 ++--------------
 main/res/layout/coords.xml                         | 14 +--------
 main/res/layout/edit_waypoint_activity.xml         | 18 +-----------
 main/res/layout/gpx.xml                            | 11 +-------
 main/res/layout/init.xml                           | 18 +-----------
 main/res/layout/main.xml                           | 14 ++-------
 main/res/layout/map_google.xml                     | 27 ++++--------------
 main/res/layout/map_mapsforge.xml                  | 25 +++-------------
 main/res/layout/map_mapsforge_old.xml              | 27 ++++--------------
 main/res/layout/map_static.xml                     | 11 +-------
 main/res/layout/navigate.xml                       | 18 +-----------
 main/res/layout/point.xml                          | 18 +-----------
 main/res/layout/popup.xml                          | 20 ++-----------
 main/res/layout/search.xml                         | 18 +-----------
 main/res/layout/spoilers.xml                       | 11 +-------
 main/res/layout/touch.xml                          | 19 ++-----------
 main/res/layout/trackable_activity.xml             | 18 +-----------
 main/res/layout/twitter_authorization_activity.xml | 11 +-------
 main/res/layout/useful_apps.xml                    | 11 +-------
 main/res/layout/visit.xml                          | 19 ++-----------
 main/res/layout/visit_image.xml                    | 19 ++-----------
 main/res/layout/waypoint_popup.xml                 | 20 ++-----------
 main/res/values/ids.xml                            |  5 ----
 main/res/values/styles.xml                         |  2 --
 main/src/cgeo/geocaching/CacheDetailActivity.java  |  2 +-
 main/src/cgeo/geocaching/cgeocaches.java           | 11 ++++++++
 .../ui/dialog/CoordinatesInputDialog.java          |  2 +-
 41 files changed, 171 insertions(+), 424 deletions(-)
 create mode 100644 main/res/layout/actionbar.xml
 create mode 100644 main/res/layout/actionbar_button_compass.xml
 create mode 100644 main/res/layout/actionbar_button_manual.xml
 create mode 100644 main/res/layout/actionbar_button_map.xml
 create mode 100644 main/res/layout/actionbar_button_myposition.xml
 create mode 100644 main/res/layout/actionbar_button_search.xml
 create mode 100644 main/res/layout/actionbar_progress.xml
 create mode 100644 main/res/layout/actionbar_title.xml
 create mode 100644 main/res/layout/actionbar_with_manual.xml
 delete mode 100644 main/res/values/ids.xml

(limited to 'main')

diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
index 1388187..30cc6b5 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coords.xml
@@ -11,12 +11,7 @@
             style="@style/action_bar_title"
             android:text="@string/cache_coordinates" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/actionBarManualbutton"
-            style="@style/action_bar_action"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml
index aa8b2b4..d2f39b1 100644
--- a/main/res/layout-land/navigate.xml
+++ b/main/res/layout-land/navigate.xml
@@ -5,23 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
index 9325ea0..b0de7ea 100644
--- a/main/res/layout/about_activity.xml
+++ b/main/res/layout/about_activity.xml
@@ -5,16 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml
new file mode 100644
index 0000000..9a3efa0
--- /dev/null
+++ b/main/res/layout/actionbar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar" >
+
+    <include layout="@layout/actionbar_title"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_compass.xml b/main/res/layout/actionbar_button_compass.xml
new file mode 100644
index 0000000..932444b
--- /dev/null
+++ b/main/res/layout/actionbar_button_compass.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        android:id="@+id/defaultNavigation"
+        style="@style/action_bar_action"
+        android:longClickable="true"
+        android:onClick="goDefaultNavigation"
+        android:src="@drawable/actionbar_compass_dark" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_manual.xml b/main/res/layout/actionbar_button_manual.xml
new file mode 100644
index 0000000..86965f1
--- /dev/null
+++ b/main/res/layout/actionbar_button_manual.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        android:id="@+id/action_bar_manual"
+        style="@style/action_bar_action"
+        android:onClick="goManual"
+        android:src="@drawable/actionbar_manual" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_map.xml b/main/res/layout/actionbar_button_map.xml
new file mode 100644
index 0000000..9b2138a
--- /dev/null
+++ b/main/res/layout/actionbar_button_map.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goMap"
+        android:src="@drawable/actionbar_map" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml
new file mode 100644
index 0000000..3604345
--- /dev/null
+++ b/main/res/layout/actionbar_button_myposition.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageSwitcher
+            android:id="@+id/my_position"
+            style="@style/action_bar_action" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_search.xml b/main/res/layout/actionbar_button_search.xml
new file mode 100644
index 0000000..2aa1a50
--- /dev/null
+++ b/main/res/layout/actionbar_button_search.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goSearch"
+        android:src="@drawable/actionbar_search" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml
new file mode 100644
index 0000000..a39d103
--- /dev/null
+++ b/main/res/layout/actionbar_progress.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar_progress"
+    android:visibility="gone" android:id="@+id/actionbar_progress"/>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml
new file mode 100644
index 0000000..4fa5348
--- /dev/null
+++ b/main/res/layout/actionbar_title.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goHome" />
+
+    <View style="@style/action_bar_separator" />
+
+    <TextView
+        android:id="@+id/actionbar_title"
+        style="@style/action_bar_title" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_with_manual.xml b/main/res/layout/actionbar_with_manual.xml
new file mode 100644
index 0000000..d56c14e
--- /dev/null
+++ b/main/res/layout/actionbar_with_manual.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar" >
+
+    <include layout="@layout/actionbar_title"/>
+
+    <include layout="@layout/actionbar_button_manual"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresses.xml
index 2be131d..08f5bc1 100644
--- a/main/res/layout/addresses.xml
+++ b/main/res/layout/addresses.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
index 147a596..dea9357 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/caches.xml
@@ -6,34 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title" />
+        
+        <include layout="@layout/actionbar_progress" />
+        
+        <include layout="@layout/actionbar_button_map" />
 
-        <View style="@style/action_bar_separator" />
-
-        <TextView
-            style="@style/action_bar_title"
-            android:clickable="true"
-            android:onClick="selectList" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goMap"
-            android:src="@drawable/actionbar_map" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index 89d7152..ec30672 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -8,29 +8,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title" />
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_button_compass" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/defaultNavigation"
-            style="@style/action_bar_action"
-            android:longClickable="true"
-            android:onClick="startDefaultNavigation"
-            android:src="@drawable/actionbar_compass_dark" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual" />
     </LinearLayout>
 
     <android.support.v4.view.ViewPager
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index ddb2f4e..229cffe 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,19 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <TextView
-            style="@style/action_bar_title"
-            android:text="@string/cache_coordinates" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/actionBarManualbutton"
-            style="@style/action_bar_action"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual"/>
 
     <ScrollView
         android:id="@+id/scroller"
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
index 3fbd19e..c2751d1 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -5,23 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml
index 2be131d..08f5bc1 100644
--- a/main/res/layout/gpx.xml
+++ b/main/res/layout/gpx.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 26137fc..c948629 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,23 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index 0f9aff0..e4aa9cc 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -13,19 +13,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_button_search"/>
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goSearch"
-            android:src="@drawable/actionbar_search" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <fragment
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 723b7157..7b116c9 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_myposition"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index f3b183e..27d6e0d 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
+        <include layout="@layout/actionbar_button_myposition"/>
 
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index 44b3387..f2cb175 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_myposition"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml
index ff0435c..edf6c6e 100644
--- a/main/res/layout/map_static.xml
+++ b/main/res/layout/map_static.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 0c95958..4486884 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,23 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <RelativeLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index 3c133d8..5297d6d 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -5,23 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ListView
         android:id="@+id/historyList"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index ff64c91..9db6c5f 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -9,23 +9,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/defaultNavigation"
-            style="@style/action_bar_action"
-            android:longClickable="true"
-            android:onClick="goDefaultNavigation"
-            android:src="@drawable/actionbar_compass_dark" />
-
-        <View
-            android:id="@+id/separator"
-            style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_compass"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 6d0bf91..449ad5d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -6,23 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml
index 233972a..2027b7a 100644
--- a/main/res/layout/spoilers.xml
+++ b/main/res/layout/spoilers.xml
@@ -5,16 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <include layout="@layout/caches_images" />
 
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 09a8033..17553d1 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
index fe61409..f0176fc 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/trackable_activity.xml
@@ -6,23 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
diff --git a/main/res/layout/twitter_authorization_activity.xml b/main/res/layout/twitter_authorization_activity.xml
index 97c2236..ec9aa8a 100644
--- a/main/res/layout/twitter_authorization_activity.xml
+++ b/main/res/layout/twitter_authorization_activity.xml
@@ -5,16 +5,7 @@
     android:orientation="vertical"
     android:visibility="visible" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml
index 2a3d14e..8fd73bf 100644
--- a/main/res/layout/useful_apps.xml
+++ b/main/res/layout/useful_apps.xml
@@ -5,16 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-    </LinearLayout>
+    <include layout="@layout/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index 43a3308..ed32d25 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index c9d4be2..d39d5ae 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index 869ffa0..e5b4e6b 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -9,23 +9,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/defaultNavigation"
-            style="@style/action_bar_action"
-            android:longClickable="true"
-            android:onClick="goDefaultNavigation"
-            android:src="@drawable/actionbar_compass_dark" />
-
-        <View
-            android:id="@+id/separator"
-            style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_compass"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/values/ids.xml b/main/res/values/ids.xml
deleted file mode 100644
index cfb09cd..0000000
--- a/main/res/values/ids.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<item type="id" name="actionbar_title" />
-	<item type="id" name="actionbar_progress" />
-</resources>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index caa884a..0116577 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -81,7 +81,6 @@
     </style>
 
     <style name="action_bar_progress" parent="@android:style/Widget.ProgressBar.Small">
-        <item name="android:id">@id/actionbar_progress</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">15dip</item>
@@ -90,7 +89,6 @@
     </style>
 
     <style name="action_bar_title">
-        <item name="android:id">@id/actionbar_title</item>
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index fd42f07..1e2377b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -795,7 +795,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     /**
      * Wrapper for the referenced method in the xml-layout.
      */
-    public void startDefaultNavigation(@SuppressWarnings("unused") View view) {
+    public void goDefaultNavigation(@SuppressWarnings("unused") View view) {
         startDefaultNavigation();
     }
 
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 097aef3..811425c 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -427,6 +427,17 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             }
         }
 
+        // Add the list selection in code. This way we can leave the XML layout the same as for other activities.
+        final View titleBar = findViewById(R.id.actionbar_title);
+        titleBar.setClickable(true);
+        titleBar.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                selectList(v);
+            }
+        });
+
         setTitle(title);
         setAdapter();
 
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index dada8fd..63a9b09 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -74,7 +74,7 @@ public class CoordinatesInputDialog extends Dialog {
 
         setContentView(R.layout.coords);
 
-        findViewById(R.id.actionBarManualbutton).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_bar_manual).setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View view) {
-- 
cgit v1.1


From ba161e11c7048b9b3a2ec767a918ecdfb5565608 Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Mon, 6 May 2013 00:39:00 +0300
Subject: Change log update

---
 main/res/values/strings_not_translatable.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index 1eddfc6..7fde7a0 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -99,14 +99,22 @@
     <b>Next release</b>\n\n
     <b>New Features/Functions:</b>\n
     · Log images can be scaled before upload to save traffic
-    · \n
+    · Improved online detection when refreshing caches\n
     \n
     <b>Bugfixing:</b>\n
     · Do not apply encryption/decryption when clicking on a link in a log\n
     · Also show a picture attached to a log locally after sending the log\n
     · Improved display of log text for OC-caches\n
     · Improved performance of GPX exports\n
-     \n
+    · GPX import option now also shown on all caches list\n
+    · OC.de attributes correction\n
+    · Reduce memory usage for images to avoid crashes\n
+    · Do not show short description if it is contained in long description for OC.de caches\n
+    · Do not allow setting the GPX dir to a not accessible directory\n
+    · Failure in waypoint projection for some languages corrected\n
+    · Avoid crashes when selecting images for logs\n
+    · Ignore hide setting when searching for owned caches\n
+    \n
     <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=17&amp;state=closed">Detailed list of all changes</a>\n
     \n
     <b>Known Limitations/Bugs:</b>\n
-- 
cgit v1.1


From a1fb76fff83b09ccad4f29fada45443a510dea26 Mon Sep 17 00:00:00 2001
From: rsudev <rasch@munin-soft.de>
Date: Mon, 6 May 2013 08:21:06 +0200
Subject: Fixes #2698, Popup is empty on live map

Re-added implicitely removed actionbar tiltle ids for popup
---
 main/res/layout/popup.xml          | 6 ++++--
 main/res/layout/waypoint_popup.xml | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 9db6c5f..97c1367 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -7,8 +7,10 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <TextView style="@style/action_bar_title" />
-
+        <TextView
+            android:id="@+id/actionbar_title"
+            style="@style/action_bar_title" />
+		
         <include layout="@layout/actionbar_button_compass"/>
         
         <include layout="@layout/actionbar_button_manual"/>
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index e5b4e6b..c2b2af8 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -7,7 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <TextView style="@style/action_bar_title" />
+        <TextView
+            android:id="@+id/actionbar_title"
+            style="@style/action_bar_title" />
 
         <include layout="@layout/actionbar_button_compass"/>
         
-- 
cgit v1.1


From bba22045cc0b924f2453322af45921994025a5c9 Mon Sep 17 00:00:00 2001
From: RomNexus6 <romano.signorelli@gmail.com>
Date: Mon, 6 May 2013 11:47:21 +0300
Subject: updated translation-it

---
 main/res/values-it/strings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index ab43e86..9614526 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -125,7 +125,15 @@
   <string name="log_image_stored">Esistente</string>
   <string name="log_image_camera">Nuova</string>
   <string name="log_image_caption">Didascalia</string>
-  <string name="log_image_description">Descrizione</string> 
+  <string name="log_image_description">Descrizione</string>
+  <string name="log_image_scale">Ridimensiona</string>
+  <string-array name="log_image_scales">
+      <item>Dimensioni originali</item>
+      <item>512 px</item>
+      <item>640 px</item>
+      <item>800 px</item>
+      <item>1024 px</item>
+  </string-array>
 
   <!-- translation -->
   <string name="translate_to_sys_lang">Traduci in %s</string>
@@ -987,6 +995,8 @@
   <string name="attribute_swamp_no">Non paludoso</string>
   <string name="attribute_hills_yes">Area collinare</string>
   <string name="attribute_hills_no">Area non collinare</string>
+  <string name="attribute_easy_climbing_yes">Facile scalata</string>
+  <string name="attribute_easy_climbing_no">Nessuna facile scalata</string>  
   <string name="attribute_poi_yes">Punto di interesse</string>
   <string name="attribute_poi_no">Nessun punto di interesse</string>
   <string name="attribute_moving_target_yes">Obiettivo in movimento</string>
-- 
cgit v1.1


From c645ee39ed4bb7fb7b3af9cf87ee5a2ff910c845 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Tue, 7 May 2013 07:11:38 +0200
Subject: fix #2702: Don't allow to check ".." in path selection

---
 main/src/cgeo/geocaching/files/SimpleDirChooser.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 824173c..6b2366c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -186,13 +186,12 @@ public class SimpleDirChooser extends AbstractListActivity {
             if (currentOption != lastOption) {
                 currentOption.setChecked(true);
                 lastPosition = position;
-                okButton.setEnabled(true);
-                okButton.setVisibility(View.VISIBLE);
             } else {
                 lastPosition = -1;
-                okButton.setEnabled(false);
-                okButton.setVisibility(View.INVISIBLE);
             }
+            final boolean enabled = currentOption.isChecked() && !currentOption.getName().equals(PARENT_DIR);
+            okButton.setEnabled(enabled);
+            okButton.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
             adapter.notifyDataSetChanged();
         }
     }
-- 
cgit v1.1


From 0726be7130feda75973101aa8ff94eaf80163fcc Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Tue, 7 May 2013 20:03:29 +0200
Subject: refactoring: simplify log types handling

---
 main/src/cgeo/geocaching/Geocache.java              |  4 +---
 main/src/cgeo/geocaching/VisitCacheActivity.java    |  1 -
 main/src/cgeo/geocaching/connector/gc/GCParser.java | 14 +++++---------
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 705f2ed..fe5de91 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -47,7 +47,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -484,7 +483,7 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     public List<LogType> getPossibleLogTypes() {
-        final List<LogType> logTypes = new LinkedList<LogType>();
+        final List<LogType> logTypes = new ArrayList<LogType>();
         if (isEventCache()) {
             logTypes.add(LogType.WILL_ATTEND);
             logTypes.add(LogType.NOTE);
@@ -511,7 +510,6 @@ public class Geocache implements ICache, IWaypoint {
             logTypes.add(LogType.TEMP_DISABLE_LISTING);
             logTypes.add(LogType.ENABLE_LISTING);
             logTypes.add(LogType.ARCHIVE);
-            logTypes.remove(LogType.UPDATE_COORDINATES);
         }
         return logTypes;
     }
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 864ebf8..198186c 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -110,7 +110,6 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         viewstates = Login.getViewstates(page);
         trackables = GCParser.parseTrackableLog(page);
         possibleLogTypes = GCParser.parseTypes(page);
-        possibleLogTypes.remove(LogType.UPDATE_COORDINATES);
 
         if (possibleLogTypes.isEmpty()) {
             showErrorLoadingData();
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 4273da5..c637579 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1586,15 +1586,8 @@ public abstract class GCParser {
         final List<LogType> types = new ArrayList<LogType>();
 
         final MatcherWrapper typeBoxMatcher = new MatcherWrapper(GCConstants.PATTERN_TYPEBOX, page);
-        String typesText = null;
-        if (typeBoxMatcher.find()) {
-            if (typeBoxMatcher.groupCount() > 0) {
-                typesText = typeBoxMatcher.group(1);
-            }
-        }
-
-        if (typesText != null) {
-
+        if (typeBoxMatcher.find() && typeBoxMatcher.groupCount() > 0) {
+            String typesText = typeBoxMatcher.group(1);
             final MatcherWrapper typeMatcher = new MatcherWrapper(GCConstants.PATTERN_TYPE2, typesText);
             while (typeMatcher.find()) {
                 if (typeMatcher.groupCount() > 1) {
@@ -1610,6 +1603,9 @@ public abstract class GCParser {
             }
         }
 
+        // we don't support this log type
+        types.remove(LogType.UPDATE_COORDINATES);
+
         return types;
     }
 
-- 
cgit v1.1


From 18ac1a4ea3a9bc9b65babad358fec4e49968890a Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Wed, 8 May 2013 07:38:19 +0200
Subject: fix #1106: search for self as owner

---
 main/src/cgeo/geocaching/connector/gc/GCParser.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index c637579..c8473a5 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -826,6 +826,15 @@ public abstract class GCParser {
         return searchByAny(cacheType, false, showCaptcha, params, recaptchaReceiver);
     }
 
+    private static boolean isSearchForMyCaches(final String userName) {
+        boolean my = false;
+        if (userName.equalsIgnoreCase(Settings.getLogin().left)) {
+            my = true;
+            Log.i("Overriding users choice because of self search, downloading all caches.");
+        }
+        return my;
+    }
+
     public static SearchResult searchByUsername(final String userName, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) {
         if (StringUtils.isBlank(userName)) {
             Log.e("GCParser.searchByUsername: No user name given");
@@ -834,13 +843,7 @@ public abstract class GCParser {
 
         final Parameters params = new Parameters("ul", userName);
 
-        boolean my = false;
-        if (userName.equalsIgnoreCase(Settings.getLogin().left)) {
-            my = true;
-            Log.i("GCParser.searchByUsername: Overriding users choice, downloading all caches.");
-        }
-
-        return searchByAny(cacheType, my, showCaptcha, params, recaptchaReceiver);
+        return searchByAny(cacheType, isSearchForMyCaches(userName), showCaptcha, params, recaptchaReceiver);
     }
 
     public static SearchResult searchByOwner(final String userName, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) {
@@ -850,7 +853,7 @@ public abstract class GCParser {
         }
 
         final Parameters params = new Parameters("u", userName);
-        return searchByAny(cacheType, false, showCaptcha, params, recaptchaReceiver);
+        return searchByAny(cacheType, isSearchForMyCaches(userName), showCaptcha, params, recaptchaReceiver);
     }
 
     public static SearchResult searchByAddress(final String address, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) {
-- 
cgit v1.1


From db88f86e0756ea44414a4da9353af36e39d511dc Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 9 May 2013 07:55:33 +0200
Subject: fix #1781: Remove help function

---
 main/res/drawable-hdpi/actionbar_manual.png        | Bin 652 -> 0 bytes
 main/res/drawable-ldpi/actionbar_manual.png        | Bin 501 -> 0 bytes
 main/res/drawable-mdpi/actionbar_manual.png        | Bin 769 -> 0 bytes
 main/res/drawable-mdpi/helper_manual.png           | Bin 50536 -> 0 bytes
 main/res/layout-land/coords.xml                    |   2 -
 main/res/layout-land/navigate.xml                  |   2 +-
 main/res/layout/actionbar_button_manual.xml        |  14 -
 main/res/layout/actionbar_with_manual.xml          |   9 -
 main/res/layout/caches.xml                         |   6 +-
 main/res/layout/cacheview.xml                      |   2 -
 main/res/layout/coords.xml                         |   2 +-
 main/res/layout/edit_waypoint_activity.xml         |   2 +-
 main/res/layout/init.xml                           |   2 +-
 main/res/layout/main.xml                           |  39 +--
 main/res/layout/map_google.xml                     |   6 +-
 main/res/layout/map_mapsforge.xml                  |   6 +-
 main/res/layout/map_mapsforge_old.xml              |   6 +-
 main/res/layout/navigate.xml                       |   2 -
 main/res/layout/point.xml                          |   2 +-
 main/res/layout/popup.xml                          |   6 +-
 main/res/layout/search.xml                         |   2 +-
 main/res/layout/touch.xml                          |   4 +-
 main/res/layout/trackable_activity.xml             |   2 +-
 main/res/layout/visit.xml                          |   4 +-
 main/res/layout/visit_image.xml                    |  10 +-
 main/res/layout/waypoint_popup.xml                 |   4 +-
 main/res/values-cs/strings.xml                     |   2 -
 main/res/values-de/strings.xml                     |   2 -
 main/res/values-es/strings.xml                     |   2 -
 main/res/values-fr/strings.xml                     |   2 -
 main/res/values-hu/strings.xml                     |   2 -
 main/res/values-it/strings.xml                     |   2 -
 main/res/values-ja/strings.xml                     |   2 -
 main/res/values-nl/strings.xml                     |   2 -
 main/res/values-pl/strings.xml                     |   2 -
 main/res/values-pt/strings.xml                     |   2 -
 main/res/values-sk/strings.xml                     |   2 -
 main/res/values-sv/strings.xml                     |   2 -
 main/res/values/strings.xml                        |   2 -
 .../cgeo/geocaching/AbstractLoggingActivity.java   |   4 -
 .../src/cgeo/geocaching/AbstractPopupActivity.java |   9 +-
 main/src/cgeo/geocaching/CacheDetailActivity.java  |   5 -
 main/src/cgeo/geocaching/CachePopup.java           |   2 +-
 main/src/cgeo/geocaching/EditWaypointActivity.java |   6 -
 main/src/cgeo/geocaching/ImageSelectActivity.java  |   4 -
 main/src/cgeo/geocaching/LogTrackableActivity.java |   4 -
 main/src/cgeo/geocaching/MainActivity.java         |  27 --
 .../cgeo/geocaching/NavigateAnyPointActivity.java  |   4 -
 main/src/cgeo/geocaching/SearchActivity.java       |   4 -
 main/src/cgeo/geocaching/SettingsActivity.java     |   4 -
 main/src/cgeo/geocaching/TrackableActivity.java    |   4 -
 main/src/cgeo/geocaching/UsefulAppsActivity.java   |  13 -
 main/src/cgeo/geocaching/VisitCacheActivity.java   |   4 -
 main/src/cgeo/geocaching/WaypointPopup.java        |   2 +-
 .../cgeo/geocaching/activity/AbstractActivity.java |  16 +-
 .../geocaching/activity/AbstractListActivity.java  |  13 +-
 .../activity/AbstractViewPagerActivity.java        |   4 -
 .../cgeo/geocaching/activity/ActivityMixin.java    |  18 -
 .../geocaching/activity/IAbstractActivity.java     |   2 -
 main/src/cgeo/geocaching/cgeocaches.java           |  16 -
 main/src/cgeo/geocaching/cgeonavigate.java         |   2 +-
 main/src/cgeo/geocaching/maps/AbstractMap.java     |   2 -
 main/src/cgeo/geocaching/maps/CGeoMap.java         |   6 -
 .../geocaching/maps/google/GoogleMapActivity.java  |   6 -
 .../maps/interfaces/MapActivityImpl.java           |   2 -
 .../maps/mapsforge/MapsforgeMapActivity.java       |   6 -
 .../mapsforge/v024/MapsforgeMapActivity024.java    |   6 -
 .../ui/dialog/CoordinatesInputDialog.java          |   8 -
 .../app/appmanualclient/AppManualReaderClient.java | 375 ---------------------
 69 files changed, 32 insertions(+), 706 deletions(-)
 delete mode 100644 main/res/drawable-hdpi/actionbar_manual.png
 delete mode 100644 main/res/drawable-ldpi/actionbar_manual.png
 delete mode 100644 main/res/drawable-mdpi/actionbar_manual.png
 delete mode 100644 main/res/drawable-mdpi/helper_manual.png
 delete mode 100644 main/res/layout/actionbar_button_manual.xml
 delete mode 100644 main/res/layout/actionbar_with_manual.xml
 delete mode 100644 main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java

(limited to 'main')

diff --git a/main/res/drawable-hdpi/actionbar_manual.png b/main/res/drawable-hdpi/actionbar_manual.png
deleted file mode 100644
index 0b0c93c..0000000
Binary files a/main/res/drawable-hdpi/actionbar_manual.png and /dev/null differ
diff --git a/main/res/drawable-ldpi/actionbar_manual.png b/main/res/drawable-ldpi/actionbar_manual.png
deleted file mode 100644
index 14af11d..0000000
Binary files a/main/res/drawable-ldpi/actionbar_manual.png and /dev/null differ
diff --git a/main/res/drawable-mdpi/actionbar_manual.png b/main/res/drawable-mdpi/actionbar_manual.png
deleted file mode 100644
index a71acb3..0000000
Binary files a/main/res/drawable-mdpi/actionbar_manual.png and /dev/null differ
diff --git a/main/res/drawable-mdpi/helper_manual.png b/main/res/drawable-mdpi/helper_manual.png
deleted file mode 100644
index c3c43db..0000000
Binary files a/main/res/drawable-mdpi/helper_manual.png and /dev/null differ
diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
index 30cc6b5..88e5e76 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coords.xml
@@ -10,8 +10,6 @@
         <TextView
             style="@style/action_bar_title"
             android:text="@string/cache_coordinates" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml
index d2f39b1..5965128 100644
--- a/main/res/layout-land/navigate.xml
+++ b/main/res/layout-land/navigate.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/actionbar_button_manual.xml b/main/res/layout/actionbar_button_manual.xml
deleted file mode 100644
index 86965f1..0000000
--- a/main/res/layout/actionbar_button_manual.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <View style="@style/action_bar_separator" />
-
-    <ImageView
-        android:id="@+id/action_bar_manual"
-        style="@style/action_bar_action"
-        android:onClick="goManual"
-        android:src="@drawable/actionbar_manual" />
-
-</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_with_manual.xml b/main/res/layout/actionbar_with_manual.xml
deleted file mode 100644
index d56c14e..0000000
--- a/main/res/layout/actionbar_with_manual.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/action_bar" >
-
-    <include layout="@layout/actionbar_title"/>
-
-    <include layout="@layout/actionbar_button_manual"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
index dea9357..5c3abbc 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/caches.xml
@@ -7,12 +7,10 @@
     <LinearLayout style="@style/action_bar" >
 
         <include layout="@layout/actionbar_title" />
-        
+
         <include layout="@layout/actionbar_progress" />
-        
-        <include layout="@layout/actionbar_button_map" />
 
-        <include layout="@layout/actionbar_button_manual" />
+        <include layout="@layout/actionbar_button_map" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index ec30672..44765dc 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -11,8 +11,6 @@
         <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_button_compass" />
-
-        <include layout="@layout/actionbar_button_manual" />
     </LinearLayout>
 
     <android.support.v4.view.ViewPager
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index 229cffe..6da453e 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual"/>
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:id="@+id/scroller"
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
index c2751d1..657e9f4 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual"/>
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index c948629..ab38fb6 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index e4aa9cc..e90cd37 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -13,9 +13,7 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <include layout="@layout/actionbar_button_search"/>
-
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_search" />
     </LinearLayout>
 
     <fragment
@@ -168,41 +166,6 @@
     </LinearLayout>
     <!-- ** -->
 
-    <RelativeLayout
-        android:id="@+id/helper"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="64dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:background="@drawable/helper_bcg"
-        android:visibility="gone" >
-
-        <ImageView
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_alignParentLeft="true"
-            android:layout_gravity="center"
-            android:layout_margin="4dip"
-            android:gravity="center"
-            android:scaleType="center"
-            android:src="@drawable/actionbar_manual" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_gravity="center"
-            android:layout_marginLeft="34dip"
-            android:gravity="center"
-            android:padding="4dip"
-            android:text="@string/helper"
-            android:textColor="@color/text_icon"
-            android:textSize="14dip" />
-    </RelativeLayout>
-    <!-- ** -->
-
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 7b116c9..3e460ef 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index 27d6e0d..1833da3 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index f2cb175..6ca98e1 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 4486884..ae51735 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,8 +5,6 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
-
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" >
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index 5297d6d..baa568c 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ListView
         android:id="@+id/historyList"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 97c1367..15e4248 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -10,10 +10,8 @@
         <TextView
             android:id="@+id/actionbar_title"
             style="@style/action_bar_title" />
-		
-        <include layout="@layout/actionbar_button_compass"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+
+        <include layout="@layout/actionbar_button_compass" />
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 449ad5d..a0a699d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -6,7 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 17553d1..61778ce 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
index f0176fc..bcfb42d 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/trackable_activity.xml
@@ -6,7 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index ed32d25..7ffd630 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index d39d5ae..fd8eaea 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
@@ -89,9 +87,9 @@
                 android:id="@+id/logImageScale"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:prompt="@string/log_image_scale"
-                android:entries="@array/log_image_scales"/>
-            
+                android:entries="@array/log_image_scales"
+                android:prompt="@string/log_image_scale" />
+
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index c2b2af8..b3806aa 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -11,9 +11,7 @@
             android:id="@+id/actionbar_title"
             style="@style/action_bar_title" />
 
-        <include layout="@layout/actionbar_button_compass"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_compass" />
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index ac75564..b5df662 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -819,8 +819,6 @@
   <string name="license_dismiss">Zamítnout</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manuál</string>
-  <string name="helper_manual_description">Komplexní příručka aplikace c:geo obsahující popis všech možností této aplikace (včetně těch skrytých).</string>
   <string name="helper_calendar_title">c:geo modul kalendáře</string>
   <string name="helper_calendar_missing">c:geo modul kalendáře není nainstalován.</string>
   <string name="helper_calendar_description">Umožňuje exportovat události keší do tvého kalendáře.</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 26fd2d3..5d19848 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -813,8 +813,6 @@
   <string name="license_dismiss">Ablehnen</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Anleitung</string>
-  <string name="helper_manual_description">Umfangreiche Anleitung für c:geo mit Beschreibung aller Möglichkeiten dieser App (auch versteckte).</string>
   <string name="helper_calendar_title">c:geo Kalender Add-on</string>
   <string name="helper_calendar_missing">c:geo Kalender Add-on nicht installiert</string>
   <string name="helper_calendar_description">Ermöglicht die Übernahme von Event-Caches in den Kalender.</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index f029d9b..b618fb9 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -627,8 +627,6 @@
   <string name="license_dismiss">Descartar</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manual</string>
-  <string name="helper_manual_description">Sencillo manual de c:geo que contiene todas las capacidades de este programa (incluidas las ocultas).</string>
   <string name="helper_locus_title">Locus</string>
   <string name="helper_locus_description">Sencilla aplicación que muestra mapas en línea y permite descargarlos para ser usados sin conexión (sólo mapas no vectoriales). También permite registrar el recorrido, gestionar puntos de interés y más funciones interesantes.</string>
 
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index a0f86e6..2f5fccb 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -817,8 +817,6 @@
   <string name="license_dismiss">Rejeter</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manuel</string>
-  <string name="helper_manual_description">Manuel complet pour c:geo contenant la description de toutes les fonctionnalités de cette application (y compris celle secrètes).</string>
   <string name="helper_calendar_title">Module supplémentaire c:geo agenda</string>
   <string name="helper_calendar_missing">Module supplémentaire c:geo agenda non installé</string>
   <string name="helper_calendar_description">Permet d\'exporter les événements liés aux caches dans le calendrier Android.</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index e7018f9..689912c 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -759,8 +759,6 @@
   <string name="license_dismiss">Elutasítás</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Kézikönyv</string>
-  <string name="helper_manual_description">Részletes kézikönyv a c:geo-hoz amiben az összes lehetőség leírása szerepel. (még a rejtettek is).</string>
   <string name="helper_calendar_title">c:geo naptár add-on</string>
   <string name="helper_calendar_missing">c:geo naptár add-on nincs telepítve.</string>
   <string name="helper_calendar_description">Lehetővé teszi a geoládák exportálását az eszközöd naptárába.</string> 
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 9614526..a36493d 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -816,8 +816,6 @@
   <string name="license_dismiss">Chiudi</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manual</string>
-  <string name="helper_manual_description">Manuale dettagliato di c:geo che contiene la descrizione di tutte le possibilità offerte da questa applicazione, comprese quelle nascoste (in inglese).</string>
   <string name="helper_calendar_title">c:geo calendario add-on</string>
   <string name="helper_calendar_missing">c:geo calendario add-on non installato</string>
   <string name="helper_calendar_description">Permette di esportare gli eventi cache nel calendario del tuo dispositivo.</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 5d7759e..42f16be 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -793,8 +793,6 @@
   <string name="license_dismiss">閉じる</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">マニュアル</string>
-  <string name="helper_manual_description">c:geoのマニュアル(英語)はこのアプリでできる事(隠れ機能も)の全てについて書いてあります。</string>
   <string name="helper_calendar_title">c:geo - カレンダープラグイン</string>
   <string name="helper_calendar_missing">c:geo - カレンダープラグインはインストールされていません。</string>
   <string name="helper_calendar_description">イベントキャッシュをカレンダーアプリに登録することができます。</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 8ce95a5..f4dbd10 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -801,8 +801,6 @@
   <string name="license_dismiss">Afwijzen</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Handleiding</string>
-  <string name="helper_manual_description">Uitgebreide handleiding voor c:geo welke alle mogelijkheden van deze applicatie uitlegt (ook de verborgen mogelijkheden).</string>
   <string name="helper_calendar_title">c:geo kalender add-on</string>
   <string name="helper_calendar_missing">c:geo kalender add-on niet geinstalleerd.</string>
   <string name="helper_calendar_description">Maakt het mogelijk om Geocaching events in je kalender op te slaan.</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index b4fbca7..1752d03 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -781,8 +781,6 @@
   <string name="license_dismiss">Odmów</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Instrukcja obsługi</string>
-  <string name="helper_manual_description">Obszerny przewodnik do c:geo wraz z opisem wszystkich możliwości tego programu (także ukrytych).</string>
   <string name="helper_calendar_title">Dodatek Kalendarz c:geo</string>
   <string name="helper_calendar_missing">Dodatek Kalendarz c:geo nie jest zainstalowany.</string>
   <string name="helper_calendar_description">Umożliwia Tobie eksport skrzynek Wydarzenie do kalendarza w Twoim urządzeniu.</string>  
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index e4bcfd4..5916133 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -763,8 +763,6 @@
   <string name="license_dismiss">Dispensar</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manual</string>
-  <string name="helper_manual_description">Manual prático do c:geo, que contém a descrição de todas as funcionalidades desta aplicação (mesmo as que estão escondidas).</string>
   <string name="helper_calendar_title">Add on calendário para c:geo </string>
   <string name="helper_calendar_missing">Add on calendário para o c:geo não está instalado.</string>
   <string name="helper_calendar_description">Permite exportar caches evento para o calendário do seu dispositivo.</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 616bd44..af796ba 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -764,8 +764,6 @@
   <string name="license_dismiss">Zamietnutie</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manuál</string>
-  <string name="helper_manual_description">Obsiahly manuál pre c:geo, ktorý obsahuje popisy všetkých možností tejto aplikácie (dokonca i skrytých).</string>
   <string name="helper_calendar_title">Doplnok c:geo calendar</string>
   <string name="helper_calendar_missing">Doplnok c:geo calendar nie je nainštalovaný</string>
   <string name="helper_calendar_description">Umožní vám exportovať skrýše udalostí do kalendára na vašom zariadení.</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 0f23eed..0171288 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -816,8 +816,6 @@
   <string name="license_dismiss">Avbryt</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manual</string>
-  <string name="helper_manual_description">En utförlig manual för c:geo som beskriver alla möjligheter och ger en hel del tips. Manualen finns enbart på engelska.</string>
   <string name="helper_calendar_title">c:geo kalendertillägg</string>
   <string name="helper_calendar_missing">c:geo kalendertillägg är inte installerat</string>
   <string name="helper_calendar_description">Gör det möjligt att exportera event till din kalender.</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 42abb8f..b537b74 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -827,8 +827,6 @@
   <string name="license_dismiss">Dismiss</string>
 
   <!-- helpers -->
-  <string name="helper_manual_title">Manual</string>
-  <string name="helper_manual_description">Comprehensive manual for c:geo that contains description of all possibilities of this application (even hidden ones).</string>
   <string name="helper_calendar_title">c:geo calendar add-on</string>
   <string name="helper_calendar_missing">c:geo calendar add-on not installed.</string>
   <string name="helper_calendar_description">Enables you to export event caches into the calendar on your device.</string>
diff --git a/main/src/cgeo/geocaching/AbstractLoggingActivity.java b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
index 37c3643..3e66d5e 100644
--- a/main/src/cgeo/geocaching/AbstractLoggingActivity.java
+++ b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
@@ -20,10 +20,6 @@ public abstract class AbstractLoggingActivity extends AbstractActivity {
     private static final int MENU_SIGNATURE = 1;
     private static final int MENU_SMILEY = 2;
 
-    protected AbstractLoggingActivity(String helpTopic) {
-        super(helpTopic);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         // signature menu
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 5ad89fb..4dd9fd1 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -83,8 +83,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     public void onUpdateGeoData(final IGeoData geo) {
     }
 
-    protected AbstractPopupActivity(String helpTopic, int layout) {
-        super(helpTopic);
+    protected AbstractPopupActivity(int layout) {
         this.layout = layout;
     }
 
@@ -112,12 +111,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         }).start();
     }
 
-    @Override
-    public void goManual(View view) {
-        super.goManual(view);
-        finish();
-    }
-
     protected void init() {
         cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
 
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 1e2377b..fe17c06 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -192,11 +192,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     };
     protected ImagesList imagesList;
 
-    public CacheDetailActivity() {
-        // identifier for manual
-        super("c:geolocation-cache-details");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.cacheview);
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index d51f9f2..4df428e 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -65,7 +65,7 @@ public class CachePopup extends AbstractPopupActivity {
     }
 
     public CachePopup() {
-        super("c:geo-cache-info", R.layout.popup);
+        super(R.layout.popup);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index b937ba0..f4b3d09 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -3,7 +3,6 @@ package cgeo.geocaching;
 import butterknife.InjectView;
 
 import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 import cgeo.geocaching.enumerations.CacheType;
@@ -537,11 +536,6 @@ public class EditWaypointActivity extends AbstractActivity {
         return con.supportsOwnCoordinates() && con.uploadModifiedCoordinates(cache, waypointUploaded);
     }
 
-    @Override
-    public void goManual(final View view) {
-        ActivityMixin.goManual(this, id >= 0 ? "c:geo-waypoint-edit" : "c:geo-waypoint-new");
-    }
-
     public static void startActivityEditWaypoint(final Context context, final int waypointId) {
         context.startActivity(new Intent(context, EditWaypointActivity.class)
                 .putExtra(Intents.EXTRA_WAYPOINT_ID, waypointId));
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index 7c8df5a..4abf310 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -53,10 +53,6 @@ public class ImageSelectActivity extends AbstractActivity {
     private int scaleChoiceIndex;
     private Uri imageUri;
 
-    public ImageSelectActivity() {
-        super("c:geo-selectimage");
-    }
-
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.visit_image);
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 6b68225..7aee6ae 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -104,10 +104,6 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         }
     };
 
-    public LogTrackableActivity() {
-        super("c:geo-log-trackable");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.touch);
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 0843f66..cd573ba 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -4,7 +4,6 @@ import butterknife.InjectView;
 import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
@@ -38,7 +37,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -51,7 +49,6 @@ import java.util.Locale;
 public class MainActivity extends AbstractActivity {
     @InjectView(R.id.user_info) protected TextView userInfoView;
     @InjectView(R.id.nav_satellites) protected TextView navSatellites;
-    @InjectView(R.id.helper) protected RelativeLayout helper;
     @InjectView(R.id.filter_button_title)protected TextView filterTitle;
     @InjectView(R.id.map) protected View findOnMap;
     @InjectView(R.id.search_offline) protected View findByOffline;
@@ -181,10 +178,6 @@ public class MainActivity extends AbstractActivity {
         }
     };
 
-    public MainActivity() {
-        super("c:geo-main-screen");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // don't call the super implementation with the layout argument, as that would set the wrong theme
@@ -203,26 +196,6 @@ public class MainActivity extends AbstractActivity {
         version = Version.getVersionCode(this);
         Log.i("Starting " + getPackageName() + ' ' + version + " a.k.a " + Version.getVersionName(this));
 
-        try {
-            if (!Settings.isHelpShown()) {
-                if (helper != null) {
-                    helper.setVisibility(View.VISIBLE);
-                    helper.setClickable(true);
-                    helper.setOnClickListener(new View.OnClickListener() {
-
-                        @Override
-                        public void onClick(View view) {
-                            ActivityMixin.goManual(MainActivity.this, "c:geo-intro");
-                            view.setVisibility(View.GONE);
-                        }
-                    });
-                    Settings.setHelpShown();
-                }
-            }
-        } catch (Exception e) {
-            // nothing
-        }
-
         init();
     }
 
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index 746842d..fbd2f1b 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -102,10 +102,6 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     String distanceUnit = "";
 
-    public NavigateAnyPointActivity() {
-        super("c:geo-navigate-any");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.point);
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index a3a0797..9c7e54e 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -37,10 +37,6 @@ public class SearchActivity extends AbstractActivity {
     private EditText latEdit = null;
     private EditText lonEdit = null;
 
-    public SearchActivity() {
-        super("c:geo-search");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index d094358..bd99552 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -123,10 +123,6 @@ public class SettingsActivity extends AbstractActivity {
         }
     };
 
-    public SettingsActivity() {
-        super("c:geo-configuration");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.init);
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 9f71f69..e5468f3 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -108,10 +108,6 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
         }
     };
 
-    public TrackableActivity() {
-        super("c:geo-trackable-details");
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.trackable_activity);
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index ce8bbdd..b12c5e0 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -13,8 +13,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import java.util.Locale;
-
 public class UsefulAppsActivity extends AbstractActivity {
 
     @InjectView(R.id.parent) protected LinearLayout parentLayout;
@@ -23,17 +21,6 @@ public class UsefulAppsActivity extends AbstractActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.useful_apps);
 
-        final Locale loc = Locale.getDefault();
-        final String language = loc.getLanguage();
-
-        final String tutorialUrl;
-        if ("de".equalsIgnoreCase(language)) {
-            tutorialUrl = "gnu.android.app.cgeomanual.de";
-        }
-        else {
-            tutorialUrl = "gnu.android.app.cgeomanual.en";
-        }
-        addApp(R.string.helper_manual_title, R.string.helper_manual_description, R.drawable.helper_manual, tutorialUrl);
         addApp(R.string.helper_calendar_title, R.string.helper_calendar_description, R.drawable.cgeo, "cgeo.calendar");
         addApp(R.string.helper_locus_title, R.string.helper_locus_description, R.drawable.helper_locus, "menion.android.locus");
         addApp(R.string.helper_gpsstatus_title, R.string.helper_gpsstatus_description, R.drawable.helper_gpsstatus, "com.eclipsim.gpsstatus2");
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 28c8440..7c2d1ce 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -237,10 +237,6 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         return res.getString(R.string.log_post_rate) + " " + ratingTextValue(rating) + "*";
     }
 
-    public VisitCacheActivity() {
-        super("c:geo-log");
-    }
-
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.visit);
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 43a758f..ad1d981 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -23,7 +23,7 @@ public class WaypointPopup extends AbstractPopupActivity {
     private TextView waypointDistance = null;
 
     public WaypointPopup() {
-        super("c:geo-waypoint-info", R.layout.waypoint_popup);
+        super(R.layout.waypoint_popup);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index ad65ca3..964ef96 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -16,22 +16,15 @@ import android.widget.EditText;
 
 public abstract class AbstractActivity extends FragmentActivity implements IAbstractActivity {
 
-    final private String helpTopic;
-
     protected cgeoapplication app = null;
     protected Resources res = null;
     private boolean keepScreenOn = false;
 
     protected AbstractActivity() {
-        this(null);
-    }
-
-    protected AbstractActivity(final String helpTopic) {
-        this.helpTopic = helpTopic;
+        this(false);
     }
 
-    protected AbstractActivity(final String helpTopic, final boolean keepScreenOn) {
-        this(helpTopic);
+    protected AbstractActivity(final boolean keepScreenOn) {
         this.keepScreenOn = keepScreenOn;
     }
 
@@ -40,11 +33,6 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         ActivityMixin.goHome(this);
     }
 
-    @Override
-    public void goManual(final View view) {
-        ActivityMixin.goManual(this, helpTopic);
-    }
-
     final protected void setTitle(final String title) {
         ActivityMixin.setTitle(this, title);
     }
diff --git a/main/src/cgeo/geocaching/activity/AbstractListActivity.java b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
index ead47bd..47c747f 100644
--- a/main/src/cgeo/geocaching/activity/AbstractListActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
@@ -12,35 +12,24 @@ import android.view.View;
 public abstract class AbstractListActivity extends FragmentListActivity implements
         IAbstractActivity {
 
-    private String helpTopic;
     private boolean keepScreenOn = false;
 
     protected cgeoapplication app = null;
     protected Resources res = null;
 
     protected AbstractListActivity() {
-        this(null);
+        this(false);
     }
 
     protected AbstractListActivity(final boolean keepScreenOn) {
-        this(null);
         this.keepScreenOn = keepScreenOn;
     }
 
-    protected AbstractListActivity(final String helpTopic) {
-        this.helpTopic = helpTopic;
-    }
-
     @Override
     final public void goHome(View view) {
         ActivityMixin.goHome(this);
     }
 
-    @Override
-    public void goManual(View view) {
-        ActivityMixin.goManual(this, helpTopic);
-    }
-
     final public void showProgress(final boolean show) {
         ActivityMixin.showProgress(this, show);
     }
diff --git a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
index 366a59d..8793c1c 100644
--- a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
@@ -29,10 +29,6 @@ import java.util.Map;
  */
 public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends AbstractActivity {
 
-    protected AbstractViewPagerActivity(String helpTopic) {
-        super(helpTopic);
-    }
-
     /**
      * A {@link List} of all available pages.
      *
diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index bc524ec..12ab0be 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -21,8 +20,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import gnu.android.app.appmanualclient.AppManualReaderClient;
-
 public final class ActivityMixin {
 
     public final static void goHome(final Activity fromActivity) {
@@ -33,21 +30,6 @@ public final class ActivityMixin {
         fromActivity.finish();
     }
 
-    public static void goManual(final Context context, final String helpTopic) {
-        if (StringUtils.isBlank(helpTopic)) {
-            return;
-        }
-        try {
-            AppManualReaderClient.openManual(
-                    "c-geo",
-                    helpTopic,
-                    context,
-                    "http://manual.cgeo.org/");
-        } catch (Exception e) {
-            // nothing
-        }
-    }
-
     public static void setTitle(final Activity activity, final CharSequence text) {
         if (StringUtils.isBlank(text)) {
             return;
diff --git a/main/src/cgeo/geocaching/activity/IAbstractActivity.java b/main/src/cgeo/geocaching/activity/IAbstractActivity.java
index 04709c6..61c218b 100644
--- a/main/src/cgeo/geocaching/activity/IAbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/IAbstractActivity.java
@@ -6,8 +6,6 @@ public interface IAbstractActivity {
 
     public void goHome(View view);
 
-    public void goManual(View view);
-
     public void showToast(String text);
 
     public void showShortToast(String text);
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 811425c..33dea8f 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -2,7 +2,6 @@ package cgeo.geocaching;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.AbstractListActivity;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.activity.FilteredActivity;
 import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
@@ -1574,21 +1573,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         CGeoMap.startActivitySearch(this, searchToUse, mapTitle);
     }
 
-    @Override
-    public void goManual(View view) {
-        switch (type) {
-            case OFFLINE:
-                ActivityMixin.goManual(this, "c:geo-stored");
-                break;
-            case HISTORY:
-                ActivityMixin.goManual(this, "c:geo-history");
-                break;
-            default:
-                ActivityMixin.goManual(this, "c:geo-nearby");
-                break;
-        }
-    }
-
     private void refreshCurrentList() {
         switchListById(listId);
     }
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index b5205a6..679e2f2 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -47,7 +47,7 @@ public class cgeonavigate extends AbstractActivity {
     private CompassView compassView = null;
 
     public cgeonavigate() {
-        super("c:geo-compass", true);
+        super(true);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/AbstractMap.java b/main/src/cgeo/geocaching/maps/AbstractMap.java
index c028e51..d9ee751 100644
--- a/main/src/cgeo/geocaching/maps/AbstractMap.java
+++ b/main/src/cgeo/geocaching/maps/AbstractMap.java
@@ -63,8 +63,6 @@ public abstract class AbstractMap {
 
     public abstract void goHome(View view);
 
-    public abstract void goManual(View view);
-
     public abstract void onSaveInstanceState(final Bundle outState);
 
 }
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 111f384..436fcce 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1576,12 +1576,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
         ActivityMixin.goHome(activity);
     }
 
-    // open manual entry
-    @Override
-    public void goManual(View view) {
-        ActivityMixin.goManual(activity, "c:geo-live-map");
-    }
-
     @Override
     public View makeView() {
         ImageView imageView = new ImageView(activity);
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index 5649d19..a98241f 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -122,12 +122,6 @@ public class GoogleMapActivity extends MapActivity implements MapActivityImpl, F
         mapBase.goHome(view);
     }
 
-    // open manual entry
-    @Override
-    public void goManual(View view) {
-        mapBase.goManual(view);
-    }
-
     @Override
     public void showFilterMenu(View view) {
         // do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java b/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
index dc7dca5..e7deebd 100644
--- a/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
+++ b/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
@@ -35,6 +35,4 @@ public interface MapActivityImpl {
 
     public abstract void goHome(View view);
 
-    public abstract void goManual(View view);
-
 }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
index f850402..a0384b8 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
@@ -117,12 +117,6 @@ public class MapsforgeMapActivity extends MapActivity implements MapActivityImpl
         mapBase.goHome(view);
     }
 
-    // open manual entry
-    @Override
-    public void goManual(View view) {
-        mapBase.goManual(view);
-    }
-
     @Override
     public void showFilterMenu(View view) {
         // do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
index ed8a7bc..33ed30e 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
@@ -117,12 +117,6 @@ public class MapsforgeMapActivity024 extends MapActivity implements MapActivityI
         mapBase.goHome(view);
     }
 
-    // open manual entry
-    @Override
-    public void goManual(View view) {
-        mapBase.goManual(view);
-    }
-
     @Override
     public void showFilterMenu(View view) {
         // do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index 63a9b09..3d93a56 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -74,14 +74,6 @@ public class CoordinatesInputDialog extends Dialog {
 
         setContentView(R.layout.coords);
 
-        findViewById(R.id.action_bar_manual).setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                ActivityMixin.goManual(context, "c:geo-geocoordinate-input");
-            }
-        });
-
         final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
         final ArrayAdapter<CharSequence> adapter =
                 ArrayAdapter.createFromResource(context,
diff --git a/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java b/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
deleted file mode 100644
index af4c03e..0000000
--- a/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package gnu.android.app.appmanualclient;
-
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * The "App Manual Reader" client is a class to be used in applications which
- * want to offer their users manuals through the gnu.android.appmanualreader
- * application. Such applications do not need to include the whole
- * "App Manual Reader" app but instead just have to include only this little
- * package. This package then provides the mechanism to open suitable installed
- * manuals. It does not include any manuals itself.
- * <p>
- *
- * (c) 2011 Geocrasher (geocrasher@gmx.eu)
- * <p>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- * <p>
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- * <p>
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- * @author Geocrasher
- */
-public class AppManualReaderClient {
-
-	/**
-	 * The URI scheme used to identify application manual URIs when flinging
-	 * Intents around within an Android device, in the hope that there are
-	 * activities registered which will handle such application manual URIs.
-	 * Usually, there won't be just a single activity registered but instead
-	 * many, depending on how many manuals are installed on an Android device.
-	 */
-	public static final String URI_SCHEME_APPMANUAL = "appmanual";
-
-	/**
-	 * Standardized topic for opening a manual at its beginning.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_HOME = "andtw-home";
-	/**
-	 * Standardized topic for opening the index of a manual.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_INDEX = "andtw-index";
-	/**
-	 * Standardized topic for opening a manual's "about" topic.
-	 *
-	 * @see #openManual(String, String, Context)
-	 * @see #openManual(String, String, Context, String)
-	 */
-	public static final String TOPIC_ABOUT_MANUAL = "andtw-about";
-
-	    /**
-     * Convenience function to open a manual at a specific topic. See
-     * {@link #openManual(String, String, Context, String)} for a detailed
-     * description.
-     *
-     * @param manualIdentifier
-     *            the identifier of the manual to open. This identifier must
-     *            uniquely identify the manual as such, independent of the
-     *            particular locale the manual is intended for.
-     * @param topic
-     *            the topic to open. Please do not use spaces for topic names.
-     *            With respect to the TiddlyWiki infrastructure used for manuals
-     *            the topic needs to the tag of a (single) tiddler. This way
-     *            manuals can be localized (especially their topic titles)
-     *            without breaking an app's knowledge about topics. Some
-     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-     *            {@link #TOPIC_ABOUT_MANUAL}.
-     * @param context
-     *            the context (usually an Activity) from which the manual is to
-     *            be opened. In particular, this context is required to derive
-     *            the proper current locale configuration in order to open
-     *            appropriate localized manuals, if installed.
-     *
-     * @exception ActivityNotFoundException
-     *                there is no suitable manual installed and all combinations
-     *                of locale scope failed to activate any manual.
-     *
-     * @see #openManual(String, String, Context, String, boolean)
-     */
-	public static void openManual(String manualIdentifier, String topic,
-			Context context) throws ActivityNotFoundException {
-		openManual(manualIdentifier, topic, context, null, false);
-	}
-
-	        /**
-     * Convenience function to open a manual at a specific topic. See
-     * {@link #openManual(String, String, Context, String)} for a detailed
-     * description.
-     *
-     * @param manualIdentifier
-     *            the identifier of the manual to open. This identifier must
-     *            uniquely identify the manual as such, independent of the
-     *            particular locale the manual is intended for.
-     * @param topic
-     *            the topic to open. Please do not use spaces for topic names.
-     *            With respect to the TiddlyWiki infrastructure used for manuals
-     *            the topic needs to the tag of a (single) tiddler. This way
-     *            manuals can be localized (especially their topic titles)
-     *            without breaking an app's knowledge about topics. Some
-     *            standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-     *            {@link #TOPIC_ABOUT_MANUAL}.
-     * @param context
-     *            the context (usually an Activity) from which the manual is to
-     *            be opened. In particular, this context is required to derive
-     *            the proper current locale configuration in order to open
-     *            appropriate localized manuals, if installed.
-     * @param fallbackUri
-     *            either <code>null</code> or a fallback URI to be used in case
-     *            the user has not installed any suitable manual.
-     *
-     * @exception ActivityNotFoundException
-     *                there is no suitable manual installed and all combinations
-     *                of locale scope failed to activate any manual.
-     *
-     * @see #openManual(String, String, Context, String, boolean)
-     */
-	public static void openManual(String manualIdentifier, String topic,
-			Context context, String fallbackUri)
-			throws ActivityNotFoundException {
-		openManual(manualIdentifier, topic, context, fallbackUri, false);
-	}
-
-	/**
-	 * Opens a manual at a specific topic. At least it tries to open a manual.
-	 * As manuals are (usually) installed separately and we use late binding in
-	 * form of implicit intents, a lot of things can go wrong.
-	 *
-	 * We use late binding and the intent architecture in particular as follows:
-	 * first, we use our own URI scheme called "appmanual". Second, we use the
-	 * host field as a unique manual identifier (such as "c-geo" for the app
-	 * manuals for a map which must not be named by the powers that wanna be).
-	 * Third, a localized manual is differentiated as a path with a single
-	 * element in form of (in this precedence) "/lang_country_variant",
-	 * "/lang__variant", "/lang_country", "/lang", or "/". Fourth, the topic to
-	 * open is encoded as the a fragment "#topic=mytopic".
-	 *
-	 * In order to support localization, manuals can register themselves with
-	 * different URIs.
-	 *
-	 * @param manualIdentifier
-	 *            the identifier of the manual to open. This identifier must
-	 *            uniquely identify the manual as such, independent of the
-	 *            particular locale the manual is intended for.
-	 * @param topic
-	 *            the topic to open. Please do not use spaces for topic names.
-	 *            With respect to the TiddlyWiki infrastructure used for manuals
-	 *            the topic needs to the tag of a (single) tiddler. This way
-	 *            manuals can be localized (especially their topic titles)
-	 *            without breaking an app's knowledge about topics. Some
-	 *            standardized topics are predefined, such as
-	 *            {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
-	 *            {@link #TOPIC_ABOUT_MANUAL}.
-	 * @param context
-	 *            the context (usually an Activity) from which the manual is to
-	 *            be opened. In particular, this context is required to derive
-	 *            the proper current locale configuration in order to open
-	 *            appropriate localized manuals, if installed.
-	 * @param fallbackUri
-	 *            either <code>null</code> or a fallback URI to be used in case
-	 *            the user has not installed any suitable manual.
-	 * @param contextAffinity
-	 *            if <code>true</code>, then we try to open the manual within
-	 *            the context, if possible. That is, if the package of the
-	 *            calling context also offers suitable activity registrations,
-	 *            then we will prefer them over any other registrations. If you
-	 *            don't know what this means, then you probably don't need this
-	 *            very special capability and should specify <code>false</code>
-	 *            for this parameter.
-	 *
-	 * @exception ActivityNotFoundException
-	 *                there is no suitable manual installed and all combinations
-	 *                of locale scope failed to activate any manual and no
-	 *                {@literal fallbackUri} was given.
-	 */
-	public static void openManual(String manualIdentifier, String topic,
-            Context context, String fallbackUri, boolean contextAffinity)
-			throws ActivityNotFoundException {
-		//
-		// The path of an "appmanual:" URI consists simply of the locale
-		// information. This allows manual packages to register themselves
-		// for both very specific locales as well as very broad ones.
-		//
-		String localePath = "/"
-				+ context.getResources().getConfiguration().locale.toString();
-		//
-		// We later need this intent in order to try to launch an appropriate
-		// manual (respectively its manual viewer). And yes, we need to set
-		// the intent's category explicitly, even as we will later use
-		// startActivity(): if we don't do this, the proper activity won't be
-		// started albeit the filter almost matches. That dirty behavior (it is
-		// documented wrong) had cost me half a day until I noticed some
-		// informational log entry generated from the ActivityManager. Grrrr!
-		//
-		Intent intent = new Intent(Intent.ACTION_VIEW);
-		int defaultIntentFlags = intent.getFlags();
-		intent.addCategory(Intent.CATEGORY_DEFAULT);
-		//
-		// Try to open the manual in the following order (subject to
-		// availability):
-		// 1. manualIdentifier_lang_country_variant (can also be
-		// manualIdentifier_lang__variant in some cases)
-		// 2. manualIdentifier_lang_country
-		// 3. manualIdentifier_lang
-		// 4. manualIdentifier
-		// Of course, manuals are free to register more than one Intent,
-		// in particular, the should register also the plain manualIdentifier
-		// as a suitable fallback strategy. Even when installing multiple
-		// manuals this doesn't matter, as the user then can choose which
-		// one to use on a single or permanent basis.
-		//
-        while (true) {
-            Uri uri = Uri.parse(URI_SCHEME_APPMANUAL + "://" + manualIdentifier
-					+ localePath + "#topic='" + topic + "'");
-			// Note: we do not use a MIME type for this.
-			intent.setData(uri);
-			intent.setFlags(defaultIntentFlags);
-			if ( contextAffinity ) {
-				//
-				// What is happening here? Well, here we try something that we
-				// would like to call "package affinity activity resolving".
-				// Given an implicit(!) intent we try to figure out whether the
-				// package of the context which is trying to open the manual is
-				// able to resolve the intent. If this is the case, then we
-				// simply turn the implicit intent into an explicit(!) intent.
-				// We do this by setting the concrete module, that is: package
-				// name (eventually the one of the calling context) and class
-				// name within the package.
-				//
-				List<ResolveInfo> capableActivities = context
-						.getPackageManager()
-						.queryIntentActivityOptions(null, null, intent,
-								PackageManager.MATCH_DEFAULT_ONLY);
-				int capables = capableActivities.size();
-				if ( capables > 1 ) {
-					for ( int idx = 0; idx < capables; ++idx ) {
-						ActivityInfo activityInfo = capableActivities.get(idx).activityInfo;
-						if ( activityInfo.packageName.contentEquals(context
-								.getPackageName()) ) {
-							intent.setClassName(activityInfo.packageName,
-									activityInfo.name);
-							//
-							// First match is okay, so we quit searching and
-							// continue with the usual attempt to start the
-							// activity. This should not fail, as we already
-							// found a match; yet the code is very forgiving in
-							// this respect and would just try another round
-							// with "downsized" locale requirements.
-							//
-							break;
-						}
-					}
-				}
-				// FIXME
-				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-			} else {
-				//
-				// No context affinity required, thus we need to set some flags:
-				//
-				// ...NEW_TASK: we want to start the manual reader activity as a
-				// separate
-				// task so that it can be kept open, yet in the background when
-				// returning to the application from which the manual was
-				// opened.
-				//
-				// ...SINGLE_TOP:
-				//
-				// ...RESET_TASK_IF_NEEDED: clear the manual reader activities
-				// down to the root activity. We've set the required
-				// ...CLEAR_WHEN_TASK_RESET above when opening the meta-manual
-				// with the context affinity.
-				//
-				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-						| Intent.FLAG_ACTIVITY_SINGLE_TOP
-						| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-			}
-			try {
-                String logTag = "appmanualclient";
-                if ( Log.isLoggable(logTag, Log.INFO) ) {
-					Log.i(logTag,
-							"Trying to activate manual: uri=" + uri.toString());
-				}
-				context.startActivity(intent);
-				//
-				// We could successfully activate the manual activity, so no
-				// further trials are required.
-				//
-				return;
-			} catch ( ActivityNotFoundException noActivity ) {
-				//
-				// Ensure that we switch back to implicit intent resolving for
-				// the next round.
-				//
-				intent.setComponent(null);
-				//
-				// As long as we still have some locale information, reduce it
-				// and try again a broader locale.
-				//
-				if ( localePath.length() > 1 ) {
-					int underscore = localePath.lastIndexOf('_');
-					if ( underscore > 0 ) {
-						localePath = localePath.substring(0, underscore);
-						//
-						// Handle the case where we have a locale variant, yet
-						// no locale country, thus two underscores in immediate
-						// series. Get rid of both.
-						//
-						if ( localePath.endsWith("_") ) {
-							localePath = localePath
-									.substring(0, underscore - 1);
-						}
-					} else {
-						//
-						// Ready for the last round: try without any locale
-						// modifiers.
-						//
-						localePath = "/";
-					}
-				} else {
-					//
-					// We've tried all combinations, so we've run out of them
-					// and bail out.
-					//
-					break;
-				}
-			}
-			//
-			// Okay, go for the next round, we've updated (or rather trimmed)
-			// the localeIdent, so let us try this.
-			//
-		}
-		//
-		// If we reach this code point then no suitable activity could be found
-		// and activated. In case the caller specified a fallback URI we will
-		// try to open that. As this will activate a suitable browser and this
-		// is an asynchronous activity we won't get back any negative results,
-		// such as 404's. Here we will only see such problems that prevented the
-		// start of a suitable browsing activity.
-		//
-		if ( fallbackUri != null ) {
-			intent = new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUri));
-			intent.addCategory(Intent.CATEGORY_BROWSABLE);
-			context.startActivity(intent);
-		}
-		//
-		// We could not activate any manual and there was no fallback URI to
-		// open, so we finally bail out unsuccessful with an exception.
-		//
-		throw new ActivityNotFoundException();
-	}
-}
-- 
cgit v1.1


From 7b1c980547211e9bc26f3f12e934d128b7da254f Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 9 May 2013 08:17:32 +0200
Subject: refactoring: Lint cleanups

---
 main/lint.xml                                     |  1 +
 main/res/layout/editor.xml                        | 25 -----------------------
 main/res/values-it/strings.xml                    |  2 +-
 main/src/cgeo/geocaching/CacheDetailActivity.java |  2 +-
 main/src/cgeo/geocaching/ui/EditNoteDialog.java   | 13 ++++++++++--
 5 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 main/res/layout/editor.xml

(limited to 'main')

diff --git a/main/lint.xml b/main/lint.xml
index c5b2b18..b165280 100644
--- a/main/lint.xml
+++ b/main/lint.xml
@@ -2,6 +2,7 @@
 <lint>
     <issue id="ContentDescription" severity="ignore" />
     <issue id="ExportedContentProvider" severity="ignore" />
+    <issue id="InvalidPackage" severity="ignore" />
     <issue id="MissingTranslation" severity="ignore" />
     <issue id="Registered" severity="ignore" />
 </lint>
\ No newline at end of file
diff --git a/main/res/layout/editor.xml b/main/res/layout/editor.xml
deleted file mode 100644
index d556836..0000000
--- a/main/res/layout/editor.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linearLayout1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <EditText
-        android:id="@+id/editorEditText"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:inputType="textMultiLine"
-        android:scrollbars="vertical" >
-
-        <requestFocus />
-    </EditText>
-
-    <Button
-        android:id="@+id/editorSave"
-        style="@style/button_full"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/editor_save" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index a36493d..b3af349 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -1005,7 +1005,7 @@
   <string name="attribute_inside_no">Senza aree interne</string>
   <string name="attribute_in_water_yes">In acqua</string>
   <string name="attribute_in_water_no">Non in acqua</string>
-  <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola...)</string>
+  <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola…)</string>
   <string name="attribute_no_gps_no">Con GPS</string>
   <string name="attribute_overnight_yes">Necessario permanere di notte</string>
   <string name="attribute_overnight_no">Permanenza notturna non necessaria</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index fe17c06..b0bee55 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1785,7 +1785,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                                 cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));                            }
                         };
                         final FragmentManager fm = getSupportFragmentManager();
-                        final EditNoteDialog dialog = new EditNoteDialog(cache.getPersonalNote());
+                        final EditNoteDialog dialog = EditNoteDialog.newInstance(cache.getPersonalNote());
                         dialog.show(fm, "fragment_edit_note");
                     }
                 });
diff --git a/main/src/cgeo/geocaching/ui/EditNoteDialog.java b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
index 23e57f2..4d3ab6f 100644
--- a/main/src/cgeo/geocaching/ui/EditNoteDialog.java
+++ b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
@@ -21,6 +21,8 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList
         void onFinishEditNoteDialog(final String inputText);
     }
 
+    public static final String ARGUMENT_INITIAL_NOTE = "initialNote";
+
     private EditText mEditText;
     private String initialNote;
 
@@ -28,8 +30,14 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList
         // Empty constructor required for DialogFragment
     }
 
-    public EditNoteDialog(final String initialNote) {
-        this.initialNote = initialNote;
+    public static EditNoteDialog newInstance(final String initialNote) {
+        EditNoteDialog dialog = new EditNoteDialog();
+
+        Bundle arguments = new Bundle();
+        arguments.putString(EditNoteDialog.ARGUMENT_INITIAL_NOTE, initialNote);
+        dialog.setArguments(arguments);
+
+        return dialog;
     }
 
     @Override
@@ -37,6 +45,7 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList
                              final Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_edit_note, container);
         mEditText = (EditText) view.findViewById(R.id.note);
+        initialNote = getArguments().getString(ARGUMENT_INITIAL_NOTE);
         if (initialNote != null) {
             mEditText.setText(initialNote);
             initialNote = null;
-- 
cgit v1.1


From 4b95081918b795575808a5be62655b82e7ca9750 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 9 May 2013 09:17:00 +0200
Subject: fix #2695: Different log types and order before/after log page
 loading for owned caches

---
 main/src/cgeo/geocaching/Geocache.java           | 24 ++++++++++++++----------
 main/src/cgeo/geocaching/VisitCacheActivity.java | 11 +++++++----
 2 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index fe5de91..2c9ba32 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -486,31 +486,35 @@ public class Geocache implements ICache, IWaypoint {
         final List<LogType> logTypes = new ArrayList<LogType>();
         if (isEventCache()) {
             logTypes.add(LogType.WILL_ATTEND);
-            logTypes.add(LogType.NOTE);
             logTypes.add(LogType.ATTENDED);
-            logTypes.add(LogType.NEEDS_ARCHIVE);
             if (isOwner()) {
                 logTypes.add(LogType.ANNOUNCEMENT);
             }
         } else if (CacheType.WEBCAM == cacheType) {
             logTypes.add(LogType.WEBCAM_PHOTO_TAKEN);
-            logTypes.add(LogType.DIDNT_FIND_IT);
-            logTypes.add(LogType.NOTE);
-            logTypes.add(LogType.NEEDS_ARCHIVE);
-            logTypes.add(LogType.NEEDS_MAINTENANCE);
         } else {
             logTypes.add(LogType.FOUND_IT);
+        }
+        if (!isEventCache()) {
             logTypes.add(LogType.DIDNT_FIND_IT);
-            logTypes.add(LogType.NOTE);
-            logTypes.add(LogType.NEEDS_ARCHIVE);
+        }
+        logTypes.add(LogType.NOTE);
+        if (!isEventCache()) {
             logTypes.add(LogType.NEEDS_MAINTENANCE);
         }
         if (isOwner()) {
             logTypes.add(LogType.OWNER_MAINTENANCE);
-            logTypes.add(LogType.TEMP_DISABLE_LISTING);
-            logTypes.add(LogType.ENABLE_LISTING);
+            if (isDisabled()) {
+                logTypes.add(LogType.ENABLE_LISTING);
+            }
+            else {
+                logTypes.add(LogType.TEMP_DISABLE_LISTING);
+            }
             logTypes.add(LogType.ARCHIVE);
         }
+        if (!isArchived() && !isOwner()) {
+            logTypes.add(LogType.NEEDS_ARCHIVE);
+        }
         return logTypes;
     }
 
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 7c2d1ce..cac0f89 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -636,16 +636,19 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     }
 
     private void selectLogType() {
+        // use a local copy of the possible types, as that one might be modified in the background by the loader
+        final ArrayList<LogType> possible = new ArrayList<LogType>(possibleLogTypes);
+
         Builder alert = new AlertDialog.Builder(this);
-        String[] choices = new String[possibleLogTypes.size()];
+        String[] choices = new String[possible.size()];
         for (int i = 0; i < choices.length; i++) {
-            choices[i] = possibleLogTypes.get(i).getL10n();
+            choices[i] = possible.get(i).getL10n();
         }
-        alert.setSingleChoiceItems(choices, possibleLogTypes.indexOf(typeSelected), new OnClickListener() {
+        alert.setSingleChoiceItems(choices, possible.indexOf(typeSelected), new OnClickListener() {
 
             @Override
             public void onClick(DialogInterface dialog, int position) {
-                setType(possibleLogTypes.get(position));
+                setType(possible.get(position));
                 dialog.dismiss();
             }
         });
-- 
cgit v1.1


From db1dc3825aeb371dc6a7c226a3e47b2bb3ea6116 Mon Sep 17 00:00:00 2001
From: mucek4 <tomaz@gorenc.org>
Date: Thu, 9 May 2013 10:52:50 +0200
Subject: Polish translations

---
 main/res/values-pl/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 1c460a1..ff2fb96 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -126,6 +126,7 @@
   <string name="log_image_camera">Nowy</string>
   <string name="log_image_caption">Podpis</string>
   <string name="log_image_description">Opis</string>
+  <string name="log_image_scale">Skalowanie obrazu</string>
   
   <!-- translation -->
   <string name="translate_to_sys_lang">Przetłumacz na %s</string>
@@ -175,7 +176,7 @@
   <string name="err_missing_device_name">Proszę podać nazwę urządzenia przed zarejestrowaniem.</string>
   <string name="err_favorite_failed">Zmiana statusu skrzynki ulubiona nie powiodła się.</string>
   <string name="err_select_logimage_failed">Nie można wybrać obrazu.</string>
-  <string name="err_aquire_image_failed">NIe można pobrać obrazu.</string>
+  <string name="err_acquire_image_failed">Nie można pobrać obrazu.</string>
 
   <string name="err_tb_display">c:geo nie może pokazać przedmiotów podróżnych. Czy to naprawdę jest przedmiot podróżny?</string>
   <string name="err_tb_details_open">c:geo nie może otworzyć szczegółów przedmiotu podróżnego.</string>
@@ -596,6 +597,8 @@
   <string name="cache_status_disabled">Niedostępna</string>
   <string name="cache_status_premium">Tylko dla użytkowników Premium</string>
   <string name="cache_status_not_premium">Dostępna dla wszystkich użytkowników</string>
+  <string name="cache_status_stored">Zapisano</string>
+  <string name="cache_status_not_stored">Nie zapisano</string>
   <string name="cache_geocode">GC-kod</string>
   <string name="cache_name">Nazwa</string>
   <string name="cache_type">Typ</string>
@@ -991,6 +994,8 @@
   <string name="attribute_swamp_no">Brak bagien lub mokradeł</string>
   <string name="attribute_hills_yes">Pagórki</string>
   <string name="attribute_hills_no">Brak pagórków</string>
+  <string name="attribute_easy_climbing_yes">Łatwa wspinaczka </string>
+  <string name="attribute_easy_climbing_no">Nie jest to łatwa wspinaczka</string>
   <string name="attribute_poi_yes">Ciekawe miejsce</string>
   <string name="attribute_poi_no">Brak ciekawych miejsc</string>
   <string name="attribute_moving_target_yes">Skrzynka moblina</string>
-- 
cgit v1.1


From ac558f3d7e5cc96a1c97d35430a676debbe1ff90 Mon Sep 17 00:00:00 2001
From: campbeb <bpcampbell@gmail.com>
Date: Wed, 8 May 2013 23:59:41 -1000
Subject: Fix #2685 - Don't add images each time log entry is drawn on screen

TextView with images was being added to the view each time the log
entry was drawn. Instead of inflating and adding the TextView, we
now use on that is arleady there and hide it if there are no images.
---
 main/res/layout/trackable_logs_img.xml          | 16 -----------
 main/res/layout/trackable_logs_item.xml         | 16 +++++++++--
 main/src/cgeo/geocaching/TrackableActivity.java | 35 ++++++++++---------------
 3 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 main/res/layout/trackable_logs_img.xml

(limited to 'main')

diff --git a/main/res/layout/trackable_logs_img.xml b/main/res/layout/trackable_logs_img.xml
deleted file mode 100644
index aaed32b..0000000
--- a/main/res/layout/trackable_logs_img.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left|top"
-        android:drawableLeft="?log_img_icon"
-        android:drawablePadding="3dip"
-        android:textColor="?text_color"
-        android:textSize="14dip" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/trackable_logs_item.xml b/main/res/layout/trackable_logs_item.xml
index 52a38a9..65f3e16 100644
--- a/main/res/layout/trackable_logs_item.xml
+++ b/main/res/layout/trackable_logs_item.xml
@@ -20,6 +20,7 @@
         android:textSize="18dip" />
 
     <LinearLayout
+        android:id="@+id/detail_box"
         android:layout_width="102dip"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
@@ -92,7 +93,7 @@
         android:layout_marginLeft="102dip"
         android:orientation="vertical"
         android:padding="3dip"
-        android:textSize="14dip" >
+        android:textSize="14sp" >
 
         <TextView
             android:id="@+id/log"
@@ -104,7 +105,18 @@
             android:gravity="left"
             android:padding="3dip"
             android:textColor="?text_color"
-            android:textSize="14dip" />
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/log_images"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|top"
+            android:layout_marginTop="3dip"
+            android:drawableLeft="?log_img_icon"
+            android:drawablePadding="3dip"
+            android:textColor="?text_color"
+            android:textSize="14sp" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index e5468f3..9b3dbfc 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -390,18 +390,18 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
             private final TextView type;
             private final TextView author;
             private final TextView location;
-            private final TextView log;
+            private final TextView text;
+            private final TextView images;
             private final ImageView marker;
-            private final LinearLayout logImages;
 
             public LogViewHolder(View rowView) {
                 added = ((TextView) rowView.findViewById(R.id.added));
                 type = ((TextView) rowView.findViewById(R.id.type));
                 author = ((TextView) rowView.findViewById(R.id.author));
                 location = ((TextView) rowView.findViewById(R.id.location));
-                log = (TextView) rowView.findViewById(R.id.log);
+                text = (TextView) rowView.findViewById(R.id.log);
+                images = (TextView) rowView.findViewById(R.id.log_images);
                 marker = (ImageView) rowView.findViewById(R.id.log_mark);
-                logImages = (LinearLayout) rowView.findViewById(R.id.log_layout);
             }
         }
 
@@ -432,7 +432,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
             return view;
         }
 
-        protected void fillViewHolder(LogViewHolder holder, LogEntry log) {
+        protected void fillViewHolder(LogViewHolder holder, final LogEntry log) {
             if (log.date > 0) {
                 holder.added.setText(Formatter.formatShortDate(log.date));
             }
@@ -454,7 +454,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
                 });
             }
 
-            TextView logView = holder.log;
+            TextView logView = holder.text;
             logView.setMovementMethod(LinkMovementMethod.getInstance());
 
             String logText = log.log;
@@ -477,25 +477,18 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
                 statusMarker.setVisibility(View.GONE);
             }
 
-            // add LogImages
-            LinearLayout logLayout = holder.logImages;
-
+            // images
             if (log.hasLogImages()) {
-
-                final ArrayList<Image> logImages = new ArrayList<Image>(log.getLogImages());
-
-                final View.OnClickListener listener = new View.OnClickListener() {
+                holder.images.setText(log.getImageTitles());
+                holder.images.setVisibility(View.VISIBLE);
+                holder.images.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        ImagesActivity.startActivityLogImages(TrackableActivity.this, trackable.getGeocode(), logImages);
+                        ImagesActivity.startActivityLogImages(TrackableActivity.this, trackable.getGeocode(), new ArrayList<Image>(log.getLogImages()));
                     }
-                };
-
-                LinearLayout log_imgView = (LinearLayout) getLayoutInflater().inflate(R.layout.trackable_logs_img, null);
-                TextView log_img_title = (TextView) log_imgView.findViewById(R.id.title);
-                log_img_title.setText(log.getImageTitles());
-                log_img_title.setOnClickListener(listener);
-                logLayout.addView(log_imgView);
+                });
+            } else {
+                holder.images.setVisibility(View.GONE);
             }
 
             holder.author.setOnClickListener(new UserActionsListener());
-- 
cgit v1.1


From 0e50b86d2dff50766d2e0414122f971d814592c5 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 9 May 2013 17:47:50 +0200
Subject: refactoring: clean up useful apps activity

---
 main/AndroidManifest.xml                         |   2 +-
 main/res/layout/useful_apps.xml                  |  24 ------
 main/res/layout/useful_apps_activity.xml         |  23 +++++
 main/res/layout/useful_apps_item.xml             |   3 +-
 main/src/cgeo/geocaching/UsefulAppsActivity.java | 102 +++++++++++++++++------
 5 files changed, 101 insertions(+), 53 deletions(-)
 delete mode 100644 main/res/layout/useful_apps.xml
 create mode 100644 main/res/layout/useful_apps_activity.xml

(limited to 'main')

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 3fb5ff1..0c6c4a0 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -69,7 +69,7 @@
 		</activity>
 		<activity
 			android:name=".UsefulAppsActivity"
-			android:label="@string/helper"
+			android:label="@string/helpers"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml
deleted file mode 100644
index 8fd73bf..0000000
--- a/main/res/layout/useful_apps.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar"/>
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:id="@+id/parent"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/useful_apps_activity.xml b/main/res/layout/useful_apps_activity.xml
new file mode 100644
index 0000000..84bcf39
--- /dev/null
+++ b/main/res/layout/useful_apps_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ListView
+        android:id="@+id/apps_list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:cacheColorHint="?background_color"
+        android:divider="?background_color"
+        android:fastScrollEnabled="true"
+        android:footerDividersEnabled="false"
+        android:headerDividersEnabled="false"
+        android:listSelector="?background_color"
+        android:padding="4dip" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/useful_apps_item.xml
index 5c8f6f0..70e7baf 100644
--- a/main/res/layout/useful_apps_item.xml
+++ b/main/res/layout/useful_apps_item.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_marginBottom="10dip"
+    android:descendantFocusability="blocksDescendants"
     android:orientation="vertical" >
 
     <RelativeLayout style="@style/separator_horizontal_layout" >
@@ -43,7 +44,7 @@
             android:textColor="?text_color"
             android:textColorLink="?text_color_link"
             android:textIsSelectable="false"
-            android:textSize="14dip" />
+            android:textSize="14sp" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index b12c5e0..0fddd89 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -1,6 +1,7 @@
 package cgeo.geocaching;
 
 import butterknife.InjectView;
+import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 
@@ -8,49 +9,96 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.TextView;
 
 public class UsefulAppsActivity extends AbstractActivity {
 
-    @InjectView(R.id.parent) protected LinearLayout parentLayout;
+    @InjectView(R.id.apps_list) protected ListView list;
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.useful_apps);
+    protected static class ViewHolder {
+        @InjectView(R.id.title) protected TextView title;
+        @InjectView(R.id.image) protected ImageView image;
+        @InjectView(R.id.description) protected TextView description;
 
-        addApp(R.string.helper_calendar_title, R.string.helper_calendar_description, R.drawable.cgeo, "cgeo.calendar");
-        addApp(R.string.helper_locus_title, R.string.helper_locus_description, R.drawable.helper_locus, "menion.android.locus");
-        addApp(R.string.helper_gpsstatus_title, R.string.helper_gpsstatus_description, R.drawable.helper_gpsstatus, "com.eclipsim.gpsstatus2");
-        addApp(R.string.helper_bluetoothgps_title, R.string.helper_bluetoothgps_description, R.drawable.helper_bluetoothgps, "googoo.android.btgps");
-        addApp(R.string.helper_barcode_title, R.string.helper_barcode_description, R.drawable.helper_barcode, "com.google.zxing.client.android");
+        public ViewHolder(View rowView) {
+            Views.inject(this, rowView);
+        }
     }
 
-    private void installFromMarket(String marketId) {
-        try {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + marketId)));
-        } catch (Exception e) {
-            // market not available in standard emulator
+    private static class HelperApp {
+        private final int titleId;
+        private final int descriptionId;
+        private final int iconId;
+        private final String market;
+
+        public HelperApp(final int title, final int description, final int icon, final String market) {
+            this.titleId = title;
+            this.descriptionId = description;
+            this.iconId = icon;
+            this.market = market;
         }
 
-        finish();
+        private void installFromMarket(UsefulAppsActivity activity) {
+            try {
+                activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + market)));
+            } catch (Exception e) {
+                // market not available in standard emulator
+            }
+
+            activity.finish();
+        }
     }
 
-    private void addApp(final int titleId, final int descriptionId, final int imageId, final String marketUrl) {
-        final View appLayout = getLayoutInflater().inflate(R.layout.useful_apps_item, null);
-        ((TextView) appLayout.findViewById(R.id.title)).setText(res.getString(titleId));
-        ((ImageView) appLayout.findViewById(R.id.image)).setImageDrawable(res.getDrawable(imageId));
-        ((TextView) appLayout.findViewById(R.id.description)).setText(res.getString(descriptionId));
-        appLayout.findViewById(R.id.app_layout).setOnClickListener(new OnClickListener() {
+    private static final HelperApp[] HELPER_APPS = {
+            new HelperApp(R.string.helper_calendar_title, R.string.helper_calendar_description, R.drawable.cgeo, "cgeo.calendar"),
+            new HelperApp(R.string.helper_locus_title, R.string.helper_locus_description, R.drawable.helper_locus, "menion.android.locus"),
+            new HelperApp(R.string.helper_gpsstatus_title, R.string.helper_gpsstatus_description, R.drawable.helper_gpsstatus, "com.eclipsim.gpsstatus2"),
+            new HelperApp(R.string.helper_bluetoothgps_title, R.string.helper_bluetoothgps_description, R.drawable.helper_bluetoothgps, "googoo.android.btgps"),
+            new HelperApp(R.string.helper_barcode_title, R.string.helper_barcode_description, R.drawable.helper_barcode, "com.google.zxing.client.android"),
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState, R.layout.useful_apps_activity);
+
+        Views.inject(this);
 
+        list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.useful_apps_item, HELPER_APPS) {
             @Override
-            public void onClick(View v) {
-                installFromMarket(marketUrl);
+            public View getView(int position, View convertView, android.view.ViewGroup parent) {
+                View rowView = convertView;
+                if (null == rowView) {
+                    rowView = getLayoutInflater().inflate(R.layout.useful_apps_item, null);
+                }
+                ViewHolder holder = (ViewHolder) rowView.getTag();
+                if (null == holder) {
+                    holder = new ViewHolder(rowView);
+                    rowView.setTag(holder);
+                }
+
+                final HelperApp app = getItem(position);
+                fillViewHolder(holder, app);
+                return rowView;
+            }
+
+            private void fillViewHolder(ViewHolder holder, HelperApp app) {
+                holder.title.setText(res.getString(app.titleId));
+                holder.image.setImageDrawable(res.getDrawable(app.iconId));
+                holder.description.setText(res.getString(app.descriptionId));
             }
         });
-        parentLayout.addView(appLayout);
-    }
 
+        list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                HelperApp helperApp = HELPER_APPS[position];
+                helperApp.installFromMarket(UsefulAppsActivity.this);
+            }
+        });
+    }
 }
-- 
cgit v1.1


From 6d40d9be96794577a829cc3b703553b0241b97ed Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 9 May 2013 18:15:42 +0200
Subject: refactoring: code cleanup

---
 main/src/cgeo/geocaching/EditWaypointActivity.java | 10 ------
 .../cgeo/geocaching/NavigateAnyPointActivity.java  | 39 ++++++++--------------
 2 files changed, 13 insertions(+), 36 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index f4b3d09..0a1d22d 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -216,16 +216,6 @@ public class EditWaypointActivity extends AbstractActivity {
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-
-    @Override
     public void onPause() {
         geoDirHandler.stopGeo();
         super.onPause();
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index fbd2f1b..3216173 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -52,21 +52,18 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
         @Override
         public View getView(final int position, final View convertView, final ViewGroup parent) {
-
-            Destination loc = getItem(position);
-
-            View v = convertView;
-
-            if (v == null) {
-                v = getInflater().inflate(R.layout.simple_way_point,
+            View rowView = convertView;
+            if (rowView == null) {
+                rowView = getInflater().inflate(R.layout.simple_way_point,
                         null);
             }
-            TextView longitude = (TextView) v
+            TextView longitude = (TextView) rowView
                     .findViewById(R.id.simple_way_point_longitude);
-            TextView latitude = (TextView) v
+            TextView latitude = (TextView) rowView
                     .findViewById(R.id.simple_way_point_latitude);
-            TextView date = (TextView) v.findViewById(R.id.date);
+            TextView date = (TextView) rowView.findViewById(R.id.date);
 
+            Destination loc = getItem(position);
             String lonString = loc.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE);
             String latString = loc.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE);
 
@@ -74,7 +71,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
             latitude.setText(latString);
             date.setText(Formatter.formatShortDateTime(getContext(), loc.getDate()));
 
-            return v;
+            return rowView;
         }
 
         private LayoutInflater getInflater() {
@@ -90,7 +87,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     private Button lonButton = null;
     private boolean changed = false;
     private List<Destination> historyOfSearchedLocations;
-    private DestinationHistoryAdapter destionationHistoryAdapter;
+    private DestinationHistoryAdapter destinationHistoryAdapter;
     private ListView historyListView;
     private TextView historyFooter;
 
@@ -100,7 +97,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     private int contextMenuItemPosition;
 
-    String distanceUnit = "";
+    private String distanceUnit = "";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -190,11 +187,11 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     }
 
     private DestinationHistoryAdapter getDestionationHistoryAdapter() {
-        if (destionationHistoryAdapter == null) {
-            destionationHistoryAdapter = new DestinationHistoryAdapter(this,
+        if (destinationHistoryAdapter == null) {
+            destinationHistoryAdapter = new DestinationHistoryAdapter(this,
                     getHistoryOfSearchedLocations());
         }
-        return destionationHistoryAdapter;
+        return destinationHistoryAdapter;
     }
 
     private List<Destination> getHistoryOfSearchedLocations() {
@@ -221,16 +218,6 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-
-    @Override
     public void onPause() {
         geoDirHandler.stopGeo();
         super.onPause();
-- 
cgit v1.1


From ab6f4537d74b228ca2620abba571f5ae8bb71706 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Fri, 10 May 2013 09:04:32 +0200
Subject: refactoring: view holder

---
 .../cgeo/geocaching/NavigateAnyPointActivity.java  | 51 ++++++++++++++--------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index 3216173..b82e962 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -1,5 +1,8 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+import butterknife.Views;
+
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.DistanceParser;
@@ -42,6 +45,17 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     private static final int MENU_CACHES_AROUND = 5;
     private static final int MENU_CLEAR_HISTORY = 6;
 
+    protected static class ViewHolder {
+        @InjectView(R.id.simple_way_point_longitude) protected TextView longitude;
+        @InjectView(R.id.simple_way_point_latitude) protected TextView latitude;
+        @InjectView(R.id.date) protected TextView date;
+
+        public ViewHolder(View rowView) {
+            Views.inject(this, rowView);
+            rowView.setTag(this);
+        }
+    }
+
     private static class DestinationHistoryAdapter extends ArrayAdapter<Destination> {
         private LayoutInflater inflater = null;
 
@@ -53,25 +67,28 @@ public class NavigateAnyPointActivity extends AbstractActivity {
         @Override
         public View getView(final int position, final View convertView, final ViewGroup parent) {
             View rowView = convertView;
+
+            ViewHolder viewHolder;
             if (rowView == null) {
-                rowView = getInflater().inflate(R.layout.simple_way_point,
-                        null);
+                rowView = getInflater().inflate(R.layout.simple_way_point, null);
+                viewHolder = new ViewHolder(rowView);
+            }
+            else {
+                viewHolder = (ViewHolder) rowView.getTag();
             }
-            TextView longitude = (TextView) rowView
-                    .findViewById(R.id.simple_way_point_longitude);
-            TextView latitude = (TextView) rowView
-                    .findViewById(R.id.simple_way_point_latitude);
-            TextView date = (TextView) rowView.findViewById(R.id.date);
 
-            Destination loc = getItem(position);
+            fillViewHolder(viewHolder, getItem(position));
+
+            return rowView;
+        }
+
+        private void fillViewHolder(ViewHolder viewHolder, Destination loc) {
             String lonString = loc.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE);
             String latString = loc.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE);
 
-            longitude.setText(lonString);
-            latitude.setText(latString);
-            date.setText(Formatter.formatShortDateTime(getContext(), loc.getDate()));
-
-            return rowView;
+            viewHolder.longitude.setText(lonString);
+            viewHolder.latitude.setText(latString);
+            viewHolder.date.setText(Formatter.formatShortDateTime(getContext(), loc.getDate()));
         }
 
         private LayoutInflater getInflater() {
@@ -135,7 +152,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
         historyListView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
             @Override
             public void onCreateContextMenu(ContextMenu menu, View v,
-                                            ContextMenuInfo menuInfo) {
+                    ContextMenuInfo menuInfo) {
                 menu.add(Menu.NONE, CONTEXT_MENU_NAVIGATE, Menu.NONE, res.getString(R.string.cache_menu_navigate));
                 menu.add(Menu.NONE, CONTEXT_MENU_EDIT_WAYPOINT, Menu.NONE, R.string.waypoint_edit);
                 menu.add(Menu.NONE, CONTEXT_MENU_DELETE_WAYPOINT, Menu.NONE, R.string.waypoint_delete);
@@ -179,8 +196,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     private TextView getEmptyHistoryFooter() {
         if (historyFooter == null) {
-            historyFooter = (TextView) getLayoutInflater().inflate(
-                    R.layout.caches_footer, null);
+            historyFooter = (TextView) getLayoutInflater().inflate(R.layout.caches_footer, null);
             historyFooter.setText(R.string.search_history_empty);
         }
         return historyFooter;
@@ -188,8 +204,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     private DestinationHistoryAdapter getDestionationHistoryAdapter() {
         if (destinationHistoryAdapter == null) {
-            destinationHistoryAdapter = new DestinationHistoryAdapter(this,
-                    getHistoryOfSearchedLocations());
+            destinationHistoryAdapter = new DestinationHistoryAdapter(this, getHistoryOfSearchedLocations());
         }
         return destinationHistoryAdapter;
     }
-- 
cgit v1.1