diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
| commit | f9474aa841400850c6d676f33bd03672345d4c03 (patch) | |
| tree | 4315047cfad97aa6f6190f76743ffe8ca64f84a4 /main/src/cgeo/geocaching/connector/oc/OkapiClient.java | |
| parent | cd03c1b91da2b5c8cc7eb4f5617263c6aebcbd21 (diff) | |
| parent | eb15dddf8715bbc1926b8030ab4db7fbeec666cf (diff) | |
| download | cgeo-f9474aa841400850c6d676f33bd03672345d4c03.zip cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.gz cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.bz2 | |
Merge remote-tracking branch 'rsudev/ocpl'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/settings/Settings.java
main/src/cgeo/geocaching/settings/SettingsActivity.java
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 ae3af05..139a48e 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; @@ -610,7 +611,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); } |