Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed #769

This commit is contained in:
Mariotaku Lee 2017-04-22 22:32:00 +08:00
parent 5b5b1e6102
commit e3851a93c5
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
View File

@ -66,7 +66,6 @@ import org.mariotaku.microblog.library.twitter.model.User
import org.mariotaku.restfu.http.Endpoint
import org.mariotaku.restfu.oauth.OAuthToken
import org.mariotaku.restfu.oauth2.OAuth2Authorization
import org.mariotaku.twidere.BuildConfig
import org.mariotaku.twidere.R
import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.annotation.AccountType
@ -78,9 +77,8 @@ import org.mariotaku.twidere.extension.applyTheme
import org.mariotaku.twidere.extension.getErrorMessage
import org.mariotaku.twidere.extension.getNonEmptyString
import org.mariotaku.twidere.extension.model.*
import org.mariotaku.twidere.extension.model.api.toParcelable
import org.mariotaku.twidere.extension.model.api.toParcelable
import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable
import org.mariotaku.twidere.extension.model.api.toParcelable
import org.mariotaku.twidere.fragment.APIEditorDialogFragment
import org.mariotaku.twidere.fragment.BaseDialogFragment
import org.mariotaku.twidere.fragment.ProgressDialogFragment
@ -510,9 +508,10 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
private fun handleBrowserLoginResult(intent: Intent?) {
if (intent == null) return
val verifier = intent.getStringExtra(EXTRA_OAUTH_VERIFIER)
val requestToken = OAuthToken(intent.getStringExtra(EXTRA_REQUEST_TOKEN),
intent.getStringExtra(EXTRA_REQUEST_TOKEN_SECRET))
val extras = intent.getBundleExtra(EXTRA_EXTRAS) ?: return
val verifier = intent.getStringExtra(EXTRA_OAUTH_VERIFIER) ?: return
val requestToken = OAuthToken(extras.getString(EXTRA_REQUEST_TOKEN),
extras.getString(EXTRA_REQUEST_TOKEN_SECRET))
signInTask = BrowserSignInTask(this, apiConfig, requestToken, verifier)
AsyncTaskUtils.executeTask(signInTask)
}