Merge branch 'oauth-inband' into upstream

Conflicts:
	main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java

1 files changed, 3 insertions, 62 deletions

diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 13dbde9..b813389 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -16,7 +16,8 @@ public class TwitterAuthorizationActivity extends OAuthAuthorizationActivity {
                 "/oauth/access_token",
                 true,
                 Settings.getKeyConsumerPublic(),
-                Settings.getKeyConsumerSecret());
+                Settings.getKeyConsumerSecret(),
+                "callback://www.cgeo.org/twitter/");
     }
 
     @Override
@@ -40,68 +41,8 @@ public class TwitterAuthorizationActivity extends OAuthAuthorizationActivity {
     }
 
     @Override
-    protected final String getAuthAgain() {
-        return res.getString(R.string.auth_again);
-    }
-
-    @Override
-    protected final String getErrAuthInitialize() {
-        return res.getString(R.string.err_auth_initialize);
-    }
-
-    @Override
-    protected final String getAuthStart() {
-        return res.getString(R.string.auth_start);
-    }
-
-    @Override
     protected final String getAuthDialogCompleted() {
-        return res.getString(R.string.auth_dialog_completed);
-    }
-
-    @Override
-    protected final String getErrAuthProcess() {
-        return res.getString(R.string.err_auth_process);
-    }
-
-    @Override
-    protected final String getAuthDialogWait() {
-        return res.getString(R.string.auth_dialog_wait);
-    }
-
-    @Override
-    protected final String getAuthDialogPinTitle() {
-        return res.getString(R.string.auth_dialog_pin_title);
-    }
-
-    @Override
-    protected final String getAuthDialogPinMessage() {
-        return res.getString(R.string.auth_dialog_pin_message);
-    }
-
-    @Override
-    protected final String getAboutAuth1() {
-        return res.getString(R.string.about_auth_1);
-    }
-
-    @Override
-    protected final String getAboutAuth2() {
-        return res.getString(R.string.about_auth_2);
-    }
-
-    @Override
-    protected final String getAuthAuthorize() {
-        return res.getString(R.string.auth_authorize);
-    }
-
-    @Override
-    protected final String getAuthPinHint() {
-        return res.getString(R.string.auth_pin_hint);
-    }
-
-    @Override
-    protected final String getAuthFinish() {
-        return res.getString(R.string.auth_finish);
+        return res.getString(R.string.auth_dialog_completed_twitter);
     }
 
 }