From eb15dddf8715bbc1926b8030ab4db7fbeec666cf Mon Sep 17 00:00:00 2001 From: rsudev Date: Fri, 26 Jul 2013 23:05:40 +0200 Subject: Implements OKAPI Live access for opencaching.pl --- main/src/cgeo/geocaching/connector/oc/OkapiClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'main/src/cgeo/geocaching/connector/oc/OkapiClient.java') diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java index 6959adf..be7b3a4 100644 --- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java +++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java @@ -31,6 +31,7 @@ import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -612,7 +613,8 @@ final class OkapiClient { params.add("langpref", getPreferredLanguage()); if (connector.getSupportedAuthLevel() == OAuthLevel.Level3) { - OAuth.signOAuth(host, service.methodName, "GET", false, params, Settings.getOCDETokenPublic(), Settings.getOCDETokenSecret(), connector.getCK(), connector.getCS()); + ImmutablePair tokens = Settings.getTokenPair(connector.getTokenPublicPrefKeyId(), connector.getTokenSecretPrefKeyId()); + OAuth.signOAuth(host, service.methodName, "GET", false, params, tokens.left, tokens.right, connector.getCK(), connector.getCS()); } else { connector.addAuthentication(params); } -- cgit v1.1