fixup! Handle account UI login UI progress better
This commit is contained in:
@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
|
|
||||||
|
|
||||||
fun AppCompatActivity.close() {
|
fun AppCompatActivity.close() {
|
||||||
setResult(AppCompatActivity.RESULT_OK)
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||||
finishAfterTransition()
|
finishAfterTransition()
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import android.webkit.WebSettings
|
|||||||
import android.webkit.WebView
|
import android.webkit.WebView
|
||||||
import android.webkit.WebViewClient
|
import android.webkit.WebViewClient
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import com.aurora.Constants
|
import com.aurora.Constants
|
||||||
import com.aurora.extensions.close
|
import com.aurora.extensions.close
|
||||||
import com.aurora.extensions.isLAndAbove
|
import com.aurora.extensions.isLAndAbove
|
||||||
@@ -125,6 +126,7 @@ class GoogleActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Close Activity
|
//Close Activity
|
||||||
|
setResult(RESULT_OK)
|
||||||
close()
|
close()
|
||||||
} fail {
|
} fail {
|
||||||
Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG)
|
Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG)
|
||||||
@@ -132,6 +134,7 @@ class GoogleActivity : BaseActivity() {
|
|||||||
EventBus.getDefault().post(BusEvent.GoogleAAS(false))
|
EventBus.getDefault().post(BusEvent.GoogleAAS(false))
|
||||||
|
|
||||||
//Close Activity
|
//Close Activity
|
||||||
|
setResult(RESULT_CANCELED)
|
||||||
close()
|
close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user