Merge pull request #33 from rogerhu/scribe7

Cleanup

Author: nesquena

app/src/main/java/com/codepath/oauth/OAuthBaseClient.java

@@ -26,6 +26,8 @@ public abstract class OAuthBaseClient {
 
     private static final String OAUTH1_REQUEST_TOKEN = "request_token";
     private static final String OAUTH1_REQUEST_TOKEN_SECRET = "request_token_secret";
+    private static final String OAUTH1_VERSION = "1.0";
+    private static final String OAUTH2_VERSION = "2.0";
 
     protected static HashMap<Class<? extends OAuthBaseClient>, OAuthBaseClient> instances =
             new HashMap<Class<? extends OAuthBaseClient>, OAuthBaseClient>();
@@ -53,15 +55,15 @@ public OAuthBaseClient(Context c, BaseApi apiInstance, String consumerUrl, Strin
             @Override
             public void onReceivedRequestToken(Token requestToken, String authorizeUrl, String oAuthVersion) {
                 if (requestToken != null) {
-                    if (oAuthVersion == "1.0") {  // store for OAuth1.0a
+                    if (oAuthVersion == OAUTH1_VERSION) {  // store for OAuth1.0a
                         OAuth1RequestToken oAuth1RequestToken = (OAuth1RequestToken) requestToken;
                         editor.putString(OAUTH1_REQUEST_TOKEN, oAuth1RequestToken.getToken());
                         editor.putString(OAUTH1_REQUEST_TOKEN_SECRET, oAuth1RequestToken.getTokenSecret());
                         editor.commit();
                     }
                 }
                 // Launch the authorization URL in the browser
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(authorizeUrl + "&perms=delete"));
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(authorizeUrl));
                 if (requestIntentFlags != -1) {
                     intent.setFlags(requestIntentFlags);
                 }
@@ -72,15 +74,15 @@ public void onReceivedRequestToken(Token requestToken, String authorizeUrl, Stri
             @Override
             public void onReceivedAccessToken(Token accessToken, String oAuthVersion) {
 
-                if (oAuthVersion == "1.0") {
+                if (oAuthVersion == OAUTH1_VERSION) {
                     OAuth1AccessToken oAuth1AccessToken = (OAuth1AccessToken) accessToken;
 
                     client.setAccessToken(accessToken);
                     editor.putString(OAuthConstants.TOKEN, oAuth1AccessToken.getToken());
                     editor.putString(OAuthConstants.TOKEN_SECRET, oAuth1AccessToken.getTokenSecret());
                     editor.putInt(OAuthConstants.VERSION, 1);
                     editor.commit();
-                } else if (oAuthVersion == "2.0") {
+                } else if (oAuthVersion == OAUTH2_VERSION) {
                     OAuth2AccessToken oAuth2AccessToken = (OAuth2AccessToken) accessToken;
                     client.setAccessToken(accessToken);
                     editor.putString(OAuthConstants.TOKEN, oAuth2AccessToken.getAccessToken());