Skip to content

Commit 49e646e

Browse files
committed
Adds check for Twitter token being null
1 parent 28dbda7 commit 49e646e

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

library/src/main/java/com/firebase/ui/auth/twitter/TwitterPromptActivity.java

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,25 @@ protected RequestToken doInBackground(Void... params) {
8282

8383
@Override
8484
protected void onPostExecute(final RequestToken token) {
85-
mTwitterView.setWebViewClient(new WebViewClient() {
86-
@Override
87-
public void onPageFinished(final WebView view, final String url) {
88-
if (url.startsWith("oauth://cb")) {
89-
mTwitterView.destroy();
90-
if (url.contains("oauth_verifier")) {
91-
getTwitterOAuthTokenAndLogin(token, Uri.parse(url).getQueryParameter("oauth_verifier"));
92-
} else if (url.contains("denied")) {
93-
sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED.ordinal(), "User denied access to their account.");
85+
if (token == null) {
86+
// Then doInBackground failed and triggered error, so just return
87+
return;
88+
} else {
89+
mTwitterView.setWebViewClient(new WebViewClient() {
90+
@Override
91+
public void onPageFinished(final WebView view, final String url) {
92+
if (url.startsWith("oauth://cb")) {
93+
mTwitterView.destroy();
94+
if (url.contains("oauth_verifier")) {
95+
getTwitterOAuthTokenAndLogin(token, Uri.parse(url).getQueryParameter("oauth_verifier"));
96+
} else if (url.contains("denied")) {
97+
sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED.ordinal(), "User denied access to their account.");
98+
}
9499
}
95100
}
96-
}
97-
});
98-
mTwitterView.loadUrl(token.getAuthorizationURL());
101+
});
102+
mTwitterView.loadUrl(token.getAuthorizationURL());
103+
}
99104
}
100105
}.execute();
101106
}

0 commit comments

Comments
 (0)