ap7pd/event-management-frontend
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(notifications): Handle some edge cases

Browse source
This commit is contained in:
Peter Vacho 2025-01-04 16:36:28 +01:00
parent 8c57542934
commit 73d24ffdfc
Signed by: school
GPG key ID: 8CFC3837052871B4
2 changed files with 57 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/p_vacho/neat_calendar/activities/NotificationsActivity.kt
View file

@ -90,7 +90,11 @@ class NotificationsActivity : AppCompatActivity() {
} }
private fun getInvitationData(invitationId: String, rvPosition: Int): InvitationResponse? { private fun getInvitationData(invitationId: String, rvPosition: Int): InvitationResponse? {
return invitations[invitationId] val ret = invitations[invitationId]
if (ret == null) {
Log.w("NotificationsActivity", "NotificationAdapter requested unknown invitation: $invitationId")
}
return ret
} }
private fun getUserData(userId: String, rvPosition: Int?): UserResponse? { private fun getUserData(userId: String, rvPosition: Int?): UserResponse? {

65
app/src/main/java/com/p_vacho/neat_calendar/adapters/NotificationAdapter.kt
View file

@ -88,33 +88,72 @@ class NotificationAdapter(
val user = getUserData(usernameId, position) val user = getUserData(usernameId, position)
val username = user?.username ?: "Unknown User" val username = user?.username ?: "Unknown User"
val statusSuffix = when (invitation.status) {
"accepted" -> " [already accepted]"
"declined" -> " [already declined]"
"pending" -> ""
else -> throw IllegalStateException("Unexpected invitation status: ${invitation.status} for invitation ID: ${invitation.id}")
}
return when (notification.message) { return when (notification.message) {
"new-invitation" -> "You have received an event invitation from @$username" "new-invitation" -> "You have received an event invitation from @$username$statusSuffix"
"invitation-accepted" -> "@$username has accepted your event invitation" "invitation-accepted" -> "@$username has accepted your event invitation$statusSuffix"
"invitation-declined" -> "@$username has declined your event invitation" "invitation-declined" -> "@$username has declined your event invitation$statusSuffix"
else -> throw IllegalArgumentException("Unexpected notification message: ${notification.message}") else -> throw IllegalArgumentException("Unexpected notification message: ${notification.message}")
} }
} }
private fun handleInvitationActions( private fun handleInvitationActions(
holder: NotificationViewHolder, holder: NotificationViewHolder,
notification: NotificationResponse, notification: NotificationResponse,
position: Int position: Int
) { ) {
if (notification.event_type == "invitation") { if (notification.event_type == "invitation") {
val invitation = getInvitationData(notification.data, position)
if (invitation == null) {
// For deleted invitations, make all the buttons visible but unclickable & grayed out
holder.invitationActions.visibility = View.VISIBLE
holder.acceptButton.visibility = View.VISIBLE
holder.declineButton.visibility = View.VISIBLE
holder.viewEventButton.visibility = View.VISIBLE
holder.acceptButton.isEnabled = false
holder.declineButton.isEnabled = false
holder.viewEventButton.isEnabled = false
return
}
when (notification.message) { when (notification.message) {
"new-invitation" -> { "new-invitation" -> {
// Show Accept/Decline & View buttons when (invitation.status) {
holder.invitationActions.visibility = View.VISIBLE "pending" -> {
holder.acceptButton.visibility = View.VISIBLE // Show Accept/Decline & View buttons
holder.declineButton.visibility = View.VISIBLE holder.invitationActions.visibility = View.VISIBLE
holder.viewEventButton.visibility = View.VISIBLE holder.acceptButton.visibility = View.VISIBLE
holder.declineButton.visibility = View.VISIBLE
holder.viewEventButton.visibility = View.VISIBLE
holder.acceptButton.setOnClickListener { holder.acceptButton.setOnClickListener {
onActionClick(notification, Action.ACCEPT, position) onActionClick(notification, Action.ACCEPT, position)
} }
holder.declineButton.setOnClickListener { holder.declineButton.setOnClickListener {
onActionClick(notification, Action.DECLINE, position) onActionClick(notification, Action.DECLINE, position)
}
}
"accepted", "declined" -> {
// Show only View button
holder.invitationActions.visibility = View.VISIBLE
holder.acceptButton.visibility = View.GONE
holder.declineButton.visibility = View.GONE
holder.viewEventButton.visibility = View.VISIBLE
holder.viewEventButton.setOnClickListener {
onActionClick(notification, Action.VIEW_EVENT, position)
}
}
else -> throw IllegalStateException("Unexpected invitation status: ${invitation.status} for invite ID: ${invitation.id}")
} }
} }
"invitation-accepted", "invitation-declined" -> { "invitation-accepted", "invitation-declined" -> {