removing unused commented code
This commit is contained in:
parent
1c0d69674d
commit
67211605aa
@ -227,87 +227,4 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleNotificationWithoutSyncingMode(data: Map<String, String>, session: Session?) {
|
|
||||||
if (session == null) {
|
|
||||||
Timber.tag(loggerTag.value).e("## handleNotificationWithoutSyncingMode cannot find session")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// The Matrix event ID of the event being notified about.
|
|
||||||
// This is required if the notification is about a particular Matrix event.
|
|
||||||
// It may be omitted for notifications that only contain updated badge counts.
|
|
||||||
// This ID can and should be used to detect duplicate notification requests.
|
|
||||||
val eventId = data["event_id"] ?: return // Just ignore
|
|
||||||
|
|
||||||
val eventType = data["type"]
|
|
||||||
if (eventType == null) {
|
|
||||||
// Just add a generic unknown event
|
|
||||||
val simpleNotifiableEvent = SimpleNotifiableEvent(
|
|
||||||
session.myUserId,
|
|
||||||
eventId,
|
|
||||||
null,
|
|
||||||
true, // It's an issue in this case, all event will bing even if expected to be silent.
|
|
||||||
title = getString(R.string.notification_unknown_new_event),
|
|
||||||
description = "",
|
|
||||||
type = null,
|
|
||||||
timestamp = System.currentTimeMillis(),
|
|
||||||
soundName = Action.ACTION_OBJECT_VALUE_VALUE_DEFAULT,
|
|
||||||
isPushGatewayEvent = true
|
|
||||||
)
|
|
||||||
notificationDrawerManager.onNotifiableEventReceived(simpleNotifiableEvent)
|
|
||||||
notificationDrawerManager.refreshNotificationDrawer()
|
|
||||||
} else {
|
|
||||||
val event = parseEvent(data) ?: return
|
|
||||||
|
|
||||||
val notifiableEvent = notifiableEventResolver.resolveEvent(event, session)
|
|
||||||
|
|
||||||
if (notifiableEvent == null) {
|
|
||||||
Timber.tag(loggerTag.value).e("Unsupported notifiable event $eventId")
|
|
||||||
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
|
|
||||||
Timber.tag(loggerTag.value).e("--> $event")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (notifiableEvent is NotifiableMessageEvent) {
|
|
||||||
if (notifiableEvent.senderName.isNullOrEmpty()) {
|
|
||||||
notifiableEvent.senderName = data["sender_display_name"] ?: data["sender"] ?: ""
|
|
||||||
}
|
|
||||||
if (notifiableEvent.roomName.isNullOrEmpty()) {
|
|
||||||
notifiableEvent.roomName = findRoomNameBestEffort(data, session) ?: ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
notifiableEvent.isPushGatewayEvent = true
|
|
||||||
notifiableEvent.matrixID = session.myUserId
|
|
||||||
notificationDrawerManager.onNotifiableEventReceived(notifiableEvent)
|
|
||||||
notificationDrawerManager.refreshNotificationDrawer()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findRoomNameBestEffort(data: Map<String, String>, session: Session?): String? {
|
|
||||||
var roomName: String? = data["room_name"]
|
|
||||||
val roomId = data["room_id"]
|
|
||||||
if (null == roomName && null != roomId) {
|
|
||||||
// Try to get the room name from our store
|
|
||||||
roomName = session?.getRoom(roomId)?.roomSummary()?.displayName
|
|
||||||
}
|
|
||||||
return roomName
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Try to create an event from the FCM data
|
|
||||||
*
|
|
||||||
* @param data the FCM data
|
|
||||||
* @return the event or null if required data are missing
|
|
||||||
*/
|
|
||||||
private fun parseEvent(data: Map<String, String>?): Event? {
|
|
||||||
return Event(
|
|
||||||
eventId = data?.get("event_id") ?: return null,
|
|
||||||
senderId = data["sender"],
|
|
||||||
roomId = data["room_id"] ?: return null,
|
|
||||||
type = data["type"] ?: return null,
|
|
||||||
originServerTs = System.currentTimeMillis()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user