From 6c80b3a14bd93425e50a54accdd8428c4713ecea Mon Sep 17 00:00:00 2001 From: S1m Date: Fri, 4 Jun 2021 01:23:15 +0200 Subject: [PATCH] embedded distrib with sygnal --- .../gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt | 5 ++--- .../src/main/java/im/vector/app/core/pushers/UPHelper.kt | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt b/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt index 1e7f04f9c3..1ae67c3500 100644 --- a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt +++ b/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt @@ -1,7 +1,6 @@ package im.vector.app.push.fcm import android.content.Context -import im.vector.app.R import org.unifiedpush.android.embedded_fcm_distributor.GetEndpointHandler import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver @@ -23,8 +22,8 @@ import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorRecei val handlerFCM = object: GetEndpointHandler { override fun getEndpoint(context: Context?, token: String, instance: String): String { - // This returns the endpoint of your FCM Rewrite-Proxy - return "${context!!.getString(R.string.pusher_http_url)}/FCM?instance=$instance&token=$token" + // Here token is the FCM Token, used by the gateway (sygnal) + return token } } diff --git a/vector/src/main/java/im/vector/app/core/pushers/UPHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/UPHelper.kt index b8fa15f860..4de1afc716 100644 --- a/vector/src/main/java/im/vector/app/core/pushers/UPHelper.kt +++ b/vector/src/main/java/im/vector/app/core/pushers/UPHelper.kt @@ -125,6 +125,13 @@ object UPHelper { } fun customOrDefaultGateway(context: Context, endpoint: String?): String { + // if we use the embedded distributor, + // register app_id type upfcm on sygnal + // the pushkey if FCM key + val up = Registration() + if (up.getDistributor(context) == context.packageName) + return context.getString(R.string.pusher_http_url) + // else, unifiedpush, and pushkey is an endpoint val default = context.getString(R.string.default_push_gateway_http_url) endpoint?.let { val uri = URI(it)