From 1b9eea69f0b34e77733ce09be0107fdb2d4a6992 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Sun, 28 May 2023 10:47:00 +0530
Subject: [PATCH] fixup! Handle account UI login UI progress better

---
 app/src/main/java/com/aurora/extensions/Activity.kt            | 1 -
 .../java/com/aurora/store/view/ui/account/GoogleActivity.kt    | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/aurora/extensions/Activity.kt b/app/src/main/java/com/aurora/extensions/Activity.kt
index 8beb763f9..1e76dcd31 100644
--- a/app/src/main/java/com/aurora/extensions/Activity.kt
+++ b/app/src/main/java/com/aurora/extensions/Activity.kt
@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
 
 
 fun AppCompatActivity.close() {
-    setResult(AppCompatActivity.RESULT_OK)
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
         finishAfterTransition()
     } else {
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
index 709d7cf43..1171e7df7 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
@@ -27,6 +27,7 @@ import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.aurora.Constants
 import com.aurora.extensions.close
 import com.aurora.extensions.isLAndAbove
@@ -125,6 +126,7 @@ class GoogleActivity : BaseActivity() {
             }
 
             //Close Activity
+            setResult(RESULT_OK)
             close()
         } fail {
             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))
 
             //Close Activity
+            setResult(RESULT_CANCELED)
             close()
         }
     }