diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-09-13 20:53:30 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-09-13 20:56:03 +0200 |
| commit | 7871429261e1c112e1fb897f46c71ea064b0d49b (patch) | |
| tree | 01b22eb98e3a38f75b8d9eb8544ef472062aa416 /main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java | |
| parent | 5049488a85ed9785c7cc452f0fbc08a57c8241d5 (diff) | |
| parent | e87c9642838fb2a012154349f7bd94cd670f6806 (diff) | |
| download | cgeo-7871429261e1c112e1fb897f46c71ea064b0d49b.zip cgeo-7871429261e1c112e1fb897f46c71ea064b0d49b.tar.gz cgeo-7871429261e1c112e1fb897f46c71ea064b0d49b.tar.bz2 | |
Merge branch 'oauth-inband' into upstream
Conflicts:
main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
Diffstat (limited to 'main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java index 96875ce..45a4475 100644 --- a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java @@ -19,7 +19,8 @@ public class OCAuthorizationActivity extends OAuthAuthorizationActivity { "/okapi/services/oauth/access_token", false, CgeoApplication.getInstance().getResources().getString(authParams.getCKResId()), - CgeoApplication.getInstance().getResources().getString(authParams.getCSResId())); + CgeoApplication.getInstance().getResources().getString(authParams.getCSResId()), + null); this.authParams = authParams; } |