Merge pull request #199 from mysteriumnetwork/fast-identity-registration

Adapt for fast registration flow
mysteriumnetwork · Jun 10, 2020 · 71f1697 · 71f1697
2 parents 26389ef + c4f9c45
commit 71f1697
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/android/app/src/main/java/network/mysterium/ui/AccountViewModel.kt b/android/app/src/main/java/network/mysterium/ui/AccountViewModel.kt
@@ -47,11 +47,14 @@ class IdentityModel(
         val channelAddress: String,
         var status: IdentityRegistrationStatus
 ) {
+    // Identity is considered as registered if it's status RegisteredConsumer or InProgress since we support fast
+    // identity registration flow which means there is no need to wait for actual registration.
     val registered: Boolean
         get() {
-            return status == IdentityRegistrationStatus.REGISTERED_CONSUMER
+            return status == IdentityRegistrationStatus.REGISTERED_CONSUMER || status == IdentityRegistrationStatus.IN_PROGRESS
         }
 
+
     val registrationFailed: Boolean
         get() {
             return status == IdentityRegistrationStatus.REGISTRATION_ERROR
@@ -113,7 +116,7 @@ class AccountViewModel(private val nodeRepository: NodeRepository, private val b
             )
             identity.value = identityResult
             bugReporter.setUserIdentifier(nodeIdentity.address)
-            Log.i(TAG, "Loaded identity ${nodeIdentity.address}, channel addr: ${nodeIdentity.channelAddress}")
+            Log.i(TAG, "Loaded identity ${nodeIdentity.address}, channel addr: ${nodeIdentity.channelAddress}, status: ${nodeIdentity.registrationStatus}")
 
             // Register identity if not registered or failed.
             if (identityResult.status == IdentityRegistrationStatus.UNREGISTERED || identityResult.status == IdentityRegistrationStatus.REGISTRATION_ERROR) {