From bd878fb98bfbe64c14f2c5a634d4f1cbcecb6688 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Thu, 15 Dec 2016 13:49:18 +0800
Subject: [PATCH] fixed sign in error dialog dismiss

---
 .../org/mariotaku/twidere/activity/SignInActivity.kt      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
index 844efe9ac..e04929540 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
@@ -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) {