Use OkHttp implementation of consumer and provider

Author: Jawnnypoo

library/build.gradle

@@ -13,6 +13,7 @@ android {
 
 dependencies {
     api 'oauth.signpost:signpost-core:1.2.1.2'
+    api 'se.akerfeldt:okhttp-signpost:1.1.0'
     api 'com.parse:parse-android:1.17.3'
 
     testImplementation 'junit:junit:4.12'

library/src/main/java/com/parse/oauth/OAuth1FlowDialog.java

@@ -113,16 +113,16 @@ private void setUpWebView(int margin) {
     content.addView(webViewContainer);
   }
 
-  public static interface FlowResultHandler {
+  public interface FlowResultHandler {
     /**
      * Called when the user cancels the dialog.
      */
-    public void onCancel();
+    void onCancel();
 
     /**
      * Called when the dialog's web view receives an error.
      */
-    public void onError(int errorCode, String description, String failingUrl);
+    void onError(int errorCode, String description, String failingUrl);
 
     /**
      * Called when the dialog portion of the flow is complete.
@@ -131,7 +131,7 @@ public static interface FlowResultHandler {
      *          The final URL called back (including any query string appended
      *          by the server).
      */
-    public void onComplete(String callbackUrl);
+    void onComplete(String callbackUrl);
   }
 
   private class OAuth1WebViewClient extends WebViewClient {

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

@@ -10,28 +10,23 @@
 
 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.OAuth1FlowDialog.FlowResultHandler;
 import com.parse.oauth.OAuth1FlowException;
 
-import java.net.HttpURLConnection;
-
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.OAuthProvider;
-import oauth.signpost.basic.DefaultOAuthConsumer;
-import oauth.signpost.basic.DefaultOAuthProvider;
 import oauth.signpost.http.HttpParameters;
+import okhttp3.HttpUrl;
+import se.akerfeldt.okhttp.signpost.OkHttpOAuthConsumer;
+import se.akerfeldt.okhttp.signpost.OkHttpOAuthProvider;
 
 public class Twitter {
-  private static final String USER_AGENT = "Parse Android SDK";
 
-  private static final String REQUEST_TOKEN_URL = "https://api.twitter.com/oauth/request_token";
-  private static final String AUTHORIZE_URL = "https://api.twitter.com/oauth/authenticate";
-  private static final String ACCESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token";
+  static final String REQUEST_TOKEN_URL = "https://api.twitter.com/oauth/request_token";
+  static final String AUTHORIZE_URL = "https://api.twitter.com/oauth/authenticate";
+  static final String ACCESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token";
 
   private static final String VERIFIER_PARAM = "oauth_verifier";
   private static final String USER_ID_PARAM = "user_id";
@@ -104,32 +99,37 @@ public void setScreenName(String screenName) {
     this.screenName = screenName;
   }
 
-  public void signRequest(HttpURLConnection request) {
-    OAuthConsumer consumer = new DefaultOAuthConsumer(getConsumerKey(), getConsumerSecret());
-    consumer.setTokenWithSecret(getAuthToken(), getAuthTokenSecret());
-    try {
-      consumer.sign(request);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   public void authorize(final Context context, final AsyncCallback callback) {
     if (getConsumerKey() == null || getConsumerKey().length() == 0 || getConsumerSecret() == null
         || getConsumerSecret().length() == 0) {
       throw new IllegalStateException(
           "Twitter must be initialized with a consumer key and secret before authorization.");
     }
 
-    final OAuthProvider provider = new DefaultOAuthProvider(REQUEST_TOKEN_URL, ACCESS_TOKEN_URL, AUTHORIZE_URL);
-    provider.setRequestHeader("User-Agent", USER_AGENT);
-    final OAuthConsumer consumer = new DefaultOAuthConsumer(getConsumerKey(), getConsumerSecret());
+    final OkHttpOAuthProvider provider = new OkHttpOAuthProvider(REQUEST_TOKEN_URL, ACCESS_TOKEN_URL, AUTHORIZE_URL);
+    final OkHttpOAuthConsumer consumer = new OkHttpOAuthConsumer(getConsumerKey(), getConsumerSecret());
 
     final ProgressDialog progress = new ProgressDialog(context);
     progress.setMessage("Loading...");
     AsyncTask<Void, Void, String> task = new AsyncTask<Void, Void, String>() {
       private Throwable error;
 
+      @Override
+      protected void onPreExecute() {
+        super.onPreExecute();
+        progress.show();
+      }
+
+      @Override
+      protected String doInBackground(Void... params) {
+        try {
+          return provider.retrieveRequestToken(consumer, callbackUrl);
+        } catch (Throwable e) {
+          error = e;
+        }
+        return null;
+      }
+
       @Override
       protected void onPostExecute(String result) {
         super.onPostExecute(result);
@@ -150,8 +150,8 @@ public void onError(int errorCode, String description, String failingUrl) {
                 @Override
                 public void onComplete(String callbackUrl) {
                   CookieSyncManager.getInstance().sync();
-                  Uri uri = Uri.parse(callbackUrl);
-                  final String verifier = uri.getQueryParameter(VERIFIER_PARAM);
+                  HttpUrl url = HttpUrl.parse(callbackUrl);
+                  final String verifier = url.queryParameter(VERIFIER_PARAM);
                   if (verifier == null) {
                     callback.onCancel();
                     return;
@@ -211,22 +211,6 @@ public void onCancel() {
           progress.dismiss();
         }
       }
-
-      @Override
-      protected void onPreExecute() {
-        super.onPreExecute();
-        progress.show();
-      }
-
-      @Override
-      protected String doInBackground(Void... params) {
-        try {
-          return provider.retrieveRequestToken(consumer, callbackUrl);
-        } catch (Throwable e) {
-          error = e;
-        }
-        return null;
-      }
     };
     task.execute();
   }