Fix Refactoring to use Loaders fixes #2570

3 files changed, 19 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index d260a2d..5bce5e0 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1467,10 +1467,13 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         showFooterLoadingCaches();
         cgData.moveToList(adapter.getCheckedCaches(), listId);
 
-        currentLoader = (AbstractSearchLoader) getSupportLoaderManager().initLoader(CacheListType.OFFLINE.ordinal(), new Bundle(), this);
+        currentLoader = (OfflineGeocacheListLoader) getSupportLoaderManager().initLoader(CacheListType.OFFLINE.ordinal(), new Bundle(), this);
         currentLoader.reset();
+        ((OfflineGeocacheListLoader) currentLoader).setListId(listId);
+        ((OfflineGeocacheListLoader) currentLoader).setSearchCenter(coords);
         currentLoader.startLoading();
 
+
         invalidateOptionsMenuCompatible();
     }
 
diff --git a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
index 4214db9..6cafd96 100644
--- a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
+++ b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
@@ -106,4 +106,9 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
     }
 
 
+    @Override
+    public void reset() {
+        super.reset();
+        search = null;
+    }
 }
diff --git a/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java
index ef1029b..0081aa1 100644
--- a/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java
@@ -9,8 +9,8 @@ import android.content.Context;
 
 public class OfflineGeocacheListLoader extends AbstractSearchLoader {
 
-    private final int listId;
-    private final Geopoint searchCenter;
+    private int listId;
+    private Geopoint searchCenter;
 
     public OfflineGeocacheListLoader(Context context, Geopoint searchCenter, int listId) {
         super(context);
@@ -23,4 +23,12 @@ public class OfflineGeocacheListLoader extends AbstractSearchLoader {
         return cgData.getBatchOfStoredCaches(searchCenter, Settings.getCacheType(), listId);
     }
 
+    public void setListId(int listId) {
+        this.listId = listId;
+    }
+
+    public void setSearchCenter(Geopoint searchCenter) {
+        this.searchCenter = searchCenter;
+    }
+
 }