diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-09-13 19:30:02 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-09-13 19:30:08 +0200 |
| commit | f3e6e0cde4e59a58afc7046c05aa4d9a96cfbd38 (patch) | |
| tree | 7ef5a7e52003311866eee281c06f4452eb7df641 /main | |
| parent | 19dbcd81c8bacc6c07238006d3a1a165a3a86250 (diff) | |
| download | cgeo-f3e6e0cde4e59a58afc7046c05aa4d9a96cfbd38.zip cgeo-f3e6e0cde4e59a58afc7046c05aa4d9a96cfbd38.tar.gz cgeo-f3e6e0cde4e59a58afc7046c05aa4d9a96cfbd38.tar.bz2 | |
Enable use of callback with Twitter
Since the current API tokens for Twitter do not allow the use of a
callback, new ones have been used here. We can change that back once the
settings for the old ones have been updated.
Diffstat (limited to 'main')
| -rw-r--r-- | main/AndroidManifest.xml | 14 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/Settings.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 59f5d58..39ef9d8 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -111,7 +111,19 @@ android:name=".twitter.TwitterAuthorizationActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/auth_twitter" - android:windowSoftInputMode="stateHidden" > + android:windowSoftInputMode="stateHidden" + android:launchMode="singleTask" > + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + + <data + android:host="www.cgeo.org" + android:pathPrefix="/twitter/" + android:scheme="callback" /> + </intent-filter> </activity> <activity android:name=".EditWaypointActivity_" diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index 65d06bf..16b6562 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -51,8 +51,8 @@ public final class Settings { private final static int unitsMetric = 1; // twitter api keys - private final static String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj"); - private final static String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x"); + private final static String keyConsumerPublic = CryptUtils.rot13("XdphhYs0nCqMwmKzpVkzkD"); + private final static String keyConsumerSecret = CryptUtils.rot13("BEBZgTKrzVvYuH6h26HbqmLk87qfVsrmdeRXlMZewIj"); public enum CoordInputFormatEnum { Plain, diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java index 49588e7..80ee5f8 100644 --- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java @@ -16,7 +16,7 @@ public class TwitterAuthorizationActivity extends OAuthAuthorizationActivity { true, Settings.getKeyConsumerPublic(), Settings.getKeyConsumerSecret(), - null); + "callback://www.cgeo.org/twitter/"); } @Override |