From 917e8753afc03487fb018a6ddd79124bdd05d8c1 Mon Sep 17 00:00:00 2001
From: Kamal Bramwell <kamal@elixxir.io>
Date: Mon, 8 Aug 2022 21:19:27 -0400
Subject: [PATCH] Call failVerifyingRequests() in init block of
 ContactsViewModel.

---
 .../io/xxlabs/messenger/ui/global/ContactsViewModel.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/xxlabs/messenger/ui/global/ContactsViewModel.kt b/app/src/main/java/io/xxlabs/messenger/ui/global/ContactsViewModel.kt
index 2d4950af..08f14102 100644
--- a/app/src/main/java/io/xxlabs/messenger/ui/global/ContactsViewModel.kt
+++ b/app/src/main/java/io/xxlabs/messenger/ui/global/ContactsViewModel.kt
@@ -27,7 +27,6 @@ import io.xxlabs.messenger.repository.client.ClientRepository
 import io.xxlabs.messenger.requests.data.contact.ContactRequestData
 import io.xxlabs.messenger.requests.data.contact.ContactRequestsRepository
 import io.xxlabs.messenger.requests.data.contact.RequestMigrator
-import io.xxlabs.messenger.requests.data.group.InvitationMigrator
 import io.xxlabs.messenger.support.extensions.combineWith
 import io.xxlabs.messenger.support.extensions.toBase64String
 import io.xxlabs.messenger.support.isMockVersion
@@ -77,6 +76,11 @@ class ContactsViewModel @Inject constructor(
     init {
         Timber.v("isAuthCallbackRegistered: ${isAuthCallbackRegistered()}")
         migrateOldRequests()
+
+        // The app has presumably had a fresh launch.
+        // Fail requests that haven't verified yet, so they may be retried manually by user.
+        failVerifyingRequests()
+
         if (BuildConfig.DEBUG) listContacts()
     }
 
@@ -97,10 +101,6 @@ class ContactsViewModel @Inject constructor(
     fun registerAuthCallback() {
         Timber.v("[MAIN] Registering auth callback...")
         if (!isAuthCallbackRegistered()) {
-            // The app has presumably had a fresh launch.
-            // Fail requests that haven't verified yet, so they may be retried manually by user.
-            failVerifyingRequests()
-
             Timber.v("[MAIN] nor initialized, initializing network callback...")
             subscriptions.add(
                 repo.registerAuthCallback(
-- 
GitLab