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

fixed sign in error dialog dismiss

This commit is contained in:
Mariotaku Lee 2016-12-15 13:49:18 +08:00
parent 075e85dd7a
commit bd878fb98b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,7 +381,6 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
}
internal fun onSignInResult(result: SignInResponse) {
dismissDialogFragment(FRAGMENT_TAG_SIGN_IN_PROGRESS)
val am = AccountManager.get(this)
setSignInButton()
if (result.alreadyLoggedIn) {
@ -486,6 +485,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
override fun onPostExecute(result: SingleResponse<SignInResponse>) {
val activity = activityRef.get()
activity?.dismissDialogFragment(FRAGMENT_TAG_SIGN_IN_PROGRESS)
if (result.hasData()) {
activity?.onSignInResult(result.data!!)
} else {
@ -966,8 +966,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
override fun getLoginVerification(challengeType: String): String? {
// Dismiss current progress dialog
publishProgress(Runnable {
val activity = activityRef.get() ?: return@Runnable
activity.dismissDialogFragment(SignInActivity.FRAGMENT_TAG_SIGN_IN_PROGRESS)
activityRef.get()?.dismissDialogFragment(SignInActivity.FRAGMENT_TAG_SIGN_IN_PROGRESS)
})
// Show verification input dialog and wait for user input
publishProgress(Runnable {
@ -978,8 +977,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
df.isCancelable = false
df.setCallback(this@InputLoginVerificationCallback)
df.challengeType = challengeType
df.show(sia.supportFragmentManager, null)
Unit
df.show(sia.supportFragmentManager, "login_challenge_$challengeType")
}
})
while (!isChallengeFinished) {