1 files changed, 10 insertions, 68 deletions
diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 4d9a1f2..b813389 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -1,10 +1,11 @@
 package cgeo.geocaching.twitter;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.network.OAuthAuthorizationActivity;
+import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.eclipse.jdt.annotation.Nullable;
 
 public class TwitterAuthorizationActivity extends OAuthAuthorizationActivity {
 
@@ -15,92 +16,33 @@ public class TwitterAuthorizationActivity extends OAuthAuthorizationActivity {
                 "/oauth/access_token",
                 true,
                 Settings.getKeyConsumerPublic(),
-                Settings.getKeyConsumerSecret());
+                Settings.getKeyConsumerSecret(),
+                "callback://www.cgeo.org/twitter/");
     }
 
     @Override
-    protected ImmutablePair<String, String> getTempTokens() {
+    protected final ImmutablePair<String, String> getTempTokens() {
         return Settings.getTempToken();
     }
 
     @Override
-    protected void setTempTokens(String tokenPublic, String tokenSecret) {
+    protected final void setTempTokens(@Nullable final String tokenPublic, @Nullable final String tokenSecret) {
         Settings.setTwitterTempTokens(tokenPublic, tokenSecret);
     }
 
     @Override
-    protected void setTokens(String tokenPublic, String tokenSecret, boolean enable) {
+    protected final void setTokens(@Nullable final String tokenPublic, @Nullable final String tokenSecret, final boolean enable) {
         Settings.setTwitterTokens(tokenPublic, tokenSecret, enable);
     }
 
     @Override
-    protected String getAuthTitle() {
+    protected final String getAuthTitle() {
         return res.getString(R.string.auth_twitter);
     }
 
     @Override
-    protected String getAuthAgain() {
-        return res.getString(R.string.auth_again);
-    }
-
-    @Override
-    protected String getErrAuthInitialize() {
-        return res.getString(R.string.err_auth_initialize);
-    }
-
-    @Override
-    protected String getAuthStart() {
-        return res.getString(R.string.auth_start);
-    }
-
-    @Override
-    protected String getAuthDialogCompleted() {
-        return res.getString(R.string.auth_dialog_completed);
-    }
-
-    @Override
-    protected String getErrAuthProcess() {
-        return res.getString(R.string.err_auth_process);
-    }
-
-    @Override
-    protected String getAuthDialogWait() {
-        return res.getString(R.string.auth_dialog_wait);
-    }
-
-    @Override
-    protected String getAuthDialogPinTitle() {
-        return res.getString(R.string.auth_dialog_pin_title);
-    }
-
-    @Override
-    protected String getAuthDialogPinMessage() {
-        return res.getString(R.string.auth_dialog_pin_message);
-    }
-
-    @Override
-    protected String getAboutAuth1() {
-        return res.getString(R.string.about_auth_1);
-    }
-
-    @Override
-    protected String getAboutAuth2() {
-        return res.getString(R.string.about_auth_2);
-    }
-
-    @Override
-    protected String getAuthAuthorize() {
-        return res.getString(R.string.auth_authorize);
-    }
-
-    @Override
-    protected String getAuthPinHint() {
-        return res.getString(R.string.auth_pin_hint);
-    }
-
-    @Override
-    protected String getAuthFinish() {
-        return res.getString(R.string.auth_finish);
+    protected final String getAuthDialogCompleted() {
+        return res.getString(R.string.auth_dialog_completed_twitter);
     }
 
 }