Skip to content
Snippets Groups Projects
Commit 917e8753 authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Call failVerifyingRequests() in init block of ContactsViewModel.

parent 25decc60
Branches
Tags
3 merge requests!84Version 2.92 build 629,!77v2.9 b627,!74FE-957: Requests stuck verifying
...@@ -27,7 +27,6 @@ import io.xxlabs.messenger.repository.client.ClientRepository ...@@ -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.ContactRequestData
import io.xxlabs.messenger.requests.data.contact.ContactRequestsRepository import io.xxlabs.messenger.requests.data.contact.ContactRequestsRepository
import io.xxlabs.messenger.requests.data.contact.RequestMigrator 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.combineWith
import io.xxlabs.messenger.support.extensions.toBase64String import io.xxlabs.messenger.support.extensions.toBase64String
import io.xxlabs.messenger.support.isMockVersion import io.xxlabs.messenger.support.isMockVersion
...@@ -77,6 +76,11 @@ class ContactsViewModel @Inject constructor( ...@@ -77,6 +76,11 @@ class ContactsViewModel @Inject constructor(
init { init {
Timber.v("isAuthCallbackRegistered: ${isAuthCallbackRegistered()}") Timber.v("isAuthCallbackRegistered: ${isAuthCallbackRegistered()}")
migrateOldRequests() 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() if (BuildConfig.DEBUG) listContacts()
} }
...@@ -97,10 +101,6 @@ class ContactsViewModel @Inject constructor( ...@@ -97,10 +101,6 @@ class ContactsViewModel @Inject constructor(
fun registerAuthCallback() { fun registerAuthCallback() {
Timber.v("[MAIN] Registering auth callback...") Timber.v("[MAIN] Registering auth callback...")
if (!isAuthCallbackRegistered()) { 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...") Timber.v("[MAIN] nor initialized, initializing network callback...")
subscriptions.add( subscriptions.add(
repo.registerAuthCallback( repo.registerAuthCallback(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment