show static maps for cache after download dialog

1 files changed, 39 insertions, 30 deletions

diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index 0cbf01e..4f51d34 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -51,44 +51,53 @@ 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());
             }
         }
-    };
 
-    DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-            switch (which) {
-                case DialogInterface.BUTTON_POSITIVE:
-                    downloadStaticMaps();
-                    break;
-
-                case DialogInterface.BUTTON_NEGATIVE:
-                    showToast(res.getString(R.string.err_detail_not_load_map_static));
-                    break;
+        /**
+         * 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);
+                }
             }
-            finish();
         }
+
+        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+                switch (which) {
+                    case DialogInterface.BUTTON_POSITIVE:
+                        downloadStaticMaps();
+                        showStaticMaps();
+                        return;
+
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        showToast(res.getString(R.string.err_detail_not_load_map_static));
+                        break;
+                }
+                finish();
+            }
+        };
+
     };
 
     @Override