fix(dashpay): username request fixes (#1317)

* fix: improve identity verification url check * fix: retry button after username request failure on More screen * chore: use dpp 1.3.1-SNAPSHOT
dashpay · Oct 24, 2024 · 7863c8b · 7863c8b
1 parent 00c0bdb
commit 7863c8b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
         dashjVersion = '21.1.2'
-        dppVersion = "1.3-SNAPSHOT"
+        dppVersion = "1.3.1-SNAPSHOT"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'

diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
@@ -707,7 +707,7 @@ class CreateIdentityService : LifecycleService() {
                 platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
 
                 blockchainIdentityData.verificationLink?.let { verificationLink ->
-                    if (verificationLink.startsWith("https://") || verificationLink.startsWith("http://")) {
+                    if (verificationLink.matches(Regex("^https?:\\/\\/.+\$"))) {
                         IdentityVerify(platformRepo.platform.platform).createForDashDomain(
                             blockchainIdentityData.username!!,
                             verificationLink,

diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -283,7 +283,8 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         }
 
         binding.retryRequestButton.setOnClickListener {
-            // TODO: restart CreateIdentityService
+            mainActivityViewModel.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_TRYAGAIN)
+            createIdentityViewModel.retryCreateIdentity()
         }
 
         initViewModel()

diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
@@ -45,7 +45,7 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_verfiy_identity) {
 
         binding.linkInput.doOnTextChanged { text, _, _, _ ->
             val link = text.toString()
-            val isValidLink = link.startsWith("https://") || link.startsWith("http://")
+            val isValidLink = link.matches(Regex("^https?:\\/\\/.+\$"))
             binding.verifyBtn.isEnabled = isValidLink
             if (!text.isNullOrEmpty()) {
                 binding.linkInputLayout.hint = getString(R.string.link)