Merge branch 'FE-958_registration_errors' into internal_build

app/src/main/java/io/xxlabs/messenger/ui/global/NetworkViewModel.kt

@@ -229,6 +229,7 @@ class NetworkViewModel @Inject constructor(
         Timber.v("[NETWORK VIEWMODEL] has network follower already started: $networkStatus")
         if (networkStatus == NetworkFollowerStatus.RUNNING) {
             checkStopNetworkTimer()
+            onStartCallback?.invoke(true)
         } else if (networkStatus == NetworkFollowerStatus.STOPPED) {
             startNetworkFollower(onStartCallback)
         }
@@ -391,6 +392,8 @@ class NetworkViewModel @Inject constructor(
                         onCompleteCallback?.invoke(true)
                     }.subscribe()
             )
+        } else {
+            onCompleteCallback?.invoke(true)
         }
     }
 

app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt

@@ -31,7 +31,6 @@ import kotlin.random.Random.Default.nextInt
 
 private const val MAX_NETWORK_RETRIES = 29
 private const val NETWORK_POLL_INTERVAL_MS = 1000L
-private const val GENERIC_ERROR_MSG = "Failed to connect to network. Please try again."
 
 /**
  * Encapsulates username registration logic.
@@ -260,6 +259,7 @@ class UsernameRegistration @AssistedInject constructor(
                     onUsernameNextClicked()
                 }
             } else {
+                delay(NETWORK_POLL_INTERVAL_MS)
                 Timber.d("Attempting to start network follower, attempt #${retries + 1}.")
                 connectToCmix(retries + 1)
             }