Skip to content

Make NotifierManager.onUserNotification and NotifierManager.onNotificationClicked public on iOS API #131

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

Merged
mirzemehdi merged 2 commits into from
Mar 20, 2025
Merged

Make NotifierManager.onUserNotification and NotifierManager.onNotificationClicked public on iOS API #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2062b16
Make iOS-specific notification forwarding methods public
zsmb13 Mar 19, 2025
c92d989
Use Dispatchers.Main.immediate when initializing FirebasePushNotifier…
zsmb13 Mar 19, 2025
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
6 changes: 6 additions & 0 deletions kmpnotifier/api/kmpnotifier.klib.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,9 @@ final object com.mmk.kmpnotifier.notification/NotifierManager { // com.mmk.kmpno

// Targets: [ios]
final fun (com.mmk.kmpnotifier.notification/NotifierManager).com.mmk.kmpnotifier.extensions/onApplicationDidReceiveRemoteNotification(kotlin.collections/Map<kotlin/Any?, *>) // com.mmk.kmpnotifier.extensions/onApplicationDidReceiveRemoteNotification|onApplicationDidReceiveRemoteNotification@com.mmk.kmpnotifier.notification.NotifierManager(kotlin.collections.Map<kotlin.Any?,*>){}[0]

// Targets: [ios]
final fun (com.mmk.kmpnotifier.notification/NotifierManager).com.mmk.kmpnotifier.extensions/onNotificationClicked(platform.UserNotifications/UNNotificationContent) // com.mmk.kmpnotifier.extensions/onNotificationClicked|onNotificationClicked@com.mmk.kmpnotifier.notification.NotifierManager(platform.UserNotifications.UNNotificationContent){}[0]

// Targets: [ios]
final fun (com.mmk.kmpnotifier.notification/NotifierManager).com.mmk.kmpnotifier.extensions/onUserNotification(platform.UserNotifications/UNNotificationContent) // com.mmk.kmpnotifier.extensions/onUserNotification|onUserNotification@com.mmk.kmpnotifier.notification.NotifierManager(platform.UserNotifications.UNNotificationContent){}[0]
6 changes: 3 additions & 3 deletions kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/extensions/NotifierManagerExt.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public fun NotifierManager.onApplicationDidReceiveRemoteNotification(userInfo: M
}
}

internal fun NotifierManager.onUserNotification(notificationContent: UNNotificationContent) {
public fun NotifierManager.onUserNotification(notificationContent: UNNotificationContent) {
val userInfo = notificationContent.userInfo
val payloadData = userInfo.asPayloadData()
val hasNotification = notificationContent.title != null || notificationContent.body != null
Expand All @@ -50,7 +50,7 @@ internal fun NotifierManager.onUserNotification(notificationContent: UNNotificat
}
}

internal fun NotifierManager.onNotificationClicked(notificationContent: UNNotificationContent) {
public fun NotifierManager.onNotificationClicked(notificationContent: UNNotificationContent) {
NotifierManagerImpl.onNotificationClicked(notificationContent.userInfo.asPayloadData())
}

Expand All @@ -75,4 +75,4 @@ internal fun Map<Any?, *>?.asPayloadData(): PayloadData {

private fun UNNotificationContent.isPushNotification(): Boolean {
return userInfo.containsKey(KEY_IOS_FIREBASE_NOTIFICATION)
}
}
11 changes: 7 additions & 4 deletions kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/firebase/FirebasePushNotifierImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import com.mmk.kmpnotifier.notification.IosNotifier
import com.mmk.kmpnotifier.notification.NotifierManagerImpl
import com.mmk.kmpnotifier.notification.PushNotifier
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import platform.UIKit.UIApplication
import platform.UIKit.registerForRemoteNotifications
Expand All @@ -22,18 +25,18 @@ internal class FirebasePushNotifierImpl : PushNotifier {

private val firebaseMessageDelegate by lazy { FirebaseMessageDelegate() }

private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)

init {
MainScope().launch {
currentLogger.log("FirebasePushNotifier is initialized")
scope.launch {
currentLogger.log("FirebasePushNotifier is initializing")
UNUserNotificationCenter.currentNotificationCenter().delegate =
IosNotifier.NotificationDelegate()
FIRMessaging.messaging().delegate = firebaseMessageDelegate
UIApplication.sharedApplication.registerForRemoteNotifications()
}

}


override suspend fun getToken(): String? = suspendCoroutine { cont ->
FIRMessaging.messaging().tokenWithCompletion { token, error ->
cont.resume(token)
Expand Down
Loading