rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explain why the data are different when received from Firebase and from UnifiedPush.

Browse Source 
Author: @p1gp1g
This commit is contained in:
Benoit Marty 2022-06-09 09:49:47 +02:00 committed by Benoit Marty
parent 2b8d1dd11c
commit c43122a6f8
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
View File

@ -87,21 +87,12 @@ class VectorMessagingReceiver : MessagingReceiver() {
*/ */
override fun onMessage(context: Context, message: ByteArray, instance: String) { override fun onMessage(context: Context, message: ByteArray, instance: String) {
Timber.tag(loggerTag.value).d("## onMessage() received") Timber.tag(loggerTag.value).d("## onMessage() received")
val sMessage = String(message)
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
Timber.tag(loggerTag.value).d("## onMessage() %s", sMessage)
}
runBlocking { runBlocking {
vectorDataStore.incrementPushCounter() vectorDataStore.incrementPushCounter()
} }
val moshi = MatrixJsonParser.getMoshi() val pushData = parseData(message) ?: return Unit.also { Timber.tag(loggerTag.value).w("Invalid received data Json format") }
val pushData = if (unifiedPushHelper.isEmbeddedDistributor()) {
moshi.adapter(PushDataFcm::class.java).fromJson(sMessage)?.toPushData()
} else {
moshi.adapter(PushDataUnifiedPush::class.java).fromJson(sMessage)?.toPushData()
} ?: return Unit.also { Timber.tag(loggerTag.value).w("Invalid received data Json format") }
// Diagnostic Push // Diagnostic Push
if (pushData.eventId == PushersManager.TEST_EVENT_ID) { if (pushData.eventId == PushersManager.TEST_EVENT_ID) {
@ -125,6 +116,35 @@ class VectorMessagingReceiver : MessagingReceiver() {
} }
} }
/**
* Parse the received data from Push. Json format are different depending on the source.
*
* Notifications received by FCM are formatted by the matrix gateway [1]. The data send to FCM is the content
* of the "notification" attribute of the json sent to the gateway [2][3].
* On the other side, with UnifiedPush, the content of the message received is the content posted to the push
* gateway endpoint [3].
*
* *Note*: If we want to get the same content with FCM and unifiedpush, we can do a new sygnal pusher [4].
*
* [1] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py
* [2] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py#L366
* [3] https://spec.matrix.org/latest/push-gateway-api/
* [4] https://github.com/p1gp1g/sygnal/blob/unifiedpush/sygnal/upfcmpushkin.py (Not tested for a while)
*/
private fun parseData(message: ByteArray): PushData? {
val sMessage = String(message)
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
Timber.tag(loggerTag.value).d("## onMessage() $sMessage")
}
val moshi = MatrixJsonParser.getMoshi()
return if (unifiedPushHelper.isEmbeddedDistributor()) {
moshi.adapter(PushDataFcm::class.java).fromJson(sMessage)?.toPushData()
} else {
moshi.adapter(PushDataUnifiedPush::class.java).fromJson(sMessage)?.toPushData()
}
}
/** /**
* Called if InstanceID token is updated. This may occur if the security of * Called if InstanceID token is updated. This may occur if the security of
* the previous token had been compromised. Note that this is also called * the previous token had been compromised. Note that this is also called