AND-117 Fix identity creation back stack (#209)

* Remove unused legacy identity creation screens * Remove unused identity creation code from the main screen * Finish identity creation flow stack after creation * Remove unused welcome promo resources
Concordium · Nov 26, 2024 · 585a7dd · 585a7dd
1 parent e857bef
commit 585a7dd
Show file tree

Hide file tree

Showing 28 changed files with 7 additions and 776 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -236,19 +236,11 @@
             android:name=".ui.auth.setupbiometrics.AuthSetupBiometricsActivity"
             android:screenOrientation="portrait"
             android:theme="@style/CCX_Screen" />
-        <activity
-            android:name=".ui.identity.identitycreate.IdentityIntroFlow"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.identity.identityproviderlist.IdentityProviderListActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/CCX_Screen" />
-        <activity
-            android:name=".ui.identity.identityproviderpolicywebview.IdentityProviderPolicyWebViewActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.identity.identityproviderwebview.IdentityProviderWebviewActivity"
             android:exported="true"

diff --git a/app/src/main/assets/identity_intro_flow_en_1.html b/app/src/main/assets/identity_intro_flow_en_1.html
diff --git a/app/src/main/assets/identity_intro_flow_en_2.html b/app/src/main/assets/identity_intro_flow_en_2.html
diff --git a/app/src/main/assets/identity_intro_flow_en_3.html b/app/src/main/assets/identity_intro_flow_en_3.html
diff --git a/app/src/main/assets/identity_intro_flow_en_4.html b/app/src/main/assets/identity_intro_flow_en_4.html
diff --git a/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt b/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt
@@ -19,7 +19,6 @@ import com.concordium.wallet.ui.common.delegates.AuthDelegate
 import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl
 import com.concordium.wallet.ui.common.delegates.IdentityStatusDelegate
 import com.concordium.wallet.ui.common.delegates.IdentityStatusDelegateImpl
-import com.concordium.wallet.ui.identity.identityproviderlist.IdentityProviderListActivity
 import com.concordium.wallet.ui.more.import.ImportActivity
 import com.concordium.wallet.ui.more.moreoverview.MoreOverviewFragment
 import com.concordium.wallet.ui.news.NewsOverviewFragment
@@ -36,7 +35,6 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over
     IdentityStatusDelegate by IdentityStatusDelegateImpl() {
 
     companion object {
-        const val EXTRA_CREATE_FIRST_IDENTITY = "EXTRA_CREATE_FIRST_IDENTITY"
         const val EXTRA_WALLET_CONNECT_URI = "wc_uri"
     }
 
@@ -75,10 +73,6 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over
         }
 
         handlePossibleWalletConnectUri(intent)
-
-        if (intent.getBooleanExtra(EXTRA_CREATE_FIRST_IDENTITY, false)) {
-            goToFirstIdentityCreation()
-        }
     }
 
     override fun onResume() {
@@ -282,11 +276,5 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over
             walletConnectViewModel.handleWcUri(walletConnectUri)
         }
     }
-
-    private fun goToFirstIdentityCreation() {
-        val intent = Intent(this, IdentityProviderListActivity::class.java)
-        intent.putExtra(IdentityProviderListActivity.SHOW_FOR_FIRST_IDENTITY, true)
-        startActivity(intent)
-    }
     //endregion
 }
diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identitycreate/IdentityIntroFlow.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identitycreate/IdentityIntroFlow.kt
diff --git a/...in/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt b/...in/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt
@@ -56,9 +56,8 @@ class IdentityProviderAdapter(
     //region OnItemClickListener
     //************************************************************
 
-    interface OnItemClickListener {
+    fun interface OnItemClickListener {
         fun onItemClicked(item: IdentityProvider)
-        fun onItemActionClicked(item: IdentityProvider)
     }
 
     fun setOnItemClickListener(onItemClickListener: OnItemClickListener) {

diff --git a/...va/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt b/...va/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt
@@ -11,7 +11,6 @@ import com.concordium.wallet.databinding.ActivityIdentityProviderListBinding
 import com.concordium.wallet.ui.base.BaseActivity
 import com.concordium.wallet.ui.common.delegates.AuthDelegate
 import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl
-import com.concordium.wallet.ui.identity.identityproviderpolicywebview.IdentityProviderPolicyWebViewActivity
 import com.concordium.wallet.ui.identity.identityproviderwebview.IdentityProviderWebviewActivity
 
 class IdentityProviderListActivity : BaseActivity(
@@ -93,16 +92,9 @@ class IdentityProviderListActivity : BaseActivity(
     }
 
     private fun initializeList() {
-        identityProviderAdapter.setOnItemClickListener(object :
-            IdentityProviderAdapter.OnItemClickListener {
-            override fun onItemClicked(item: IdentityProvider) {
-                viewModel.selectedIdentityVerificationItem(item)
-            }
-
-            override fun onItemActionClicked(item: IdentityProvider) {
-                gotoIdentityProviderPolicyWebView(item)
-            }
-        })
+        identityProviderAdapter.setOnItemClickListener { item: IdentityProvider ->
+            viewModel.selectedIdentityVerificationItem(item)
+        }
         binding.recyclerview.adapter = identityProviderAdapter
 
         viewModel.identityProviderList.observe(this, identityProviderAdapter::setData)
@@ -122,13 +114,6 @@ class IdentityProviderListActivity : BaseActivity(
         }
     }
 
-    private fun gotoIdentityProviderPolicyWebView(identityProvider: IdentityProvider) {
-        identityProvider.metadata
-        val intent = Intent(this, IdentityProviderPolicyWebViewActivity::class.java)
-        intent.putExtra(IdentityProviderPolicyWebViewActivity.EXTRA_URL, "https://google.com")
-        startActivity(intent)
-    }
-
     private fun showWaiting(waiting: Boolean) {
         if (waiting) {
             binding.progress.progressLayout.visibility = View.VISIBLE

diff --git a/...wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewActivity.kt b/...wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewActivity.kt
diff --git a/...allet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewViewModel.kt b/...allet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewViewModel.kt
diff --git a/.../concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt b/.../concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt
@@ -258,7 +258,9 @@ class IdentityProviderWebviewActivity : BaseActivity(
     private fun gotoIdentityConfirmed(identity: Identity) {
         finish()
         if (showForFirstIdentity) {
+            finishAffinity()
             val intent = Intent(this, MainActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(intent)
         } else {
             val intent = Intent(this, IdentityConfirmedActivity::class.java)

diff --git a/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt
@@ -296,4 +296,4 @@ class OnboardingFragment @JvmOverloads constructor(
             newAccountViewModel.createAccount()
         }
     }
-}
+}
diff --git a/app/src/main/res/drawable/ccx_ai_assistant_card_background.xml b/app/src/main/res/drawable/ccx_ai_assistant_card_background.xml
diff --git a/app/src/main/res/drawable/ccx_ico_arrow_right_14.xml b/app/src/main/res/drawable/ccx_ico_arrow_right_14.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -296,4 +296,4 @@ class OnboardingFragment @JvmOverloads constructor( @@
                 newAccountViewModel.createAccount()
             }
         }
-    }
+    }