Skip to content

fix(notifications): resolve contact info from chat ID when group key is not E.164 #902

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 15, 2026
Merged

fix(notifications): resolve contact info from chat ID when group key is not E.164 #902

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
7 changes: 5 additions & 2 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 @@ -27,6 +27,7 @@ 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.chat.ChatId
import com.flipcash.services.models.NavigationTrigger
import com.flipcash.services.models.NotificationCategory
import com.flipcash.services.models.NotificationPayload
Expand Down Expand Up @@ -162,7 +163,7 @@ class NotificationService : FirebaseMessagingService(),
}

val notificationId = if (chatId != null) {
builder.applyContactChatStyle(chatId.hashCode(), groupKey, body)
builder.applyContactChatStyle(chatId, groupKey, body)
} else {
builder.setContentTitle(title).setContentText(body)
SecureRandom().nextInt(Int.MAX_VALUE)
Expand All @@ -184,11 +185,13 @@ class NotificationService : FirebaseMessagingService(),
}

private suspend fun NotificationCompat.Builder.applyContactChatStyle(
notificationId: Int,
chatId: ChatId,
groupKey: String?,
body: String?,
): Int {
val notificationId = chatId.hashCode()
val e164 = groupKey?.takeIf { it.startsWith("+") }
?: contactCoordinator.lookupContactByDmChatId(chatId.toString())?.e164
val contactPhoto = e164?.let { resolveContactPhoto(it) }
val senderName = e164?.let { contactResolver.resolveName(it) } ?: ""

Expand Down
Loading