Code Cleanup after review

12 files changed, 35 insertions, 79 deletions

diff --git a/main/src/cgeo/geocaching/Intents.java b/main/src/cgeo/geocaching/Intents.java
index 07e1c13..7f0a004 100644
--- a/main/src/cgeo/geocaching/Intents.java
+++ b/main/src/cgeo/geocaching/Intents.java
@@ -25,4 +25,5 @@ public class Intents {
     public static final String EXTRA_TRACKING_CODE = PREFIX + "tracking_code";
     public static final String EXTRA_USERNAME = PREFIX + "username";
     public static final String EXTRA_WAYPOINT_ID = PREFIX + "waypoint_id";
+    public static final String EXTRA_CACHELIST = PREFIX + "cache_list";
 }
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 2c9c80b..8078092 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -81,7 +81,6 @@ import java.util.Set;
 
 public class cgeocaches extends AbstractListActivity implements FilteredActivity, LoaderManager.LoaderCallbacks<SearchResult> {
 
-    private static final String EXTRA_CACHELIST = "CACHELIST";
     private static final int MAX_LIST_ITEMS = 1000;
     private static final int MENU_REFRESH_STORED = 2;
     private static final int MENU_CACHE_DETAILS = 4;
@@ -444,12 +443,10 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
         // init
         if (CollectionUtils.isNotEmpty(cacheList)) {
-            if (currentLoader.isStarted())
-            {
+            if (currentLoader.isStarted()) {
                 showFooterLoadingCaches();
             }
-            else
-            {
+            else {
                 showFooterMoreCaches();
             }
         }
@@ -467,8 +464,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (currentLoader.isLoading())
-        {
+        if (currentLoader.isLoading()) {
             showFooterLoadingCaches();
         }
     }
@@ -1137,13 +1133,13 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
     }
 
     public void removeFromHistory() {
-        ArrayList<String> geocodes = new ArrayList<String>(adapter.getCheckedOrAllCaches().size());
-        for (Geocache cache : adapter.getCheckedOrAllCaches()) {
-            geocodes.add(cache.getGeocode());
+        final List<Geocache> caches = adapter.getCheckedOrAllCaches();
+        final String geocodes[] = new String[caches.size()];
+        for (int i = 0; i < geocodes.length; i++) {
+            geocodes[i] = caches.get(i).getGeocode();
         }
-
         Bundle b = new Bundle();
-        b.putStringArray(EXTRA_CACHELIST, geocodes.toArray(new String[geocodes.size()]));
+        b.putStringArray(Intents.EXTRA_CACHELIST, geocodes);
         getSupportLoaderManager().initLoader(CacheListLoaderType.REMOVE_FROM_HISTORY.ordinal(), b, this);
     }
 
@@ -1423,7 +1419,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             listFooter.setOnClickListener(null);
 
             currentLoader.startLoading();
-            //            currentLoader.forceLoad();
         }
     }
 
@@ -1470,8 +1465,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
         showProgress(true);
         showFooterLoadingCaches();
-        final List<Geocache> caches = adapter.getCheckedCaches();
-        cgData.moveToList(caches, listId);
+        cgData.moveToList(adapter.getCheckedCaches(), listId);
 
         currentLoader = (AbstractSearchLoader) getSupportLoaderManager().initLoader(CacheListType.OFFLINE.ordinal(), new Bundle(), this);
         currentLoader.reset();
@@ -1734,44 +1728,24 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                     title = list.title;
                 }
 
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new OfflineGeocacheListLoader(this.getBaseContext(), coords, listId);
 
                 break;
             case HISTORY:
                 title = res.getString(R.string.caches_history);
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new HistoryGeocacheListLoader(app, coords);
                 break;
             case NEAREST:
                 title = res.getString(R.string.caches_nearby);
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new CoordsGeocacheListLoader(app, coords);
                 break;
             case COORDINATE:
                 title = coords.toString();
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new CoordsGeocacheListLoader(app, coords);
                 break;
             case KEYWORD:
                 final String keyword = extras.getString(Intents.EXTRA_KEYWORD);
                 title = keyword;
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new KeywordGeocacheListLoader(app, keyword);
                 break;
             case ADDRESS:
@@ -1781,10 +1755,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 } else {
                     title = coords.toString();
                 }
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 if (coords != null) {
                     loader = new CoordsGeocacheListLoader(app, coords);
                     }
@@ -1794,44 +1764,34 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 break;
             case USERNAME:
                 title = username;
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new UsernameGeocacheListLoader(app, username);
                 break;
             case OWNER:
                 title = username;
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
                 loader = new OwnerGeocacheListLoader(app, username);
                 break;
             case MAP:
                 //TODO Build Nullloader
                 title = res.getString(R.string.map_map);
-                setTitle(title);
-                showProgress(true);
                 search = (SearchResult) extras.get(Intents.EXTRA_SEARCH);
                 replaceCacheListFromSearch();
                 loadCachesHandler.sendMessage(Message.obtain());
                 break;
             case REMOVE_FROM_HISTORY:
                 title = res.getString(R.string.caches_history);
-                setTitle(title);
-                showProgress(true);
-                showFooterLoadingCaches();
-
-                loader = new RemoveFromHistoryLoader(app, extras.getStringArray(EXTRA_CACHELIST), coords);
+                loader = new RemoveFromHistoryLoader(app, extras.getStringArray(Intents.EXTRA_CACHELIST), coords);
                 break;
 
             default:
                 title = "caches";
                 setTitle(title);
                 Log.e("cgeocaches.onCreate: No action or unknown action specified");
-                break;
+                return null;
         }
+        setTitle(title);
+        showProgress(true);
+        showFooterLoadingCaches();
+
         if (loader != null) {
             loader.setRecaptchaHandler(new SearchHandler(this, res, loader));
         }
@@ -1842,8 +1802,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
     public void onLoadFinished(Loader<SearchResult> arg0, SearchResult searchIn) {
         // The database search was moved into the UI call intentionally. If this is done before the runOnUIThread,
         // then we have 2 sets of caches in memory. This can lead to OOM for huge cache lists.
-        if (searchIn != null)
-        {
+        if (searchIn != null) {
             cacheList.clear();
             final Set<Geocache> cachesFromSearchResult = searchIn.getCachesFromSearchResult(LoadFlags.LOAD_CACHE_OR_DB);
             cacheList.addAll(cachesFromSearchResult);
diff --git a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
index e178acc..4214db9 100644
--- a/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
+++ b/main/src/cgeo/geocaching/loaders/AbstractSearchLoader.java
@@ -30,27 +30,24 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
     private SearchResult search;
     private boolean loading;
 
-    public boolean isLoading() {
-        return loading;
-    }
-
     public AbstractSearchLoader(Context context) {
         super(context);
     }
 
     public abstract SearchResult runSearch();
 
+    public boolean isLoading() {
+        return loading;
+    }
+
     @Override
     public SearchResult loadInBackground() {
         loading = true;
         if (search == null) {
             search = runSearch();
         } else {
-            //Unless we make a new Search the Loader framework won't deliver results. It does't do equals only identity
-            SearchResult newSearch = new SearchResult(search);
-            newSearch.setUrl(search.getUrl());
-            newSearch.setViewstates(search.getViewstates());
-            search = GCParser.searchByNextPage(newSearch, Settings.isShowCaptcha(), this);
+            // Unless we make a new Search the Loader framework won't deliver results. It does't do equals only identity
+            search = GCParser.searchByNextPage(new SearchResult(search), Settings.isShowCaptcha(), this);
         }
         loading = false;
         return search;
@@ -77,6 +74,7 @@ public abstract class AbstractSearchLoader extends AsyncTaskLoader<SearchResult>
         }
     }
 
+    @Override
     public synchronized void waitForUser() {
         try {
             wait();
diff --git a/main/src/cgeo/geocaching/loaders/AddressGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/AddressGeocacheListLoader.java
index 6e4f99a..efaaabc 100644
--- a/main/src/cgeo/geocaching/loaders/AddressGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/AddressGeocacheListLoader.java
@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class AddressGeocacheListLoader extends AbstractSearchLoader {
 
-    private String address;
+    private final String address;
 
     public AddressGeocacheListLoader(Context context, String address) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
index 2f76d49..ca2461c 100644
--- a/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
@@ -10,7 +10,7 @@ import cgeo.geocaching.geopoint.Geopoint;
 import android.content.Context;
 
 public class CoordsGeocacheListLoader extends AbstractSearchLoader {
-    private Geopoint coords;
+    private final Geopoint coords;
 
     public CoordsGeocacheListLoader(Context context, Geopoint coords) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/HistoryGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/HistoryGeocacheListLoader.java
index 59a5726..90e22d1 100644
--- a/main/src/cgeo/geocaching/loaders/HistoryGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/HistoryGeocacheListLoader.java
@@ -9,9 +9,7 @@ import cgeo.geocaching.geopoint.Geopoint;
 import android.content.Context;
 
 public class HistoryGeocacheListLoader extends AbstractSearchLoader {
-
-
-    private Geopoint coords;
+    private final Geopoint coords;
 
     public HistoryGeocacheListLoader(Context context, Geopoint coords) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
index 5f05e24..36b62d6 100644
--- a/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class KeywordGeocacheListLoader extends AbstractSearchLoader {
 
-    private String keyword;
+    private final String keyword;
 
     public KeywordGeocacheListLoader(Context context, String keyword) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/NextPageGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/NextPageGeocacheListLoader.java
index b05cc25..faae9de 100644
--- a/main/src/cgeo/geocaching/loaders/NextPageGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/NextPageGeocacheListLoader.java
@@ -7,7 +7,7 @@ import cgeo.geocaching.connector.gc.GCParser;
 import android.content.Context;
 
 public class NextPageGeocacheListLoader extends AbstractSearchLoader {
-    private SearchResult search;
+    private final SearchResult search;
 
     public NextPageGeocacheListLoader(Context context, SearchResult search) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/OfflineGeocacheListLoader.java
index 48e0ae3..ef1029b 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 int listId;
-    private Geopoint searchCenter;
+    private final int listId;
+    private final Geopoint searchCenter;
 
     public OfflineGeocacheListLoader(Context context, Geopoint searchCenter, int listId) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/OwnerGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/OwnerGeocacheListLoader.java
index a7e44fd..3bed3f4 100644
--- a/main/src/cgeo/geocaching/loaders/OwnerGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/OwnerGeocacheListLoader.java
@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class OwnerGeocacheListLoader extends AbstractSearchLoader {
 
-    private String username;
+    private final String username;
 
     public OwnerGeocacheListLoader(Context context, String username) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java b/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java
index 7e9ea8f..63b4620 100644
--- a/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java
+++ b/main/src/cgeo/geocaching/loaders/RemoveFromHistoryLoader.java
@@ -10,8 +10,8 @@ import android.content.Context;
 
 public class RemoveFromHistoryLoader extends AbstractSearchLoader {
 
-    private String[] selected;
-    private Geopoint coords;
+    private final String[] selected;
+    private final Geopoint coords;
 
     public RemoveFromHistoryLoader(Context context, String[] selected, Geopoint coords) {
         super(context);
diff --git a/main/src/cgeo/geocaching/loaders/UsernameGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/UsernameGeocacheListLoader.java
index e613d5a..5af0fe3 100644
--- a/main/src/cgeo/geocaching/loaders/UsernameGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/UsernameGeocacheListLoader.java
@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class UsernameGeocacheListLoader extends AbstractSearchLoader {
 
-    private String username;
+    private final String username;
 
     public UsernameGeocacheListLoader(Context context, String username) {
         super(context);