diff options
Diffstat (limited to 'main/src/cgeo/geocaching/loaders')
10 files changed, 18 insertions, 22 deletions
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); |