Merge branch 'master' of https://Bananeweizen@github.com/cgeo/c-geo-opensource.git

5 files changed, 12 insertions, 9 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index a4307a9..dea143c 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		android:versionName="30.10.2011"
-		android:versionCode="20111030"
+		android:versionName="31.10.2011"
+		android:versionCode="20111031"
 		package="cgeo.geocaching"
 		name="c:geo"
 		android:installLocation="auto">
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 57e954d..007825b 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -932,6 +932,9 @@
   <string name="changelog">\n
     <b>New release</b>\n
     \n\n
+    <b>31.10.2011</b>\n
+    · fix: Store for offline from Live map\n
+    \n\n
     <b>30.10.2011</b>\n
     · new: cleanup the cgeo private cache directory when caches are removed from database\n
     · new: display user avatar when checking login/password from geocaching.com\n
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 0437a6a..053119f 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -710,7 +710,7 @@ public class cgBase {
                     final Matcher matcherDirection = patternDirection.matcher(row);
                     while (matcherDirection.find()) {
                         if (matcherDirection.groupCount() > 0) {
-                            cache.setDirectionImg(matcherDirection.group(1));
+                            cache.setDirectionImg(URLDecoder.decode(matcherDirection.group(1)));
                         }
                     }
                 } catch (Exception e) {
diff --git a/main/src/cgeo/geocaching/cgDirectionImg.java b/main/src/cgeo/geocaching/cgDirectionImg.java
index 9c26b41..964af5d 100644
--- a/main/src/cgeo/geocaching/cgDirectionImg.java
+++ b/main/src/cgeo/geocaching/cgDirectionImg.java
@@ -9,7 +9,7 @@ import java.io.File;
 
 public class cgDirectionImg {
 
-    public static void getDrawable(String geocode, String code) {
+    public static void getDrawable(final String geocode, final String code) {
         if (StringUtils.isBlank(geocode) || StringUtils.isBlank(code)) {
             return;
         }
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 4e996e3..59aa002 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -94,7 +94,7 @@ public class HtmlImage implements Html.ImageGetter {
                         bufferedEntity = new BufferedHttpEntity(httpResponse.getEntity());
                     }
                 } catch (Exception e) {
-                    Log.e(Settings.tag, "cgHtmlImg.getDrawable (downloading from web)", e);
+                    Log.e(Settings.tag, "HtmlImage.getDrawable (downloading from web)", e);
                 }
             }
 
@@ -115,7 +115,7 @@ public class HtmlImage implements Html.ImageGetter {
 
         // get image and return
         if (imagePre == null) {
-            Log.d(Settings.tag, "cgHtmlImg.getDrawable: Failed to obtain image");
+            Log.d(Settings.tag, "HtmlImage.getDrawable: Failed to obtain image");
 
             if (returnErrorImage) {
                 imagePre = BitmapFactory.decodeResource(context.getResources(), R.drawable.image_not_loaded);
@@ -138,7 +138,7 @@ public class HtmlImage implements Html.ImageGetter {
             try {
                 imagePre = Bitmap.createScaledBitmap(imagePre, width, height, true);
             } catch (Exception e) {
-                Log.d(Settings.tag, "cgHtmlImg.getDrawable: Failed to scale image");
+                Log.d(Settings.tag, "HtmlImage.getDrawable: Failed to scale image");
                 return null;
             }
         } else {
@@ -162,7 +162,7 @@ public class HtmlImage implements Html.ImageGetter {
             final File fileSec = LocalStorage.getStorageSecFile(geocode, url, true);
             return loadCachedImage(fileSec);
         } catch (Exception e) {
-            Log.w(Settings.tag, "cgHtmlImg.getDrawable (reading cache): " + e.toString());
+            Log.w(Settings.tag, "HtmlImage.getDrawable (reading cache): " + e.toString());
         }
         return null;
     }
@@ -180,7 +180,7 @@ public class HtmlImage implements Html.ImageGetter {
                 }
             }
         } catch (Exception e) {
-            Log.e(Settings.tag, "cgHtmlImg.makeAbsoluteURL (parse URL)", e);
+            Log.e(Settings.tag, "HtmlImage.makeAbsoluteURL (parse URL)", e);
         }
         return null;
     }