15 files changed, 14 insertions, 19 deletions
diff --git a/main/proguard.cfg b/main/proguard.cfg
index d0e7fc1..ee4d81a 100644
--- a/main/proguard.cfg
+++ b/main/proguard.cfg
@@ -10,7 +10,8 @@
 -dontwarn org.apache.log4j.**
 -dontwarn org.apache.commons.logging.**
 -dontwarn ch.boye.httpclientandroidlib.impl.auth.NegotiateScheme
--dontwarn android.net.http.AndroidHttpClient
+
+-dontnote org.apache.commons.logging.**
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
@@ -23,6 +24,8 @@
 -keep class ch.boye.httpclientandroidlib.params.HttpParams { *; }
 -keep class ch.boye.httpclientandroidlib.client.HttpClient { *; }
 
+-dontnote ch.boye.httpclientandroidlib.**
+
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index bb14ca9..cb453e3 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -22,7 +22,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:footerDividersEnabled="false"
-        android:headerDividersEnabled="false" >
+        android:headerDividersEnabled="false"
+    	android:cacheColorHint="?background_color" >
     </ListView>
 
 </LinearLayout>
 \ No newline at end of file
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index 8a6f370..ec6864f 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -284,7 +284,6 @@
 
   <!-- next things -->
   <string name="legal_note">For at benytte Geocaching.com, skal betingelserne i <a href="http://www.geocaching.com/about/termsofuse.aspx">"Groundspeak disclaimer"</a> accepteres.</string>
-  <string name="author">Udviklet af: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Support: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Hjemmeside: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 86e11c2..9441383 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -285,6 +285,7 @@
   <string name="caches_sort_date">Datum</string>
   <string name="caches_sort_finds">Funde</string>
   <string name="caches_sort_state">Status</string>
+  <string name="caches_sort_storage">Speicherdatum</string>
   <string name="caches_select_mode">Auswahlmodus</string>
   <string name="caches_select_mode_exit">Auswahlmodus beenden</string>
   <string name="caches_select_invert">Auswahl invertieren</string>
@@ -929,7 +930,6 @@
   <!-- next things -->
   <string name="legal_note">Um die Dienste von Geocaching.com nutzen zu können, müssen die <a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak-Nutzungsbedingungen</a> (englisch) akzeptiert werden.</string>
   <string name="quote">Um Geocachen einfacher zu machen, um es Anwendern bequemer zu machen.</string>
-  <string name="author">Autor: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Support: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Webseite: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 96c44b0..bc68aeb 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -783,7 +783,6 @@
   <string name="legal_note">Para utilizar los servicios de Geocaching.com, debes aceptar las <a href="http://www.geocaching.com/about/termsofuse.aspx">condiciones de Groundspeak</a>.</string>
   <string name="quote">Para hacer el geocaching más sencillo, para hacer a los usuarios más vagos.</string>
 
-  <string name="author">Autor: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Soporte: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Web: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 81a81d1..a298d15 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -803,7 +803,6 @@
   <string name="legal_note">A geocaching.com szolgáltatásainak használatához, el kell fogadnod ezeket a feltételeket:<a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak disclaimer</a> </string>
   <string name="quote">Hogy a geocaching könyebb legyen a felhasználók pedig lustábbak.</string>
   <string name="powered_by">carnero</string>
-  <string name="author">Készítő: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Támogatás: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Weboldal: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 8ad52f1..b394f93 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -936,7 +936,6 @@
   <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>
   <string name="quote">Per rendere il geocaching più facile e rendere gli utenti più pigri.</string>
   <string name="powered_by">carnero</string>
-  <string name="author">Autore: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Supporto: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Sito: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">pagina c:geo </a></string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index e6279bd..f158810 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -404,7 +404,6 @@
 
   <!-- next things -->
   <string name="legal_note">For å bruke tjenestene til Geocaching.com, må brukeren samtykke i vilkårene og betingelsene til <a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak\'s ansvarsfraskrivelse</a></string>
-  <string name="author">utvikler: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">e-post adresse: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">web-side: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index aa07064..fc576ab 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -893,7 +893,6 @@
   <string name="legal_note">Voor het gebruik van de diensten van Geocaching.com, dient akkoord te worden gegaan met de <a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak voorwaarden</a>.</string>
   <string name="quote">Om geocahing makkelijker te maken en gebruikers luier te maken.</string>
   <string name="powered_by">carnero</string>
-  <string name="author">auteur: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">support:<a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">website: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index e9d0ffe..9c91fba 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -780,7 +780,6 @@
 
   <!-- next things -->
   <string name="legal_note">Aby móc korzystać z usług serwisu Geocaching.com <a href="http://www.geocaching.com/about/termsofuse.aspx">warunki korzystania Groundspeak</a> muszą być potwierdzone.</string>
-  <string name="author">Autor: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Support: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Website: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo strona</a></string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 5a95c04..2262d70 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -877,7 +877,6 @@
   <string name="legal_note">Para utilizar os serviços de Geocaching.com, tem de concordar com os termos e condições da <a href="http://www.geocaching.com/about/termsofuse.aspx">declaração Groundspeak</a>.</string>
   <string name="quote">Para tornar o geocaching mais fácil, para tornar os utilizadores mais preguiçosos.</string>
   <string name="powered_by">carnero</string>
-  <string name="author">Autor: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Suporte: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Site na internet: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">página do c:geo</a></string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 33a5610..8bdd184 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -912,7 +912,6 @@
   <string name="legal_note">Pred používaním služieb serveru Geocaching.com je potrebné súhlasiť s <a href="http://www.geocaching.com/about/disclaimer.aspx">licenčnou dohodou Groundspeaku</a>.</string>
   <string name="quote">Pre jednoduchšie hľadanie skrýš a používateľov lenivších.</string>
   <string name="powered_by">carnero</string>
-  <string name="author">Autor: <a href="http://carnero.cc/">carnero</a></string>
   <string name="support">Podpora: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
   <string name="website">Web: <a href="http://cgeo.org/">cgeo.org</a></string>
   <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index be3abbb..23de2b1 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -43,7 +43,7 @@ public final class GCConstants {
     public final static Pattern PATTERN_OWNER = Pattern.compile("<div id=\"ctl00_ContentBody_mcd1\">[^<]+<a href=\"[^\"]+\">([^<]+)</a></div>");
     public final static Pattern PATTERN_TYPE = Pattern.compile("<img src=\"[^\"]*/WptTypes/\\d+\\.gif\" alt=\"([^\"]+?)\" title=\"[^\"]+\" width=\"32\" height=\"32\"");
     public final static Pattern PATTERN_HIDDEN = Pattern.compile("<div id=\"ctl00_ContentBody_mcd2\">\\W*Hidden[\\s:]*([^<]+?)</div>");
-    public final static Pattern PATTERN_HIDDENEVENT = Pattern.compile("Event\\s*Date\\s*:\\s*([^<]+)</span>", Pattern.DOTALL);
+    public final static Pattern PATTERN_HIDDENEVENT = Pattern.compile("Event\\s*Date\\s*:\\s*([^<]+)<div id=\"calLinks\">", Pattern.DOTALL);
     public final static Pattern PATTERN_FAVORITE = Pattern.compile("<div id=\"pnlFavoriteCache\">"); // without 'class="hideMe"' inside the tag !
     public final static Pattern PATTERN_FAVORITECOUNT = Pattern.compile("<a id=\"uxFavContainerLink\"[^>]+>[^<]*<div[^<]*<span class=\"favorite-value\">\\D*([0-9]+?)</span>");
     public final static Pattern PATTERN_COUNTLOGS = Pattern.compile("<span id=\"ctl00_ContentBody_lblFindCounts\"><p(.+?)</p></span>");
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 5707293..40724f5 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -406,10 +406,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
         // initialize overlays
         mapView.clearOverlays();
 
-        if (overlayPosition == null) {
-            overlayPosition = mapView.createAddPositionOverlay(activity);
-        }
-
         if (Settings.isPublicLoc() && overlayGo4Cache == null) {
             overlayGo4Cache = mapView.createAddUsersOverlay(activity, getResources().getDrawable(R.drawable.user_location));
         }
@@ -418,6 +414,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
             overlayCaches = mapView.createAddMapOverlay(mapView.getContext(), getResources().getDrawable(R.drawable.marker));
         }
 
+        if (overlayPosition == null) {
+            overlayPosition = mapView.createAddPositionOverlay(activity);
+        }
+
         if (overlayScale == null) {
             overlayScale = mapView.createAddScaleOverlay(activity);
         }
diff --git a/main/src/cgeo/geocaching/maps/CachesOverlay.java b/main/src/cgeo/geocaching/maps/CachesOverlay.java
index 8c7aff7..b656900 100644
--- a/main/src/cgeo/geocaching/maps/CachesOverlay.java
+++ b/main/src/cgeo/geocaching/maps/CachesOverlay.java
@@ -288,15 +288,15 @@ public class CachesOverlay extends AbstractItemizedOverlay {
         }
 
         public boolean requestRequired() {
-            return CacheType.UNKNOWN == cache.getType() || !cache.isReliableLatLon() || !cache.isOffline();
+            return CacheType.UNKNOWN == cache.getType() || cache.getDifficulty() == 0;
         }
 
         @Override
         public void run() {
             if (requestRequired()) {
                 /* final SearchResult search = */GCMap.searchByGeocodes(Collections.singleton(cache.getGeocode()));
-                CGeoMap.markCacheAsDirty(cache.getGeocode());
             }
+            CGeoMap.markCacheAsDirty(cache.getGeocode());
             CachePopup.startActivity(context, cache.getGeocode());
             progress.dismiss();
         }