Merge pull request #1492 from marco-jacob/issue#1465

Fix for Issue#1465

2 files changed, 34 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index 0cbf01e..a8495ee 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -51,22 +51,7 @@ public class StaticMapsActivity extends AbstractActivity {
                         finish();
                     }
                 } else {
-                    if (inflater == null) {
-                        inflater = getLayoutInflater();
-                    }
-
-                    if (smapsView == null) {
-                        smapsView = (LinearLayout) findViewById(R.id.maps_list);
-                    }
-                    smapsView.removeAllViews();
-
-                    for (final Bitmap image : maps) {
-                        if (image != null) {
-                            final ImageView map = (ImageView) inflater.inflate(R.layout.map_static_item, null);
-                            map.setImageBitmap(image);
-                            smapsView.addView(map);
-                        }
-                    }
+                    showStaticMaps();
                 }
             } catch (Exception e) {
                 Log.e("StaticMapsActivity.loadMapsHandler: " + e.toString());
@@ -81,6 +66,7 @@ public class StaticMapsActivity extends AbstractActivity {
             switch (which) {
                 case DialogInterface.BUTTON_POSITIVE:
                     downloadStaticMaps();
+                    startActivity(StaticMapsActivity.this.getIntent());
                     break;
 
                 case DialogInterface.BUTTON_NEGATIVE:
@@ -91,6 +77,28 @@ public class StaticMapsActivity extends AbstractActivity {
         }
     };
 
+    /**
+     * Shows the static maps.
+     */
+    private void showStaticMaps() {
+        if (inflater == null) {
+            inflater = getLayoutInflater();
+        }
+
+        if (smapsView == null) {
+            smapsView = (LinearLayout) findViewById(R.id.maps_list);
+        }
+        smapsView.removeAllViews();
+
+        for (final Bitmap image : maps) {
+            if (image != null) {
+                final ImageView map = (ImageView) inflater.inflate(R.layout.map_static_item, null);
+                map.setImageBitmap(image);
+                smapsView.addView(map);
+            }
+        }
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 691516f..fa5c32f 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -181,6 +181,16 @@ public class StaticMapsProvider {
         return MARKERS_URL + "marker_waypoint_" + type + ".png";
     }
 
+    public static void removeCacheStaticMaps(String geocode) {
+        for (int level = 1; level <= 5; level++) {
+            try {
+                StaticMapsProvider.getMapFile(geocode, "", level, false).delete();
+            } catch (Exception e) {
+                Log.e("StaticMapsProvider.removeCacheStaticMaps: " + e.toString());
+            }
+        }
+    }
+
     public static void removeWpStaticMaps(int wp_id, String geocode) {
         for (int level = 1; level <= 5; level++) {
             try {