Skip to content

@bmc08gt chore(chat): only notify of message received when not actively chatting #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Jun 13, 2026
Merged

@bmc08gt chore(chat): only notify of message received when not actively chatting #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion apps/flipcash/shared/chat/src/main/kotlin/com/flipcash/shared/chat/ChatCoordinator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ class ChatCoordinator @Inject constructor(
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private val cluster = MutableStateFlow<AccountCluster?>(null)
private val _state = MutableStateFlow(ChatState())

private var syncJob: Job? = null
private var eventStreamCollectJob: Job? = null
private var eventStreamRetryJob: Job? = null
Expand Down Expand Up @@ -264,6 +263,14 @@ class ChatCoordinator @Inject constructor(
return messagingController.advancePointer(chatId, PointerType.READ, messageId)
}

fun setActiveChatId(chatId: ChatId?) {
_state.update { it.copy(activeChat = chatId) }
}

fun isActiveChat(chatId: ChatId): Boolean {
return _state.value.activeChat == chatId
}

fun dismissNotifications(chatId: ChatId) {
notificationManager.cancel(chatId.hashCode())
}
Expand Down
1 change: 1 addition & 0 deletions apps/flipcash/shared/chat/src/main/kotlin/com/flipcash/shared/chat/ChatState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ data class ChatState(
val feed: List<ChatMetadata> = emptyList(),
val typingIndicators: Map<ChatId, Set<ActiveTypist>> = emptyMap(),
val feedSyncState: FeedSyncState = FeedSyncState.Idle,
val activeChat: ChatId? = null,
)

data class ChatSummary(
Expand Down
1 change: 1 addition & 0 deletions apps/flipcash/shared/notifications/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ android {

dependencies {
implementation(project(":apps:flipcash:shared:authentication"))
implementation(project(":apps:flipcash:shared:chat"))
implementation(project(":apps:flipcash:shared:contacts"))
implementation(project(":apps:flipcash:shared:persistence:sources"))
implementation(project(":apps:flipcash:shared:phone"))
Expand Down
6 changes: 6 additions & 0 deletions ...hared/notifications/src/main/kotlin/com/flipcash/app/notifications/NotificationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.flipcash.app.auth.AuthManager
import com.flipcash.app.contacts.ContactCoordinator
import com.flipcash.app.contacts.ContactResolver
import com.flipcash.app.core.util.Linkify
import com.flipcash.shared.chat.ChatCoordinator
import com.flipcash.app.tokens.TokenCoordinator
import com.flipcash.services.controllers.PushController
import com.flipcash.services.models.NavigationTrigger
Expand Down Expand Up @@ -74,6 +75,9 @@ class NotificationService : FirebaseMessagingService(),
@Inject
lateinit var contactResolver: ContactResolver

@Inject
lateinit var chatCoordinator: ChatCoordinator

override fun onNewToken(token: String) {
super.onNewToken(token)
authenticateIfNeeded {
Expand Down Expand Up @@ -142,6 +146,8 @@ class NotificationService : FirebaseMessagingService(),
notificationManager.createNotificationChannel(channel)

val chatId = (payload?.navigation as? NavigationTrigger.Chat)?.chatId
if (chatId != null && chatCoordinator.isActiveChat(chatId)) return

val groupKey = payload?.groupKey?.takeIf { it.isNotEmpty() }

val builder = NotificationCompat.Builder(this, channel.id)
Expand Down
Loading