Skip to content

Cleanup #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2017
Merged

Cleanup #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/src/main/java/com/codepath/oauth/OAuthBaseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down Expand Up @@ -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);
}
Expand All @@ -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());
Expand Down