diff options
| author | campbeb <bpcampbell@gmail.com> | 2012-01-22 16:57:36 +0900 |
|---|---|---|
| committer | campbeb <bpcampbell@gmail.com> | 2012-01-22 16:57:36 +0900 |
| commit | 03c5735089648ca052b840daee859b33cdea5c2d (patch) | |
| tree | b3af02445c602395d68647be3bfb3e775d0f31ba /main | |
| parent | 04c458088210a672c5ac47e5fa508b9fba08d8ab (diff) | |
| download | cgeo-03c5735089648ca052b840daee859b33cdea5c2d.zip cgeo-03c5735089648ca052b840daee859b33cdea5c2d.tar.gz cgeo-03c5735089648ca052b840daee859b33cdea5c2d.tar.bz2 | |
Fix #1011 Don't try to load more caches for stored lists
If URL in the search result is blank, then we are looking at stored
caches and don't want to try to load more.
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/cgeocaches.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 5923009..08fa171 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -191,7 +191,8 @@ public class cgeocaches extends AbstractListActivity { setMoreCaches(false); } else { final int count = SearchResult.getTotal(search); - setMoreCaches(count > 0 && cacheList != null && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); + final String url = SearchResult.getUrl(search); + setMoreCaches(StringUtils.isNotBlank(url) && count > 0 && cacheList != null && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); } if (cacheList != null && SearchResult.getError(search) == StatusCode.UNAPPROVED_LICENSE) { @@ -282,7 +283,8 @@ public class cgeocaches extends AbstractListActivity { setMoreCaches(false); } else { final int count = SearchResult.getTotal(search); - setMoreCaches(count > 0 && cacheList != null && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); + final String url = SearchResult.getUrl(search); + setMoreCaches(StringUtils.isNotBlank(url) && count > 0 && cacheList != null && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); } if (SearchResult.getError(search) != null) { @@ -1387,7 +1389,8 @@ public class cgeocaches extends AbstractListActivity { if (CollectionUtils.isNotEmpty(cacheList)) { final int count = SearchResult.getTotal(search); - setMoreCaches(count > 0 && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); + final String url = SearchResult.getUrl(search); + setMoreCaches(StringUtils.isNotBlank(url) && count > 0 && cacheList.size() < count && cacheList.size() < MAX_LIST_ITEMS); } setTitle(title); |