Merge pull request #57 from mirzemehdi/rel_v1.2.0-alpha02

Release v1.2.0 alpha02
mirzemehdi · Aug 6, 2024 · 01b77e4 · 01b77e4
2 parents acf5e45 + cb33f36
commit 01b77e4
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 allprojects {
     group = "io.github.mirzemehdi"
-    version = "1.2.0-alpha"
+    version = "1.2.0-alpha02"
     val sonatypeUsername = gradleLocalProperties(rootDir).getProperty("sonatypeUsername")
     val sonatypePassword = gradleLocalProperties(rootDir).getProperty("sonatypePassword")
     val gpgKeySecret = gradleLocalProperties(rootDir).getProperty("gpgKeySecret")

diff --git a/kmpnotifier/api/android/kmpnotifier.api b/kmpnotifier/api/android/kmpnotifier.api
@@ -114,12 +114,12 @@ public final class com/mmk/kmpnotifier/permission/AndroidPermissionUtilKt {
 }
 
 public abstract interface class com/mmk/kmpnotifier/permission/PermissionUtil {
-	public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function0;)V
+	public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function1;)V
 	public abstract fun hasNotificationPermission (Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class com/mmk/kmpnotifier/permission/PermissionUtil$DefaultImpls {
-	public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+	public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static synthetic fun hasNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
diff --git a/kmpnotifier/api/jvm/kmpnotifier.api b/kmpnotifier/api/jvm/kmpnotifier.api
@@ -104,12 +104,12 @@ public final class com/mmk/kmpnotifier/notification/configuration/NotificationPl
 }
 
 public abstract interface class com/mmk/kmpnotifier/permission/PermissionUtil {
-	public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function0;)V
+	public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function1;)V
 	public abstract fun hasNotificationPermission (Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class com/mmk/kmpnotifier/permission/PermissionUtil$DefaultImpls {
-	public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+	public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static synthetic fun hasNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
diff --git a/...tifier/src/androidMain/kotlin/com/mmk/kmpnotifier/permission/AndroidMockPermissionUtil.kt b/...tifier/src/androidMain/kotlin/com/mmk/kmpnotifier/permission/AndroidMockPermissionUtil.kt
@@ -13,7 +13,7 @@ internal class AndroidMockPermissionUtil(private val context: Context) : Permiss
         onPermissionResult(context.hasNotificationPermission())
     }
 
-    override fun askNotificationPermission(onPermissionGranted: () -> Unit) = Unit.also {
+    override fun askNotificationPermission(onPermissionResult: (Boolean) -> Unit) = Unit.also {
         println(
             "In Android this function is just a mock. You need to ask permission in Activity " +
                     "using like below: \n" +

diff --git a/kmpnotifier/src/commonMain/kotlin/com/mmk/kmpnotifier/permission/EmptyPermissionUtilImpl.kt b/kmpnotifier/src/commonMain/kotlin/com/mmk/kmpnotifier/permission/EmptyPermissionUtilImpl.kt
@@ -6,8 +6,8 @@ internal class EmptyPermissionUtilImpl : PermissionUtil {
         onPermissionResult(true)
     }
 
-    override fun askNotificationPermission(onPermissionGranted: () -> Unit) {
+    override fun askNotificationPermission(onPermissionResult: (Boolean) -> Unit) {
         println("Not implemented: granted permission by default")
-        onPermissionGranted()
+        onPermissionResult(true)
     }
 }
diff --git a/kmpnotifier/src/commonMain/kotlin/com/mmk/kmpnotifier/permission/PermissionUtil.kt b/kmpnotifier/src/commonMain/kotlin/com/mmk/kmpnotifier/permission/PermissionUtil.kt
@@ -6,6 +6,6 @@ package com.mmk.kmpnotifier.permission
 public interface PermissionUtil {
 
 
-    public fun hasNotificationPermission(onPermissionResult: (Boolean) -> Unit = {})
-    public fun askNotificationPermission(onPermissionGranted: () -> Unit = {})
+    public fun hasNotificationPermission(onPermissionResult: (isGranted: Boolean) -> Unit = {})
+    public fun askNotificationPermission(onPermissionResult: (isGranted: Boolean) -> Unit = {})
 }
diff --git a/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/extensions/NotifierManagerExt.ios.kt b/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/extensions/NotifierManagerExt.ios.kt
@@ -29,7 +29,8 @@ public fun NotifierManager.onApplicationDidReceiveRemoteNotification(userInfo: M
 
 internal fun NotifierManager.onUserNotification(notificationContent: UNNotificationContent) {
     val userInfo = notificationContent.userInfo
-    if (notificationContent.isPushNotification()) NotifierManagerImpl.onPushNotification(
+    val hasNotification = notificationContent.title != null || notificationContent.body != null
+    if (notificationContent.isPushNotification() && hasNotification) NotifierManagerImpl.onPushNotification(
         title = notificationContent.title,
         body = notificationContent.body
     )

diff --git a/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/firebase/FirebasePushNotifierImpl.kt b/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/firebase/FirebasePushNotifierImpl.kt
@@ -17,11 +17,13 @@ import kotlin.coroutines.suspendCoroutine
 @OptIn(ExperimentalForeignApi::class)
 internal class FirebasePushNotifierImpl : PushNotifier {
 
+    private val firebaseMessageDelegate by lazy { FirebaseMessageDelegate() }
+
     init {
         MainScope().launch {
             println("FirebasePushNotifier is initialized")
+            FIRMessaging.messaging().delegate = firebaseMessageDelegate
             UIApplication.sharedApplication.registerForRemoteNotifications()
-            FIRMessaging.messaging().delegate = FirebaseMessageDelegate()
         }
 
     }

diff --git a/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/permission/IosPermissionUtil.kt b/kmpnotifier/src/iosMain/kotlin/com/mmk/kmpnotifier/permission/IosPermissionUtil.kt
@@ -7,7 +7,8 @@ import platform.UserNotifications.UNAuthorizationOptionSound
 import platform.UserNotifications.UNAuthorizationStatusAuthorized
 import platform.UserNotifications.UNUserNotificationCenter
 
-internal class IosPermissionUtil(private val notificationCenter: UNUserNotificationCenter) : PermissionUtil {
+internal class IosPermissionUtil(private val notificationCenter: UNUserNotificationCenter) :
+    PermissionUtil {
     companion object {
         val NOTIFICATION_PERMISSIONS =
             UNAuthorizationOptionAlert or
@@ -21,13 +22,13 @@ internal class IosPermissionUtil(private val notificationCenter: UNUserNotificat
         }
     }
 
-    override fun askNotificationPermission(onPermissionGranted: () -> Unit) {
+    override fun askNotificationPermission(onPermissionResult: (Boolean) -> Unit) {
         notificationCenter.requestAuthorizationWithOptions(NOTIFICATION_PERMISSIONS) { isGranted, _ ->
             if (isGranted) {
                 UNUserNotificationCenter.currentNotificationCenter().delegate =
                     IosNotifier.NotificationDelegate()
-                onPermissionGranted()
             }
+            onPermissionResult(isGranted)
         }
     }
 }
diff --git a/kmpnotifier/src/jsMain/kotlin/com/mmk/kmpnotifier/permission/WebPermissionUtilImpl.kt b/kmpnotifier/src/jsMain/kotlin/com/mmk/kmpnotifier/permission/WebPermissionUtilImpl.kt
@@ -10,9 +10,9 @@ internal class WebPermissionUtilImpl : PermissionUtil {
         onPermissionResult(permission == NotificationPermission.GRANTED)
     }
 
-    override fun askNotificationPermission(onPermissionGranted: () -> Unit) {
+    override fun askNotificationPermission(onPermissionResult: (Boolean) -> Unit) {
         Notification.requestPermission().then {
-            onPermissionGranted()
+            onPermissionResult(it == NotificationPermission.GRANTED)
             null
         }
     }

diff --git a/kmpnotifier/src/wasmJsMain/kotlin/com/mmk/kmpnotifier/permission/WebPermissionUtilImpl.kt b/kmpnotifier/src/wasmJsMain/kotlin/com/mmk/kmpnotifier/permission/WebPermissionUtilImpl.kt
@@ -10,9 +10,9 @@ internal class WebPermissionUtilImpl : PermissionUtil {
         onPermissionResult(permission == NotificationPermission.GRANTED)
     }
 
-    override fun askNotificationPermission(onPermissionGranted: () -> Unit) {
+    override fun askNotificationPermission(onPermissionResult: (Boolean) -> Unit) {
         Notification.requestPermission().then {
-            onPermissionGranted()
+            onPermissionResult(it == NotificationPermission.GRANTED)
             null
         }
     }