fix #4296: RemoveHistoryLoader seems not necessary

3 files changed, 8 insertions, 43 deletions

diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 349c9e1..716f100 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -36,7 +36,6 @@ import cgeo.geocaching.loaders.NextPageGeocacheListLoader;
 import cgeo.geocaching.loaders.OfflineGeocacheListLoader;
 import cgeo.geocaching.loaders.OwnerGeocacheListLoader;
 import cgeo.geocaching.loaders.PocketGeocacheListLoader;
-import cgeo.geocaching.loaders.RemoveFromHistoryLoader;
 import cgeo.geocaching.maps.CGeoMap;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.network.Network;
@@ -1140,9 +1139,8 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
         for (int i = 0; i < geocodes.length; i++) {
             geocodes[i] = caches.get(i).getGeocode();
         }
-        final Bundle b = new Bundle();
-        b.putStringArray(Intents.EXTRA_CACHELIST, geocodes);
-        getSupportLoaderManager().initLoader(CacheListLoaderType.REMOVE_FROM_HISTORY.getLoaderId(), b, this);
+        DataStore.clearVisitDate(geocodes);
+        refreshCurrentList();
     }
 
     private void importWeb() {
@@ -1657,10 +1655,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
                 replaceCacheListFromSearch();
                 loadCachesHandler.sendMessage(Message.obtain());
                 break;
-            case REMOVE_FROM_HISTORY:
-                title = res.getString(R.string.caches_history);
-                loader = new RemoveFromHistoryLoader(app, extras.getStringArray(Intents.EXTRA_CACHELIST), coords);
-                break;
             case NEXT_PAGE:
                 loader = new NextPageGeocacheListLoader(app, search);
                 break;
diff --git a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
index 6d6d528..8e4b114 100644
--- a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
+++ b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
@@ -29,7 +29,6 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
         FINDER,
         OWNER,
         MAP,
-        REMOVE_FROM_HISTORY,
         NEXT_PAGE;
 
         public int getLoaderId() {
@@ -43,9 +42,9 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
     private String recaptchaText = null;
     private SearchResult search;
     private boolean loading;
-    private CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
-    public AbstractSearchLoader(Context context) {
+    public AbstractSearchLoader(final Context context) {
         super(context);
     }
 
@@ -65,7 +64,7 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
                 // Unless we make a new Search the Loader framework won't deliver results. It does't do equals only identity
                 search = new SearchResult(search);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             Log.e("Error in Loader ", e);
         }
         loading = false;
@@ -95,13 +94,13 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
     public void waitForUser() {
         try {
             latch.await();
-        } catch (InterruptedException ignored) {
+        } catch (final InterruptedException ignored) {
             Log.w("searchThread is not waiting for user…");
         }
     }
 
     @Override
-    public void setKey(String key) {
+    public void setKey(final String key) {
         recaptchaKey = key;
     }
 
@@ -125,7 +124,7 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
     }
 
     @Override
-    public void setText(String text) {
+    public void setText(final String text) {
         recaptchaText = text;
         latch.countDown();
     }
diff --git a/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java b/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java
deleted file mode 100644
index dc1a5df..0000000
--- a/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cgeo.geocaching.loaders;
-
-import cgeo.geocaching.DataStore;
-import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.enumerations.CacheType;
-import cgeo.geocaching.geopoint.Geopoint;
-import cgeo.geocaching.settings.Settings;
-
-import android.content.Context;
-
-public class RemoveFromHistoryLoader extends AbstractSearchLoader {
-
-    private final String[] selected;
-    private final Geopoint coords;
-
-    public RemoveFromHistoryLoader(Context context, String[] selected, Geopoint coords) {
-        super(context);
-        this.selected = selected.clone();
-        this.coords = coords;
-    }
-
-    @Override
-    public SearchResult runSearch() {
-        DataStore.clearVisitDate(selected);
-        return DataStore.getHistoryOfCaches(true, coords != null ? Settings.getCacheType() : CacheType.ALL);
-    }
-
-}