diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 58207adf..ddc2a3a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -54,6 +54,16 @@ + + + + + + + + @@ -209,8 +209,7 @@ class MainActivity : BaseActivity(), IdentityStatusDelegate by IdentityStatusDel } } viewModel.newFinalizedAccountLiveData.observe(this) { newAccount -> - newAccount?.let { - } + newAccount?.let {} } viewModel.showTermsAndConditions.observe(this) { shouldShowTermsAndConditions -> if (shouldShowTermsAndConditions) { @@ -253,8 +252,7 @@ class MainActivity : BaseActivity(), IdentityStatusDelegate by IdentityStatusDel wcUri = "" getResultWalletNotSetupIntroTerms.launch( Intent( - this, - WalletNotSetupActivity::class.java + this, WalletNotSetupActivity::class.java ) ) } else { @@ -262,30 +260,30 @@ class MainActivity : BaseActivity(), IdentityStatusDelegate by IdentityStatusDel } } else if (App.appCore.session.hasSetupPassword) { if (wcUri.isNotBlank()) { - if (AuthPreferences(this).hasSeedPhrase()) - getResultAuthLogin.launch(Intent(this, AuthLoginActivity::class.java)) + if (AuthPreferences(this).hasSeedPhrase()) getResultAuthLogin.launch( + Intent( + this, + AuthLoginActivity::class.java + ) + ) else { wcUri = "" getResultWalletNotSetupPassPhrase.launch( Intent( - this, - WalletNotSetupActivity::class.java + this, WalletNotSetupActivity::class.java ) ) } - } else - startActivity(Intent(this, AuthLoginActivity::class.java)) + } else startActivity(Intent(this, AuthLoginActivity::class.java)) } else { if (wcUri.isNotBlank()) { wcUri = "" getResultWalletNotSetupAuthSetup.launch( Intent( - this, - WalletNotSetupActivity::class.java + this, WalletNotSetupActivity::class.java ) ) - } else - startActivity(Intent(this, AuthSetupActivity::class.java)) + } else startActivity(Intent(this, AuthSetupActivity::class.java)) } } @@ -324,4 +322,7 @@ class MainActivity : BaseActivity(), IdentityStatusDelegate by IdentityStatusDel val hashOld = App.appCore.session.getTermsHashed() return hashNew != hashOld } + + private fun Uri.containsHandleDeeplinkScheme() = + toString().run { startsWith("wc") || startsWith("concordiumwallet") } }