1 files changed, 6 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index fb78360..750d5e0 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -5,7 +5,7 @@ import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;

 import cgeo.geocaching.StaticMapsProvider;

 import cgeo.geocaching.cgCache;

-import cgeo.geocaching.cgeoapplication;

+import cgeo.geocaching.cgData;

 import cgeo.geocaching.activity.IAbstractActivity;

 import cgeo.geocaching.activity.Progress;

 import cgeo.geocaching.enumerations.LoadFlags;

@@ -124,7 +124,7 @@ public class GPXImporter {
         final Handler importStepHandler;

         final CancellableHandler progressHandler;

 

-        public ImportThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

+        protected ImportThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

             this.listId = listId;

             this.importStepHandler = importStepHandler;

             this.progressHandler = progressHandler;

@@ -132,10 +132,9 @@ public class GPXImporter {
 

         @Override

         public void run() {

-            final Collection<cgCache> caches;

             try {

                 importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_START));

-                caches = doImport();

+                final Collection<cgCache> caches = doImport();

                 Log.i("Imported successfully " + caches.size() + " caches.");

 

                 final SearchResult search = new SearchResult();

@@ -171,10 +170,9 @@ public class GPXImporter {
         protected abstract Collection<cgCache> doImport() throws IOException, ParserException;

 

         private boolean importStaticMaps(final SearchResult importedCaches) {

-            final cgeoapplication app = cgeoapplication.getInstance();

             int storedCacheMaps = 0;

             for (String geocode : importedCaches.getGeocodes()) {

-                cgCache cache = app.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);

+                cgCache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);

                 Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);

                 StaticMapsProvider.downloadMaps(cache);

                 storedCacheMaps++;

@@ -206,7 +204,7 @@ public class GPXImporter {
 

     static abstract class ImportGpxThread extends ImportThread {

 

-        public ImportGpxThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

+        protected ImportGpxThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

             super(listId, importStepHandler, progressHandler);

         }

 

@@ -276,7 +274,7 @@ public class GPXImporter {
 

     static abstract class ImportGpxZipThread extends ImportGpxThread {

 

-        public ImportGpxZipThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

+        protected ImportGpxZipThread(int listId, Handler importStepHandler, CancellableHandler progressHandler) {

             super(listId, importStepHandler, progressHandler);

         }