mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

Subscribe to control topic when keepalive message on non-control topic is received

Browse source
This commit is contained in:
Philipp Heckel 2021-12-13 22:00:48 -05:00
parent 957c351c96
commit 042a7dc66b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt
View file

@ -22,6 +22,7 @@ class FirebaseService : FirebaseMessagingService() {
private val job = SupervisorJob() private val job = SupervisorJob()
private val notifier = NotificationService(this) private val notifier = NotificationService(this)
private val broadcaster = BroadcastService(this) private val broadcaster = BroadcastService(this)
private val messenger = FirebaseMessenger()
override fun onMessageReceived(remoteMessage: RemoteMessage) { override fun onMessageReceived(remoteMessage: RemoteMessage) {
// We only process data messages // We only process data messages
@ -33,15 +34,20 @@ class FirebaseService : FirebaseMessagingService() {
// Dispatch event // Dispatch event
val data = remoteMessage.data val data = remoteMessage.data
when (data["event"]) { when (data["event"]) {
ApiService.EVENT_KEEPALIVE -> handleKeepalive() ApiService.EVENT_KEEPALIVE -> handleKeepalive(remoteMessage)
ApiService.EVENT_MESSAGE -> handleMessage(remoteMessage) ApiService.EVENT_MESSAGE -> handleMessage(remoteMessage)
else -> Log.d(TAG, "Discarding unexpected message (2): from=${remoteMessage.from}, data=${data}") else -> Log.d(TAG, "Discarding unexpected message (2): from=${remoteMessage.from}, data=${data}")
} }
} }
private fun handleKeepalive() { private fun handleKeepalive(remoteMessage: RemoteMessage) {
Log.d(TAG, "Keepalive received, sending auto restart broadcast for foregrounds service") Log.d(TAG, "Keepalive received, sending auto restart broadcast for foregrounds service")
sendBroadcast(Intent(this, SubscriberService.AutoRestartReceiver::class.java)) // Restart it if necessary! sendBroadcast(Intent(this, SubscriberService.AutoRestartReceiver::class.java)) // Restart it if necessary!
val topic = remoteMessage.data["topic"]
if (topic != ApiService.CONTROL_TOPIC) {
Log.d(TAG, "Keepalive on non-control topic $topic received, subscribing to control topic ${ApiService.CONTROL_TOPIC}")
messenger.subscribe(ApiService.CONTROL_TOPIC)
}
} }
private fun handleMessage(remoteMessage: RemoteMessage) { private fun handleMessage(remoteMessage: RemoteMessage) {