1 files changed, 5 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index 05a18f2..a15aa73 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -10,7 +10,6 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -36,7 +35,6 @@ public class StaticMapsActivity extends AbstractActivity {
     private LayoutInflater inflater = null;
     private ProgressDialog waitDialog = null;
     private LinearLayout smapsView = null;
-    private BitmapFactory factory = null;
     private final Handler loadMapsHandler = new Handler() {
 
         @Override
@@ -131,10 +129,6 @@ public class StaticMapsActivity extends AbstractActivity {
         @Override
         public void run() {
             try {
-                if (factory == null) {
-                    factory = new BitmapFactory();
-                }
-
                 // try downloading 2 times
                 for (int trials = 0; trials < 2; trials++) {
                     for (int level = 1; level <= 5; level++) {
@@ -183,23 +177,23 @@ public class StaticMapsActivity extends AbstractActivity {
     }
 
     private boolean downloadStaticMaps() {
-        final cgCache cache = app.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
+        final cgCache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
         if (waypoint_id == null) {
             showToast(res.getString(R.string.info_storing_static_maps));
-            StaticMapsProvider.storeCacheStaticMap(cache, this, true);
+            StaticMapsProvider.storeCacheStaticMap(cache, true);
             return cache.hasStaticMap();
         }
-        final cgWaypoint waypoint = cache.getWaypointById(waypoint_id);
+        final Waypoint waypoint = cache.getWaypointById(waypoint_id);
         if (waypoint != null) {
             showToast(res.getString(R.string.info_storing_static_maps));
-            StaticMapsProvider.storeWaypointStaticMap(cache, this, waypoint, true);
+            StaticMapsProvider.storeWaypointStaticMap(cache, waypoint, true);
             return StaticMapsProvider.hasStaticMapForWaypoint(geocode, waypoint_id);
         }
         showToast(res.getString(R.string.err_detail_not_load_map_static));
         return false;
     }
 
-    public static void startActivity(final Context activity, final String geocode, final boolean download, final cgWaypoint waypoint) {
+    public static void startActivity(final Context activity, final String geocode, final boolean download, final Waypoint waypoint) {
         final Intent intent = new Intent(activity, StaticMapsActivity.class);
         // if resuming our app within this activity, finish it and return to the cache activity
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);