Make callback url configurable

Author: Jawnnypoo

library/src/main/java/com/parse/ParseTwitterUtils.java

@@ -23,7 +23,9 @@
  * Provides a set of utilities for using Parse with Twitter.
  */
 public final class ParseTwitterUtils {
-  /* package */ static final String AUTH_TYPE = "twitter";
+  private static final String AUTH_TYPE = "twitter";
+
+  private static final String CALLBACK_URL = "twittersdk://";
 
   private static final Object lock = new Object();
   /* package for tests */ static boolean isInitialized;
@@ -51,20 +53,35 @@ public static Twitter getTwitter() {
   /**
    * Initializes Twitter for use with Parse. This method must be invoked prior to calling
    * {@link #link(ParseUser, Context, SaveCallback)} and {@link #logIn(Context, LogInCallback)}.
-   * 
+   *
    * @param consumerKey
    *          Your Twitter consumer key.
    * @param consumerSecret
    *          Your Twitter consumer secret.
    */
   public static void initialize(String consumerKey, String consumerSecret) {
+    initialize(consumerKey, consumerSecret, CALLBACK_URL);
+  }
+
+  /**
+   * Initializes Twitter for use with Parse. This method must be invoked prior to calling
+   * {@link #link(ParseUser, Context, SaveCallback)} and {@link #logIn(Context, LogInCallback)}.
+   *
+   * @param consumerKey
+   *          Your Twitter consumer key.
+   * @param consumerSecret
+   *          Your Twitter consumer secret.
+   * @param callbackUrl
+   *          the callback url
+   */
+  public static void initialize(String consumerKey, String consumerSecret, String callbackUrl) {
     synchronized (lock) {
       if (isInitialized) {
         return;
       }
 
       if (controller == null) {
-        Twitter twitter = new Twitter(consumerKey, consumerSecret);
+        Twitter twitter = new Twitter(consumerKey, consumerSecret, callbackUrl);
         controller = new TwitterController(twitter);
       } else {
         controller.initialize(consumerKey, consumerSecret);
@@ -133,7 +150,7 @@ public static void link(ParseUser user, Context context) {
    * Links a ParseUser to a Twitter account, allowing you to use Twitter for authentication, and
    * providing access to Twitter data for the user. A dialog will be shown to the user for Twitter
    * authentication.
-   * 
+   *
    * @param user
    *          The user to link to a Twitter account.
    * @param context
@@ -190,7 +207,7 @@ public static void link(ParseUser user, String twitterId, String screenName, Str
    * Links a ParseUser to a Twitter account, allowing you to use Twitter for authentication, and
    * providing access to Twitter data for the user. This method allows you to handle getting the
    * auth tokens for your users, rather than delegating to the provided dialog log-in.
-   * 
+   *
    * @param user
    *          The user to link to a Twitter account.
    * @param twitterId
@@ -247,7 +264,7 @@ public static Task<ParseUser> logInInBackground(String twitterId, String screenN
    * credentials does not already exist, a new user will be created. This method allows you to
    * handle getting the auth tokens for your users, rather than delegating to the provided dialog
    * log-in.
-   * 
+   *
    * @param twitterId
    *          The user's Twitter ID.
    * @param screenName
@@ -293,7 +310,7 @@ public Task<ParseUser> then(Task<Map<String, String>> task) throws Exception {
    * Logs in a ParseUser using Twitter for authentication. If a user for the given Twitter
    * credentials does not already exist, a new user will be created. A dialog will be shown to the
    * user for Twitter authentication.
-   * 
+   *
    * @param context
    *          An Android context from which the login dialog can be launched.
    * @param callback

library/src/main/java/com/parse/TwitterController.java

@@ -32,7 +32,7 @@
   private Task<Map<String, String>>.TaskCompletionSource currentTcs;
 
   public TwitterController() {
-    this(new Twitter("", ""));
+    this(new Twitter("", "", ""));
   }
 
   public TwitterController(Twitter twitter) {

library/src/main/java/com/parse/twitter/Twitter.java

@@ -8,24 +8,24 @@
  */
 package com.parse.twitter;
 
-import com.parse.internal.signpost.basic.DefaultOAuthConsumer;
-import com.parse.internal.signpost.basic.DefaultOAuthProvider;
-import com.parse.internal.signpost.basic.HttpURLConnectionClient;
-import org.apache.http.client.methods.HttpUriRequest;
-
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.webkit.CookieSyncManager;
 
-import com.parse.oauth.OAuth1FlowDialog;
-import com.parse.oauth.OAuth1FlowException;
-import com.parse.oauth.OAuth1FlowDialog.FlowResultHandler;
 import com.parse.internal.signpost.OAuthConsumer;
 import com.parse.internal.signpost.OAuthProvider;
+import com.parse.internal.signpost.basic.DefaultOAuthConsumer;
+import com.parse.internal.signpost.basic.DefaultOAuthProvider;
+import com.parse.internal.signpost.basic.HttpURLConnectionClient;
 import com.parse.internal.signpost.commonshttp.CommonsHttpOAuthConsumer;
 import com.parse.internal.signpost.http.HttpParameters;
+import com.parse.oauth.OAuth1FlowDialog;
+import com.parse.oauth.OAuth1FlowDialog.FlowResultHandler;
+import com.parse.oauth.OAuth1FlowException;
+
+import org.apache.http.client.methods.HttpUriRequest;
 
 import java.net.HttpURLConnection;
 
@@ -40,11 +40,10 @@ public class Twitter {
   private static final String USER_ID_PARAM = "user_id";
   private static final String SCREEN_NAME_PARAM = "screen_name";
 
-  private static final String CALLBACK_URL = "twitter-oauth://complete";
-
   // App configuration for enabling authentication.
   private String consumerKey;
   private String consumerSecret;
+  private String callbackUrl;
 
   // User information.
   private String authToken;
@@ -54,9 +53,10 @@ public class Twitter {
 
   private final HttpURLConnectionClient httpURLConnectionClient = HttpURLConnectionClient.create();
 
-  public Twitter(String consumerKey, String consumerSecret) {
+  public Twitter(String consumerKey, String consumerSecret, String callbackUrl) {
     this.consumerKey = consumerKey;
     this.consumerSecret = consumerSecret;
+    this.callbackUrl = callbackUrl;
   }
 
   public String getConsumerKey() {
@@ -155,7 +155,7 @@ protected void onPostExecute(String result) {
             return;
           }
           CookieSyncManager.createInstance(context);
-          OAuth1FlowDialog dialog = new OAuth1FlowDialog(context, result, CALLBACK_URL,
+          OAuth1FlowDialog dialog = new OAuth1FlowDialog(context, result, callbackUrl,
               "api.twitter", new FlowResultHandler() {
 
                 @Override
@@ -237,7 +237,7 @@ protected void onPreExecute() {
       @Override
       protected String doInBackground(Void... params) {
         try {
-          return provider.retrieveRequestToken(consumer, CALLBACK_URL);
+          return provider.retrieveRequestToken(consumer, callbackUrl);
         } catch (Throwable e) {
           error = e;
         }