Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.flipcash.app.featureflags.FeatureFlagController
import com.flipcash.app.permissions.PickedContact
import com.flipcash.features.directsend.R
import com.flipcash.services.user.UserManager
import com.getcode.manager.BottomBarManager
import com.getcode.util.resources.ResourceHelper
import com.getcode.view.BaseViewModel
import com.getcode.view.LoadingSuccessState
Expand All @@ -23,10 +24,12 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.take
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds

Expand Down Expand Up @@ -159,7 +162,26 @@ internal class SendFlowViewModel @Inject constructor(
.onEach { event -> contactCoordinator.removeContact(event.e164) }
.launchIn(viewModelScope)

// SendInvite is observed by the UI layer (ContactListScreen) for navigation
contactCoordinator.state
.filter { it.hasDiscoveredFlipcashContacts && it.flipcashE164s.isNotEmpty() }
.take(1)
.onEach { contactState ->
val count = contactState.flipcashE164s.size
BottomBarManager.showInfo(
title = resources.getQuantityString(
R.plurals.prompt_title_contactsAlreadyOnFlipcash,
count,
count.toString(),
),
message = resources.getString(R.string.prompt_description_contactsAlreadyOnFlipcash),
onDismiss = {
viewModelScope.launch {
contactCoordinator.consumeContactsDiscovery()
}
}
)
}
.launchIn(viewModelScope)
}

private fun generateListItems(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class ContactCoordinator @Inject constructor(
val flipcashE164s: Set<String> = emptySet(),
val syncState: SyncState = SyncState.Idle,
val hasEverSynced: Boolean = false,
val hasDiscoveredFlipcashContacts: Boolean = false,
)

enum class SyncState { Idle, Syncing, Synced, Error }
Expand Down Expand Up @@ -136,9 +137,12 @@ class ContactCoordinator @Inject constructor(

override fun onStart(owner: LifecycleOwner) {
if (cluster.value != null) {
scope.launch { clearServerContactSetIfRevoked() }
trace(tag = TAG, message = "Lifecycle resumed, triggering contact sync", type = TraceType.Process)
launchSync()
syncJob?.cancel()
syncJob = scope.launch {
clearServerContactSetIfRevoked()
trace(tag = TAG, message = "Lifecycle resumed, triggering contact sync", type = TraceType.Process)
performSync()
}
}
}

Expand Down Expand Up @@ -213,6 +217,11 @@ class ContactCoordinator @Inject constructor(
}
}

suspend fun consumeContactsDiscovery() {
contactDataSource.clearFlipcashContactsDiscovered()
_state.update { it.copy(hasDiscoveredFlipcashContacts = false) }
}

suspend fun reset() {
syncJob?.cancel()
_state.value = ContactState()
Expand Down Expand Up @@ -269,9 +278,10 @@ class ContactCoordinator @Inject constructor(
val mappings = contactDataSource.get()

val hasEverSynced = syncState != null || mappings.isNotEmpty()
val hasDiscoveredFlipcashContacts = syncState?.hasDiscoveredFlipcashContacts ?: false
if (mappings.isEmpty()) {
if (hasEverSynced) {
_state.update { it.copy(hasEverSynced = true) }
_state.update { it.copy(hasEverSynced = true, hasDiscoveredFlipcashContacts = hasDiscoveredFlipcashContacts) }
}
return
}
Expand All @@ -288,7 +298,12 @@ class ContactCoordinator @Inject constructor(
val flipcashE164s = mappings.filter { it.isOnFlipcash }.map { it.e164 }.toSet()

_state.update {
it.copy(contacts = contacts, flipcashE164s = flipcashE164s, hasEverSynced = true)
it.copy(
contacts = contacts,
flipcashE164s = flipcashE164s,
hasEverSynced = true,
hasDiscoveredFlipcashContacts = hasDiscoveredFlipcashContacts,
)
}

trace(tag = TAG, message = "Hydrated ${mappings.size} contacts from persistence", type = TraceType.Process)
Expand Down Expand Up @@ -440,6 +455,10 @@ class ContactCoordinator @Inject constructor(
contactDataSource.clearFlipcashStatus()
if (flipcashE164s.isNotEmpty()) {
contactDataSource.markAsFlipcash(flipcashE164s.toList())
if (!_state.value.hasDiscoveredFlipcashContacts) {
contactDataSource.markFlipcashContactsDiscovered()
_state.update { it.copy(hasDiscoveredFlipcashContacts = true) }
}
}
_state.update { it.copy(flipcashE164s = flipcashE164s) }
trace(tag = TAG, message = "Found ${flipcashE164s.size} contacts on Flipcash", type = TraceType.Process)
Expand Down
Loading
Loading