Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing onBackgroundPushReceived method #426

Closed
wants to merge 3 commits into from
Closed

Add missing onBackgroundPushReceived method #426

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3e4916
handle notifications from a cold start
MaximBelov Apr 19, 2024
5446425
Add onBackgroundPushReceived method
MaximBelov Apr 19, 2024
93ebe85
Revert "handle notifications from a cold start"
MaximBelov Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions cordova-airship/src/android/AirshipCordova.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,27 @@

package com.urbanairship.cordova

import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.os.Build
import com.urbanairship.Autopilot
import com.urbanairship.PendingResult
import com.urbanairship.UALog
import com.urbanairship.actions.ActionResult
import com.urbanairship.android.framework.proxy.EventType
import com.urbanairship.android.framework.proxy.Utils
import com.urbanairship.android.framework.proxy.events.EventEmitter
import com.urbanairship.android.framework.proxy.proxies.AirshipProxy
import com.urbanairship.android.framework.proxy.proxies.FeatureFlagProxy
import com.urbanairship.json.JsonList
import com.urbanairship.json.JsonMap
import com.urbanairship.json.JsonSerializable
import com.urbanairship.json.JsonValue
import com.urbanairship.json.jsonMapOf
import com.urbanairship.push.NotificationInfo
import com.urbanairship.push.PushManager
import com.urbanairship.push.PushMessage
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
Expand All @@ -37,6 +44,7 @@ class AirshipCordova : CordovaPlugin() {
)

private var listeners: MutableMap<EventType, MutableList<Listener>> = mutableMapOf()
private val notificationStack: MutableMap<EventType, MutableList<NotificationInfo>> = mutableMapOf()

companion object {
private val EVENT_NAME_MAP = mapOf(
Expand Down Expand Up @@ -87,6 +95,33 @@ class AirshipCordova : CordovaPlugin() {
notifyPendingEvents()
}
}

cordova.getThreadPool().execute {
try {
notifyListeners(
EventType.BACKGROUND_NOTIFICATION_RESPONSE_RECEIVED,
MaximBelov marked this conversation as resolved.
Show resolved Hide resolved
cordova.getActivity().intent
)
} catch (e: java.lang.Exception) {
val msg = e.toString()
UALog.e { msg }
}
}

}

override fun onNewIntent(intent: Intent?) {
try {
super.onNewIntent(intent)
notifyListeners(
EventType.BACKGROUND_NOTIFICATION_RESPONSE_RECEIVED,
intent!!
)
} catch (e: java.lang.Exception) {
val msg = e.toString()
UALog.e { msg }

}
}

override fun onReset() {
Expand All @@ -97,6 +132,34 @@ class AirshipCordova : CordovaPlugin() {
override fun onDestroy() {
super.onDestroy()
this.listeners.clear()
this.notificationStack.clear()
}

@SuppressLint("RestrictedApi")
private fun notifyListeners(eventType: EventType, intent: Intent) {
val data = intent.extras
if (data != null && data.containsKey(PushManager.EXTRA_PUSH_MESSAGE_BUNDLE)) {
val dataString = data.toString();
UALog.i { "Notification message on new intent: $dataString" }
val message = PushMessage.fromIntent(intent) ?: return
val id: Int = intent.getIntExtra(PushManager.EXTRA_NOTIFICATION_ID, -1)
val tag: String? = intent.getStringExtra(PushManager.EXTRA_NOTIFICATION_TAG)
val notificationInfo = NotificationInfo(message, id, tag)
val listeners = this.listeners[eventType];
val pluginResult = jsonMapOf(
"pushPayload" to Utils.notificationMap(
notificationInfo.message,
),
).pluginResult()
if (listeners?.isNotEmpty() == true) {
listeners.forEach { listener ->
pluginResult.keepCallback = true
listener.callbackContext.sendPluginResult(pluginResult)
}
} else {
this.notificationStack.getOrPut(eventType) { mutableListOf() }.add(notificationInfo)
MaximBelov marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

private fun addListener(args: JSONArray, callbackContext: CallbackContext) {
Expand All @@ -117,6 +180,18 @@ class AirshipCordova : CordovaPlugin() {
)

this.listeners.getOrPut(event) { mutableListOf() }.add(listener)

this.notificationStack[event]?.forEach { notificationInfo ->
val pluginResult = jsonMapOf(
"pushPayload" to Utils.notificationMap(
notificationInfo.message,
),
).pluginResult()
pluginResult.keepCallback = true
listener.callbackContext.sendPluginResult(pluginResult)
this.notificationStack[event]?.remove(notificationInfo)
}

notifyPendingEvents()
}

Expand Down