diff options
| author | rsudev <rasch@munin-soft.de> | 2013-07-26 23:05:40 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2013-07-26 23:05:40 +0200 |
| commit | eb15dddf8715bbc1926b8030ab4db7fbeec666cf (patch) | |
| tree | 052b7d99c1cf4d8f6e22cf2eebe3fb840f417485 /main/src/cgeo/geocaching/connector/oc/OkapiClient.java | |
| parent | f86fa7a33393cd4ce2c7eff72479775b37dfeff3 (diff) | |
| download | cgeo-eb15dddf8715bbc1926b8030ab4db7fbeec666cf.zip cgeo-eb15dddf8715bbc1926b8030ab4db7fbeec666cf.tar.gz cgeo-eb15dddf8715bbc1926b8030ab4db7fbeec666cf.tar.bz2 | |
Implements OKAPI Live access for opencaching.pl
Diffstat (limited to 'main/src/cgeo/geocaching/connector/oc/OkapiClient.java')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/oc/OkapiClient.java | 4 |
1 files changed, 3 insertions, 1 deletions
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<String, String> 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); } |