Display static map if it is stored

Even if the user does not want to store new static maps previews, if one
has been stored already it should be displayed.

1 files changed, 5 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 3fe37c4..e031e93 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -936,9 +936,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_details_page, null);
 
             // Start loading preview map
-            if (Settings.isStoreOfflineMaps()) {
-                new PreviewMapTask().execute((Void) null);
-            }
+            new PreviewMapTask().execute((Void) null);
 
             detailsList = (LinearLayout) view.findViewById(R.id.details_list);
             final CacheDetailsCreator details = new CacheDetailsCreator(CacheDetailActivity.this, detailsList);
@@ -1434,14 +1432,13 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     Bitmap image = decode(cache);
 
                     if (image == null) {
-                        StaticMapsProvider.storeCachePreviewMap(cache);
-                        image = decode(cache);
-                        if (image == null) {
-                            return null;
+                        if (Settings.isStoreOfflineMaps()) {
+                            StaticMapsProvider.storeCachePreviewMap(cache);
+                            image = decode(cache);
                         }
                     }
 
-                    return ImageUtils.scaleBitmapToFitDisplay(image);
+                    return image != null ? ImageUtils.scaleBitmapToFitDisplay(image) : null;
                 } catch (final Exception e) {
                     Log.w("CacheDetailActivity.PreviewMapTask", e);
                     return null;