1 files changed, 22 insertions, 17 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 62ccb14..70c3b2a 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -36,7 +36,6 @@ import cgeo.geocaching.utils.SynchronizedDateFormat;
 import cgeo.geocaching.utils.TextUtils;
 
 import ch.boye.httpclientandroidlib.HttpResponse;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -282,7 +281,7 @@ public abstract class GCParser {
             recaptchaText = thread.getText();
         }
 
-        if (!cids.isEmpty() && (Settings.isPremiumMember() || showCaptcha) && ((thread == null || StringUtils.isBlank(thread.getChallenge())) || StringUtils.isNotBlank(recaptchaText))) {
+        if (!cids.isEmpty() && (Settings.isGCPremiumMember() || showCaptcha) && ((thread == null || StringUtils.isBlank(thread.getChallenge())) || StringUtils.isNotBlank(recaptchaText))) {
             Log.i("Trying to get .loc for " + cids.size() + " caches");
 
             try {
@@ -347,6 +346,9 @@ public abstract class GCParser {
         // attention: parseCacheFromText already stores implicitly through searchResult.addCache
         if (searchResult != null && !searchResult.getGeocodes().isEmpty()) {
             final Geocache cache = searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
+            if (cache == null) {
+                return null;
+            }
             getExtraOnlineInfo(cache, page, handler);
             // too late: it is already stored through parseCacheFromText
             cache.setDetailedUpdatedNow();
@@ -741,7 +743,7 @@ public abstract class GCParser {
         cache.parseWaypointsFromNote();
 
         // logs
-        cache.setLogs(loadLogsFromDetails(page, cache, false, true));
+        cache.setLogs(getLogsFromDetails(page, false));
 
         // last check for necessary cache conditions
         if (StringUtils.isBlank(cache.getGeocode())) {
@@ -1380,8 +1382,7 @@ public abstract class GCParser {
     }
 
     private static boolean changeFavorite(final Geocache cache, final boolean add) {
-        final String page = requestHtmlPage(cache.getGeocode(), null, "n", "0");
-        final String userToken = TextUtils.getMatch(page, GCConstants.PATTERN_USERTOKEN, "");
+        final String userToken = getUserToken(cache);
         if (StringUtils.isEmpty(userToken)) {
             return false;
         }
@@ -1400,6 +1401,11 @@ public abstract class GCParser {
         return false;
     }
 
+    private static String getUserToken(final Geocache cache) {
+        final String page = requestHtmlPage(cache.getGeocode(), null, "n", "0");
+        return TextUtils.getMatch(page, GCConstants.PATTERN_USERTOKEN, "");
+    }
+
     /**
      * Removes the cache from the favorites.
      *
@@ -1613,19 +1619,20 @@ public abstract class GCParser {
     }
 
     /**
-     * Load logs from a cache details page.
+     * Extract logs from a cache details page.
      *
      * @param page
      *            the text of the details page
-     * @param cache
-     *            the cache object to put the logs in
      * @param friends
-     *            retrieve friend logs
+     *            return friends logs only (will require a network request)
+     * @return a list of log entries or <code>null</code> if the logs could not be retrieved
+     *
      */
-    private static List<LogEntry> loadLogsFromDetails(final String page, final Geocache cache, final boolean friends, final boolean getDataFromPage) {
+    @Nullable
+    private static List<LogEntry> getLogsFromDetails(final String page, final boolean friends) {
         String rawResponse;
 
-        if (!getDataFromPage) {
+        if (friends) {
             final MatcherWrapper userTokenMatcher = new MatcherWrapper(GCConstants.PATTERN_USERTOKEN, page);
             if (!userTokenMatcher.find()) {
                 Log.e("GCParser.loadLogsFromDetails: unable to extract userToken");
@@ -1712,7 +1719,7 @@ public abstract class GCParser {
                 final JSONArray images = entry.getJSONArray("Images");
                 for (int i = 0; i < images.length(); i++) {
                     final JSONObject image = images.getJSONObject(i);
-                    final String url = "http://img.geocaching.com/cache/log/large/" + image.getString("FileName");
+                    final String url = "http://imgcdn.geocaching.com/cache/log/large/" + image.getString("FileName");
                     final String title = TextUtils.removeControlCharacters(image.getString("Name"));
                     final Image logImage = new Image(url, title);
                     logDone.addLogImage(logImage);
@@ -1825,7 +1832,7 @@ public abstract class GCParser {
         if (Settings.isFriendLogsWanted()) {
             CancellableHandler.sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_logs);
             final List<LogEntry> allLogs = cache.getLogs();
-            final List<LogEntry> friendLogs = loadLogsFromDetails(page, cache, true, false);
+            final List<LogEntry> friendLogs = getLogsFromDetails(page, true);
             if (friendLogs != null) {
                 for (final LogEntry log : friendLogs) {
                     if (allLogs.contains(log)) {
@@ -1860,8 +1867,7 @@ public abstract class GCParser {
     }
 
     public static boolean editModifiedCoordinates(Geocache cache, Geopoint wpt) {
-        final String page = requestHtmlPage(cache.getGeocode(), null, "n", "0");
-        final String userToken = TextUtils.getMatch(page, GCConstants.PATTERN_USERTOKEN, "");
+        final String userToken = getUserToken(cache);
         if (StringUtils.isEmpty(userToken)) {
             return false;
         }
@@ -1896,8 +1902,7 @@ public abstract class GCParser {
     }
 
     public static boolean uploadPersonalNote(Geocache cache) {
-        final String page = requestHtmlPage(cache.getGeocode(), null, "n", "0");
-        final String userToken = TextUtils.getMatch(page, GCConstants.PATTERN_USERTOKEN, "");
+        final String userToken = getUserToken(cache);
         if (StringUtils.isEmpty(userToken)) {
             return false;
         }