Fix #903 Rename field "reason" to "listId"

18 files changed, 70 insertions, 68 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 58c6e92..0899f7c 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1641,8 +1641,8 @@ public class CacheDetailActivity extends AbstractActivity {
 
             @Override
             public void run() {
-                int reason = cache.getReason() > 1 ? cache.getReason() : 1;
-                cgBase.storeCache(app, CacheDetailActivity.this, cache, null, reason, handler);
+                int listId = cache.getListId() > 1 ? cache.getListId() : 1;
+                cgBase.storeCache(app, CacheDetailActivity.this, cache, null, listId, handler);
             }
         }
 
@@ -1807,7 +1807,7 @@ public class CacheDetailActivity extends AbstractActivity {
             final Button offlineRefresh = (Button) view.findViewById(R.id.offline_refresh);
             final Button offlineStore = (Button) view.findViewById(R.id.offline_store);
 
-            if (cache.getReason() >= 1) {
+            if (cache.getListId() >= 1) {
                 long diff = (System.currentTimeMillis() / (60 * 1000)) - (cache.getDetailedUpdate() / (60 * 1000)); // minutes
 
                 String ago = "";
@@ -1873,7 +1873,7 @@ public class CacheDetailActivity extends AbstractActivity {
             if (StringUtils.isNotBlank(cache.getShortdesc())) {
                 TextView descView = (TextView) view.findViewById(R.id.shortdesc);
                 descView.setVisibility(View.VISIBLE);
-                descView.setText(Html.fromHtml(cache.getShortdesc().trim(), new HtmlImage(CacheDetailActivity.this, cache.getGeocode(), true, cache.getReason(), false), null), TextView.BufferType.SPANNABLE);
+                descView.setText(Html.fromHtml(cache.getShortdesc().trim(), new HtmlImage(CacheDetailActivity.this, cache.getGeocode(), true, cache.getListId(), false), null), TextView.BufferType.SPANNABLE);
                 descView.setMovementMethod(LinkMovementMethod.getInstance());
                 fixBlackTextColor(descView, cache.getShortdesc());
             }
@@ -1994,7 +1994,7 @@ public class CacheDetailActivity extends AbstractActivity {
                 publishProgress(params);
                 if (imageCounter.getImageCount() > 0) {
                     // Complete view: parse again with loading images - if necessary ! If there are any images causing problems the user can see at least the preview
-                    longDesc = Html.fromHtml(cache.getDescription().trim(), new HtmlImage(CacheDetailActivity.this, cache.getGeocode(), true, cache.getReason(), false), new UnknownTagsHandler());
+                    longDesc = Html.fromHtml(cache.getDescription().trim(), new HtmlImage(CacheDetailActivity.this, cache.getGeocode(), true, cache.getListId(), false), new UnknownTagsHandler());
                     publishProgress(params);
                 }
                 return null;
@@ -2148,7 +2148,7 @@ public class CacheDetailActivity extends AbstractActivity {
                         }
                         // avoid parsing HTML if not necessary
                         if (BaseUtils.containsHtml(log.log)) {
-                            ((TextView) rowView.findViewById(R.id.log)).setText(Html.fromHtml(log.log, new HtmlImage(CacheDetailActivity.this, null, false, cache.getReason(), false), null), TextView.BufferType.SPANNABLE);
+                            ((TextView) rowView.findViewById(R.id.log)).setText(Html.fromHtml(log.log, new HtmlImage(CacheDetailActivity.this, null, false, cache.getListId(), false), null), TextView.BufferType.SPANNABLE);
                         }
                         else {
                             ((TextView) rowView.findViewById(R.id.log)).setText(log.log);
diff --git a/main/src/cgeo/geocaching/CacheListAdapter.java b/main/src/cgeo/geocaching/CacheListAdapter.java
index 1b91b15..21be398 100644
--- a/main/src/cgeo/geocaching/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/CacheListAdapter.java
@@ -579,7 +579,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
             if (cache.isMembers()) {
                 infos.add(res.getString(R.string.cache_premium));
             }
-            if (cacheListType != CacheListType.OFFLINE && cacheListType != CacheListType.HISTORY && cache.getReason() > 0) {
+            if (cacheListType != CacheListType.OFFLINE && cacheListType != CacheListType.HISTORY && cache.getListId() > 0) {
                 infos.add(res.getString(R.string.cache_offline));
             }
             holder.info.setText(StringUtils.join(infos, SEPARATOR));
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java
index 54cba36..0b3f7b9 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java
@@ -30,7 +30,7 @@ class StaticMapApp extends AbstractNavigationApp {
             cgCache cache,
             final cgSearch search, cgWaypoint waypoint, final Geopoint coords) {
 
-        if (cache == null || cache.getReason() == 0) {
+        if (cache == null || cache.getListId() == 0) {
             ActivityMixin.showToast(activity, res.getString(R.string.err_detail_no_map_static));
             return true;
         }
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 1036363..287cbe9 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -773,8 +773,8 @@ public class cgBase {
         return caches;
     }
 
-    public static cgCacheWrap parseCache(final String page, final int reason, final CancellableHandler handler) {
-        final cgCacheWrap caches = parseCacheFromText(page, reason, handler);
+    public static cgCacheWrap parseCache(final String page, final int listId, final CancellableHandler handler) {
+        final cgCacheWrap caches = parseCacheFromText(page, listId, handler);
         if (caches != null && !caches.cacheList.isEmpty()) {
             final cgCache cache = caches.cacheList.get(0);
             getExtraOnlineInfo(cache, page, handler);
@@ -788,7 +788,7 @@ public class cgBase {
         return caches;
     }
 
-    static cgCacheWrap parseCacheFromText(final String page, final int reason, final CancellableHandler handler) {
+    static cgCacheWrap parseCacheFromText(final String page, final int listId, final CancellableHandler handler) {
         sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_details);
 
         if (StringUtils.isBlank(page)) {
@@ -822,7 +822,7 @@ public class cgBase {
 
         cache.setFavourite(BaseUtils.matches(page, GCConstants.PATTERN_FAVORITE));
 
-        cache.setReason(reason);
+        cache.setListId(listId);
 
         // cache geocode
         cache.setGeocode(BaseUtils.getMatch(page, GCConstants.PATTERN_GEOCODE, true, cache.getGeocode()));
@@ -1728,7 +1728,7 @@ public class cgBase {
         params.put("tx", cacheType.guid);
     }
 
-    public static cgSearch searchByNextPage(cgSearchThread thread, final cgSearch search, int reason, boolean showCaptcha) {
+    public static cgSearch searchByNextPage(cgSearchThread thread, final cgSearch search, int listId, boolean showCaptcha) {
         final String[] viewstates = cgeoapplication.getViewstates(search);
 
         final String url = cgeoapplication.getUrl(search);
@@ -1784,12 +1784,12 @@ public class cgBase {
             cgeoapplication.addGeocode(search, cache.getGeocode());
         }
 
-        cgeoapplication.getInstance().addSearch(caches.cacheList, reason);
+        cgeoapplication.getInstance().addSearch(caches.cacheList, listId);
 
         return search;
     }
 
-    public static cgSearch searchByGeocode(final String geocode, final String guid, final int reason, final boolean forceReload, final CancellableHandler handler) {
+    public static cgSearch searchByGeocode(final String geocode, final String guid, final int listId, final boolean forceReload, final CancellableHandler handler) {
         final cgSearch search = new cgSearch();
 
         if (StringUtils.isBlank(geocode) && StringUtils.isBlank(guid)) {
@@ -1798,7 +1798,7 @@ public class cgBase {
         }
 
         cgeoapplication app = cgeoapplication.getInstance();
-        if (!forceReload && reason == 0 && (app.isOffline(geocode, guid) || app.isThere(geocode, guid, true, true))) {
+        if (!forceReload && listId == 0 && (app.isOffline(geocode, guid) || app.isThere(geocode, guid, true, true))) {
             final String realGeocode = StringUtils.isNotBlank(geocode) ? geocode : app.getGeocode(guid);
             search.addGeocode(realGeocode);
             return search;
@@ -1806,10 +1806,10 @@ public class cgBase {
 
         // if we have no geocode, we can't dynamically select the handler, but must explicitly use GC
         if (geocode == null && guid != null) {
-            return GCConnector.getInstance().searchByGeocode(null, guid, app, search, reason, handler);
+            return GCConnector.getInstance().searchByGeocode(null, guid, app, search, listId, handler);
         }
 
-        return ConnectorFactory.getConnector(geocode).searchByGeocode(geocode, guid, app, search, reason, handler);
+        return ConnectorFactory.getConnector(geocode).searchByGeocode(geocode, guid, app, search, listId, handler);
     }
 
     public static cgSearch searchByOffline(final Geopoint coords, final CacheType cacheType, final int list) {
@@ -1831,13 +1831,13 @@ public class cgBase {
      * @param thread
      *            thread to run the captcha if needed
      * @param cacheType
-     * @param reason
+     * @param listId
      * @param showCaptcha
      * @param params
      *            the parameters to add to the request URI
      * @return
      */
-    private static cgSearch searchByAny(final cgSearchThread thread, final CacheType cacheType, final boolean my, final int reason, final boolean showCaptcha, final Parameters params) {
+    private static cgSearch searchByAny(final cgSearchThread thread, final CacheType cacheType, final boolean my, final int listId, final boolean showCaptcha, final Parameters params) {
         final cgSearch search = new cgSearch();
         insertCacheType(params, cacheType);
 
@@ -1856,27 +1856,27 @@ public class cgBase {
         }
 
         List<cgCache> cacheList = filterSearchResults(search, caches, Settings.isExcludeDisabledCaches(), false, cacheType);
-        cgeoapplication.getInstance().addSearch(cacheList, reason);
+        cgeoapplication.getInstance().addSearch(cacheList, listId);
 
         return search;
     }
 
-    public static cgSearch searchByCoords(final cgSearchThread thread, final Geopoint coords, final CacheType cacheType, final int reason, final boolean showCaptcha) {
+    public static cgSearch searchByCoords(final cgSearchThread thread, final Geopoint coords, final CacheType cacheType, final int listId, final boolean showCaptcha) {
         final Parameters params = new Parameters("lat", Double.toString(coords.getLatitude()), "lng", Double.toString(coords.getLongitude()));
-        return searchByAny(thread, cacheType, false, reason, showCaptcha, params);
+        return searchByAny(thread, cacheType, false, listId, showCaptcha, params);
     }
 
-    public static cgSearch searchByKeyword(final cgSearchThread thread, final String keyword, final CacheType cacheType, final int reason, final boolean showCaptcha) {
+    public static cgSearch searchByKeyword(final cgSearchThread thread, final String keyword, final CacheType cacheType, final int listId, final boolean showCaptcha) {
         if (StringUtils.isBlank(keyword)) {
             Log.e(Settings.tag, "cgeoBase.searchByKeyword: No keyword given");
             return null;
         }
 
         final Parameters params = new Parameters("key", keyword);
-        return searchByAny(thread, cacheType, false, reason, showCaptcha, params);
+        return searchByAny(thread, cacheType, false, listId, showCaptcha, params);
     }
 
-    public static cgSearch searchByUsername(final cgSearchThread thread, final String userName, final CacheType cacheType, final int reason, final boolean showCaptcha) {
+    public static cgSearch searchByUsername(final cgSearchThread thread, final String userName, final CacheType cacheType, final int listId, final boolean showCaptcha) {
         if (StringUtils.isBlank(userName)) {
             Log.e(Settings.tag, "cgeoBase.searchByUsername: No user name given");
             return null;
@@ -1890,17 +1890,17 @@ public class cgBase {
             Log.i(Settings.tag, "cgBase.searchByUsername: Overriding users choice, downloading all caches.");
         }
 
-        return searchByAny(thread, cacheType, my, reason, showCaptcha, params);
+        return searchByAny(thread, cacheType, my, listId, showCaptcha, params);
     }
 
-    public static cgSearch searchByOwner(final cgSearchThread thread, final String userName, final CacheType cacheType, final int reason, final boolean showCaptcha) {
+    public static cgSearch searchByOwner(final cgSearchThread thread, final String userName, final CacheType cacheType, final int listId, final boolean showCaptcha) {
         if (StringUtils.isBlank(userName)) {
             Log.e(Settings.tag, "cgeoBase.searchByOwner: No user name given");
             return null;
         }
 
         final Parameters params = new Parameters("u", userName);
-        return searchByAny(thread, cacheType, false, reason, showCaptcha, params);
+        return searchByAny(thread, cacheType, false, listId, showCaptcha, params);
     }
 
     public static cgSearch searchByViewport(final String userToken, final Viewport viewport) {
@@ -2642,7 +2642,7 @@ public class cgBase {
             // get cache details, they may not yet be complete
             if (origCache != null) {
                 // only reload the cache, if it was already stored or has not all details (by checking the description)
-                if (origCache.getReason() > 0 || StringUtils.isBlank(origCache.getDescription())) {
+                if (origCache.getListId() > 0 || StringUtils.isBlank(origCache.getDescription())) {
                     final cgSearch search = searchByGeocode(origCache.getGeocode(), null, listId, false, null);
                     cache = app.getCache(search);
                 } else {
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index cd377ad..616e6fa 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -49,7 +49,7 @@ public class cgCache implements ICache {
     private long updated = 0;
     private long detailedUpdate = 0;
     private long visitedDate = 0;
-    private int reason = 0;
+    private int listId = 0;
     private boolean detailed = false;
     private String geocode = "";
     private String cacheId = "";
@@ -120,8 +120,8 @@ public class cgCache implements ICache {
         if (visitedDate == 0) {
             visitedDate = other.getVisitedDate();
         }
-        if (reason == 0) {
-            reason = other.reason;
+        if (listId == 0) {
+            listId = other.listId;
         }
         if (StringUtils.isBlank(geocode)) {
             geocode = other.getGeocode();
@@ -629,12 +629,12 @@ public class cgCache implements ICache {
         this.visitedDate = visitedDate;
     }
 
-    public int getReason() {
-        return reason;
+    public int getListId() {
+        return listId;
     }
 
-    public void setReason(int reason) {
-        this.reason = reason;
+    public void setListId(int listId) {
+        this.listId = listId;
     }
 
     public boolean getDetailed() {
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 7931e24..ad160bc 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -43,6 +43,7 @@ public class cgData {
             "difficulty", "distance", "direction", "terrain", "latlon", "location", "latitude", "longitude", "elevation", "shortdesc",
             "favourite_cnt", "rating", "votes", "myvote", "disabled", "archived", "members", "found", "favourite", "inventorycoins", "inventorytags",
             "inventoryunknown", "onWatchlist", "personal_note", "reliable_latlon", "coordsChanged"
+            // reason is replaced by listId in cgCache
     };
     /**
      * holds the column indexes of the cache table to avoid lookups
@@ -1248,7 +1249,7 @@ public class cgData {
         } else {
             values.put("updated", cache.getUpdated());
         }
-        values.put("reason", cache.getReason());
+        values.put("reason", cache.getListId());
         values.put("detailed", cache.getDetailed() ? 1 : 0);
         values.put("detailedupdate", cache.getDetailedUpdate());
         values.put("visiteddate", cache.getVisitedDate());
@@ -2071,7 +2072,7 @@ public class cgData {
         }
 
         cache.setUpdated(cursor.getLong(cacheColumnIndex[0]));
-        cache.setReason(cursor.getInt(cacheColumnIndex[1]));
+        cache.setListId(cursor.getInt(cacheColumnIndex[1]));
         cache.setDetailed(cursor.getInt(cacheColumnIndex[2]) == 1);
         cache.setDetailedUpdate(cursor.getLong(cacheColumnIndex[3]));
         cache.setVisitedDate(cursor.getLong(cacheColumnIndex[4]));
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index 3c4426f..3a047a6 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -539,7 +539,7 @@ public class cgeoapplication extends Application {
         search.addGeocode(geocode);
     }
 
-    public void addSearch(final List<cgCache> cacheList, final int reason) {
+    public void addSearch(final List<cgCache> cacheList, final int listId) {
         if (CollectionUtils.isEmpty(cacheList)) {
             return;
         }
@@ -549,8 +549,8 @@ public class cgeoapplication extends Application {
         }
 
         for (final cgCache cache : cacheList) {
-            cache.setReason(reason);
-            storeWithMerge(cache, reason >= 1);
+            cache.setListId(listId);
+            storeWithMerge(cache, listId >= 1);
         }
     }
 
@@ -559,7 +559,7 @@ public class cgeoapplication extends Application {
             return false;
         }
 
-        final boolean status = storeWithMerge(cache, cache.getReason() >= 1);
+        final boolean status = storeWithMerge(cache, cache.getListId() >= 1);
 
         if (status) {
             search.addGeocode(cache.getGeocode());
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index ecd93fd..1e14427 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1151,7 +1151,7 @@ public class cgeocaches extends AbstractListActivity {
             addVisitMenu(menu, cache);
             menu.add(0, MENU_CACHE_DETAILS, 0, res.getString(R.string.cache_menu_details));
         }
-        if (cache.getReason() >= 1) {
+        if (cache.getListId() >= 1) {
             menu.add(0, MENU_DROP_CACHE, 0, res.getString(R.string.cache_offline_drop));
             final List<StoredList> cacheLists = app.getLists();
             final int listCount = cacheLists.size();
@@ -1880,16 +1880,16 @@ public class cgeocaches extends AbstractListActivity {
     private class LoadDetailsThread extends Thread {
 
         final private Handler handler;
-        final private int reason;
+        final private int listIdLD;
         private volatile boolean needToStop = false;
         private int checked = 0;
         private long last = 0L;
 
-        public LoadDetailsThread(Handler handlerIn, int reasonIn) {
+        public LoadDetailsThread(Handler handlerIn, int listId) {
             setPriority(Thread.MIN_PRIORITY);
 
             handler = handlerIn;
-            reason = reasonIn;
+            this.listIdLD = listId;
 
             if (adapter != null) {
                 checked = adapter.getChecked();
@@ -1944,7 +1944,7 @@ public class cgeocaches extends AbstractListActivity {
                     }
 
                     detailProgress++;
-                    cgBase.storeCache(app, cgeocaches.this, cache, null, reason, null);
+                    cgBase.storeCache(app, cgeocaches.this, cache, null, listIdLD, null);
 
                     handler.sendEmptyMessage(cacheList.indexOf(cache));
 
@@ -1964,14 +1964,14 @@ public class cgeocaches extends AbstractListActivity {
     private class LoadFromWebThread extends Thread {
 
         final private Handler handler;
-        final private int reason;
+        final private int listIdLFW;
         private volatile boolean needToStop = false;
 
-        public LoadFromWebThread(Handler handlerIn, int reasonIn) {
+        public LoadFromWebThread(Handler handlerIn, int listId) {
             setPriority(Thread.MIN_PRIORITY);
 
             handler = handlerIn;
-            reason = reasonIn;
+            listIdLFW = listId;
         }
 
         public void kill() {
@@ -2020,7 +2020,7 @@ public class cgeocaches extends AbstractListActivity {
                         yield();
 
                         cgBase.storeCache(app, cgeocaches.this, null, GCcode,
-                                reason, null);
+                                listIdLFW, null);
 
                         Message mes1 = new Message();
                         mes1.what = 2;
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index f6b8df0..7d384ae 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -407,7 +407,7 @@ public class cgeopopup extends AbstractActivity {
                 final Button offlineRefresh = (Button) findViewById(R.id.offline_refresh);
                 final Button offlineStore = (Button) findViewById(R.id.offline_store);
 
-                if (cache.getReason() > 0) {
+                if (cache.getListId() > 0) {
                     long diff = (System.currentTimeMillis() / (60 * 1000)) - (cache.getDetailedUpdate() / (60 * 1000)); // minutes
 
                     String ago = "";
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 73bfd3b..b78c145 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -49,7 +49,7 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public cgSearch searchByGeocode(String geocode, String guid, cgeoapplication app, cgSearch search, int reason, CancellableHandler handler) {
+    public cgSearch searchByGeocode(String geocode, String guid, cgeoapplication app, cgSearch search, int listId, CancellableHandler handler) {
         return null;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/GCConnector.java b/main/src/cgeo/geocaching/connector/GCConnector.java
index d6f7774..33705ab 100644
--- a/main/src/cgeo/geocaching/connector/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/GCConnector.java
@@ -81,7 +81,7 @@ public class GCConnector extends AbstractConnector {
     }
 
     @Override
-    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int reason, final CancellableHandler handler) {
+    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int listId, final CancellableHandler handler) {
         final Parameters params = new Parameters("decrypt", "y");
         if (StringUtils.isNotBlank(geocode)) {
             params.put("wp", geocode);
@@ -115,7 +115,7 @@ public class GCConnector extends AbstractConnector {
             return null;
         }
 
-        final cgCacheWrap caches = cgBase.parseCache(page, reason, handler);
+        final cgCacheWrap caches = cgBase.parseCache(page, listId, handler);
 
         if (caches == null || CollectionUtils.isEmpty(caches.cacheList)) {
             if (caches != null && caches.error != null) {
@@ -125,14 +125,14 @@ public class GCConnector extends AbstractConnector {
                 search.url = caches.url;
             }
 
-            app.addSearch(null, reason);
+            app.addSearch(null, listId);
 
             Log.e(Settings.tag, "cgeoBase.searchByGeocode: No cache parsed");
             return search;
         }
 
         final List<cgCache> cacheList = cgBase.filterSearchResults(search, caches, false, false, Settings.getCacheType());
-        app.addSearch(cacheList, reason);
+        app.addSearch(cacheList, listId);
 
         return search;
     }
diff --git a/main/src/cgeo/geocaching/connector/IConnector.java b/main/src/cgeo/geocaching/connector/IConnector.java
index ddb05a8..66c5c89 100644
--- a/main/src/cgeo/geocaching/connector/IConnector.java
+++ b/main/src/cgeo/geocaching/connector/IConnector.java
@@ -75,7 +75,7 @@ public interface IConnector {
      */
     public boolean supportsCachesAround();
 
-    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int reason, final CancellableHandler handler);
+    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int listId, final CancellableHandler handler);
 
     /**
      * search caches by coordinate. must be implemented if {@link supportsCachesAround} returns <code>true</true>
diff --git a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
index 816d89d..657006a 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
@@ -37,7 +37,7 @@ public class ApiOpenCachingConnector extends OpenCachingConnector {
     }
 
     @Override
-    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int reason, final CancellableHandler handler) {
+    public cgSearch searchByGeocode(final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int listId, final CancellableHandler handler) {
         final cgCache cache = OkapiClient.getCache(geocode);
         if (cache == null) {
             return null;
@@ -46,7 +46,7 @@ public class ApiOpenCachingConnector extends OpenCachingConnector {
         caches.cacheList.add(cache);
 
         final List<cgCache> cacheList = cgBase.filterSearchResults(search, caches, false, false, Settings.getCacheType());
-        app.addSearch(cacheList, reason);
+        app.addSearch(cacheList, listId);
 
         return search;
     }
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 85bca5b..9eab5df 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -280,7 +280,7 @@ public abstract class GPXParser extends FileParser {
                                 || StringUtils.contains(type, "geocache")
                                 || StringUtils.contains(sym, "geocache"))) {
                     fixCache(cache);
-                    cache.setReason(listId);
+                    cache.setListId(listId);
                     cache.setDetailed(true);
 
                     createNoteFromGSAKUserdata();
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index bbf2d7a..7fd48d4 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -161,7 +161,7 @@ public final class LocParser extends FileParser {
 
             fixCache(cache);
             cache.setType(CacheType.UNKNOWN); // type is not given in the LOC file
-            cache.setReason(listId);
+            cache.setListId(listId);
             cache.setDetailed(true);
         }
         Log.i(Settings.tag, "Caches found in .loc file: " + caches.size());
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 7c02c32..34f4f36 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -45,17 +45,17 @@ public class HtmlImage implements Html.ImageGetter {
      * on error: return large error image, if <code>true</code>, otherwise empty 1x1 image
      */
     final private boolean returnErrorImage;
-    final private int reason;
+    final private int listId;
     final private boolean onlySave;
     final private BitmapFactory.Options bfOptions;
     final private int maxWidth;
     final private int maxHeight;
 
-    public HtmlImage(final Context contextIn, final String geocode, final boolean returnErrorImage, final int reason, final boolean onlySave) {
+    public HtmlImage(final Context contextIn, final String geocode, final boolean returnErrorImage, final int listId, final boolean onlySave) {
         this.context = contextIn;
         this.geocode = geocode;
         this.returnErrorImage = returnErrorImage;
-        this.reason = reason;
+        this.listId = listId;
         this.onlySave = onlySave;
 
         bfOptions = new BitmapFactory.Options();
@@ -193,7 +193,7 @@ public class HtmlImage implements Html.ImageGetter {
 
     private Bitmap loadCachedImage(final File file) {
         if (file.exists()) {
-            if (reason > 0 || file.lastModified() > (new Date().getTime() - (24 * 60 * 60 * 1000))) {
+            if (listId > 0 || file.lastModified() > (new Date().getTime() - (24 * 60 * 60 * 1000))) {
                 setSampleSize(file);
                 return BitmapFactory.decodeFile(file.getPath(), bfOptions);
             }
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index f23a6ce..adacc2d 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -86,7 +86,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
      */
     @MediumTest
     public static cgCache testSearchByGeocode(final String geocode) {
-        final cgSearch search = cgBase.searchByGeocode(geocode, null, 1, true, null);
+        final cgSearch search = cgBase.searchByGeocode(geocode, null, 0, true, null);
         assertNotNull(search);
         if (Settings.isPremiumMember() || search.error == null) {
             assertEquals(1, search.getGeocodes().size());
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 911ee1c..38061e0 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -35,6 +35,7 @@ public abstract class MockedCache implements ICache {
         this.mockedDataUser = mockedDataUser;
     }
 
+    @SuppressWarnings("static-method")
     public String getDateFormat() {
         return "dd/MM/yyyy";
     }