1 files changed, 4 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/network/OAuth.java b/main/src/cgeo/geocaching/network/OAuth.java
index cfc62fc..c23ffbf 100644
--- a/main/src/cgeo/geocaching/network/OAuth.java
+++ b/main/src/cgeo/geocaching/network/OAuth.java
@@ -6,7 +6,6 @@ import ch.boye.httpclientandroidlib.NameValuePair;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,8 +17,7 @@ public class OAuth {
             final String method,
             final boolean https,
             final Parameters params,
-            @Nullable final String token,
-            @Nullable final String tokenSecret,
+            final OAuthTokens tokens,
             final String consumerKey,
             final String consumerSecret) {
         params.put(
@@ -27,7 +25,7 @@ public class OAuth {
                 "oauth_nonce", CryptUtils.md5(Long.toString(System.currentTimeMillis())),
                 "oauth_signature_method", "HMAC-SHA1",
                 "oauth_timestamp", Long.toString(new Date().getTime() / 1000),
-                "oauth_token", StringUtils.defaultString(token),
+                "oauth_token", StringUtils.defaultString(tokens.getTokenPublic()),
                 "oauth_version", "1.0");
         params.sort();
 
@@ -36,7 +34,7 @@ public class OAuth {
             paramsEncoded.add(nameValue.getName() + "=" + OAuth.percentEncode(nameValue.getValue()));
         }
 
-        final String keysPacked = consumerSecret + "&" + StringUtils.defaultString(tokenSecret); // both even if empty some of them!
+        final String keysPacked = consumerSecret + "&" + StringUtils.defaultString(tokens.getTokenSecret()); // both even if empty some of them!
         final @NonNull String joinedParams = StringUtils.join(paramsEncoded.toArray(), '&');
         final String requestPacked = method + "&" + OAuth.percentEncode((https ? "https" : "http") + "://" + host + path) + "&" + OAuth.percentEncode(joinedParams);
         params.put("oauth_signature", CryptUtils.base64Encode(CryptUtils.hashHmac(requestPacked, keysPacked)));
@@ -48,7 +46,7 @@ public class OAuth {
      * @param url
      * @return
      */
-    static String percentEncode(@NonNull String url) {
+    static String percentEncode(@NonNull final String url) {
         return StringUtils.replace(Network.rfc3986URLEncode(url), "*", "%2A");
     }
 }