1 files changed, 5 insertions, 7 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 7dc048a..0dc4242 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -529,9 +529,7 @@ public abstract class GCParser {
         if (result != null) {
             // replace linebreak and paragraph tags
             final String hint = GCConstants.PATTERN_LINEBREAK.matcher(result).replaceAll("\n");
-            if (hint != null) {
-                cache.setHint(StringUtils.replace(hint, "</p>", "").trim());
-            }
+            cache.setHint(StringUtils.replace(hint, "</p>", "").trim());
         }
 
         cache.checkFields();
@@ -766,7 +764,7 @@ public abstract class GCParser {
 
     public static SearchResult searchByNextPage(final SearchResult search, boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) {
         if (search == null) {
-            return search;
+            return null;
         }
         final String[] viewstates = search.getViewstates();
 
@@ -1131,9 +1129,9 @@ public abstract class GCParser {
      * @return status code to indicate success or failure
      */
     public static ImmutablePair<StatusCode, String> uploadLogImage(final String logId, final String caption, final String description, final Uri imageUri) {
-        final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/upload.aspx").build().toString();
+        final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/upload.aspx").encodedQuery("LID=" + logId).build().toString();
 
-        final String page = Login.getRequestLogged(uri, new Parameters("LID=", logId));
+        final String page = Login.getRequestLogged(uri, null);
         if (StringUtils.isBlank(page)) {
             Log.e("GCParser.uploadLogImage: No data from server");
             return new ImmutablePair<StatusCode, String>(StatusCode.UNKNOWN_ERROR, null);
@@ -1717,7 +1715,7 @@ public abstract class GCParser {
                 try {
                     final Integer ctl = Integer.valueOf(trackableMatcher.group(3));
                     final Integer id = Integer.valueOf(trackableMatcher.group(5));
-                    if (trackCode != null && name != null && ctl != null && id != null) {
+                    if (trackCode != null && ctl != null && id != null) {
                         final TrackableLog entry = new TrackableLog(trackCode, name, id, ctl);
 
                         Log.i("Trackable in inventory (#" + entry.ctl + "/" + entry.id + "): " + entry.trackCode + " - " + entry.name);