react-native-push-signal 0.1.1 → 0.1.3

package/README.md

@@ -44,6 +44,10 @@ const credentials = await getCredentials();
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -70,7 +74,7 @@ Keep Apple `.p8` keys and the Firebase service account on the server. The app ne
 2. Enable **Background Modes → Remote notifications**.
 3. Use a physical device. The simulator cannot register with APNs.
 
-The library hooks `UNUserNotificationCenter` and APNs token callbacks, so the host `AppDelegate` does not need extra code.
+The library hooks `UNUserNotificationCenter` at launch (before JS starts) and APNs token callbacks, so the host `AppDelegate` does not need extra code. Foreground pushes only reach JS if this delegate is installed before launch finishes.
 
 ## Android setup
 
@@ -112,13 +116,20 @@ If the host app already declares its own `FirebaseMessagingService`, only one se
 
 ## Incoming messages vs taps
 
-- `onMessage` — the push arrived while the app is in the foreground (and Android data messages while the process is alive). The library does not draw a banner.
+| App state | iOS | Android (notification payload) | Android (data-only) |
+| --- | --- | --- | --- |
+| Foreground | `onMessage`. Banner if a listener returns `true` | `onMessage`. Banner if a listener returns `true` | `onMessage`. Tray only if a listener returns `true` and the payload has title or body |
+| Background / killed | System banner. Tap → `onNotificationPress` | System banner. Tap → `onNotificationPress` | No banner. `onMessage` if the process is alive |
+
+- `onMessage` — the push arrived while the app is in the foreground (and Android data messages while the process is alive). Return `true` to show the system banner as usual. No return, `false`, or a throw means no banner. If several listeners are registered, the banner shows when any of them returns `true`.
 - `onNotificationPress` — the user opened the notification, including a cold start.
 - On iOS, a visible push received in the background or when the app is killed is delivered on tap, not through `onMessage`. That is an OS limit.
 
+If `onMessage` throws or takes longer than about 2 seconds, the library does not show a banner.
+
 ## Web
 
-`initialize()` resolves. `getCredentials()` throws. Listeners are no-ops.
+`initialize()` resolves. `getCredentials()` throws. Listeners (`onMessage`, `onNotificationPress`) are no-ops.
 
 ## Contributing
 

package/README.ru.md

@@ -44,6 +44,10 @@ const credentials = await getCredentials();
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -70,7 +74,7 @@ const stopPress = onNotificationPress((message) => {
 2. Включите **Background Modes → Remote notifications**.
 3. Проверяйте на физическом устройстве. Симулятор не умеет регистрироваться в APNs.
 
-Библиотека сама подписывается на `UNUserNotificationCenter` и колбеки APNs-токена. В `AppDelegate` хоста ничего дописывать не нужно.
+Библиотека сама ставит делегат `UNUserNotificationCenter` на запуске (до JS) и подписывается на колбеки APNs-токена. В `AppDelegate` хоста ничего дописывать не нужно. Без делегата до конца запуска iOS не вызывает `willPresent`, и пуш в foreground не доходит до JS.
 
 ## Настройка Android
 
@@ -112,13 +116,20 @@ apply plugin: "com.google.gms.google-services"
 
 ## Входящее сообщение и тап
 
-- `onMessage` — пуш пришёл, пока приложение на переднем плане (и Android data-message, пока процесс жив). Баннер библиотека не рисует.
+| Состояние | iOS | Android (notification payload) | Android (data-only) |
+| --- | --- | --- | --- |
+| Foreground | `onMessage`. Баннер, если слушатель вернул `true` | `onMessage`. Баннер, если слушатель вернул `true` | `onMessage`. Tray только если слушатель вернул `true` и в payload есть title или body |
+| Background / killed | Системный баннер. Тап → `onNotificationPress` | Системный баннер. Тап → `onNotificationPress` | Баннера нет. `onMessage`, если процесс жив |
+
+- `onMessage` — пуш пришёл, пока приложение на переднем плане (и Android data-message, пока процесс жив). Верните `true`, чтобы показать системный баннер как обычно. Без return, `false` или ошибка — баннера нет. Если слушателей несколько, баннер показывается, когда любой вернул `true`.
 - `onNotificationPress` — пользователь открыл уведомление, в том числе при холодном старте.
 - На iOS видимый пуш в фоне или при убитом приложении приходит только в тап, не в `onMessage`. Это ограничение ОС.
 
+Если `onMessage` бросил ошибку или не ответил примерно за 2 секунды, баннер не показывается.
+
 ## Web
 
-`initialize()` резолвится. `getCredentials()` бросает ошибку. Слушатели ничего не делают.
+`initialize()` резолвится. `getCredentials()` бросает ошибку. Слушатели (`onMessage`, `onNotificationPress`) ничего не делают.
 
 ## Contributing
 

package/android/build.gradle

@@ -43,6 +43,7 @@ android {
 
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
+    consumerProguardFiles "consumer-rules.pro"
 
     externalNativeBuild {
       cmake {

package/android/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keep class com.margelo.nitro.pushsignal.PushSignalMessagingService { *; }
+-keep class com.margelo.nitro.pushsignal.PushSignalInitProvider { *; }
+-keep class com.margelo.nitro.pushsignal.PushSignalCenter { *; }
+-keep class com.google.firebase.messaging.** { *; }

package/android/src/main/java/com/margelo/nitro/pushsignal/PushSignal.kt

@@ -28,7 +28,7 @@ class PushSignal : HybridPushSignalSpec() {
     }
   }
 
-  override fun setOnMessage(callback: (message: PushMessage) -> Unit) {
+  override fun setOnMessage(callback: (message: PushMessage) -> Promise<Promise<Boolean>>) {
     PushSignalCenter.setOnMessage(callback)
   }
 

package/android/src/main/java/com/margelo/nitro/pushsignal/PushSignalCenter.kt

@@ -2,29 +2,44 @@ package com.margelo.nitro.pushsignal
 
 import android.app.Activity
 import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import androidx.activity.ComponentActivity
+import androidx.core.app.NotificationCompat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.android.gms.tasks.Tasks
 import com.google.firebase.messaging.RemoteMessage
+import com.margelo.nitro.core.Promise
 import java.util.Collections
+import java.util.UUID
 import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
 
 internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
   private const val EXTRA_HANDLED = "pushsignal.handled"
+  private const val CHANNEL_ID = "push_signal_default"
+  private const val FOREGROUND_TIMEOUT_MS = 2_000L
 
   private val lock = Any()
+  private val mainHandler = Handler(Looper.getMainLooper())
   @Volatile private var application: Application? = null
   @Volatile private var currentActivity: Activity? = null
-  @Volatile private var onMessage: ((PushMessage) -> Unit)? = null
+  @Volatile private var onMessage: ((PushMessage) -> Promise<Promise<Boolean>>)? = null
   @Volatile private var onNotificationPress: ((PushMessage) -> Unit)? = null
   @Volatile private var pendingPress: PushMessage? = null
+  private val pendingMessages = CopyOnWriteArrayList<PushMessage>()
   private val registeredActivities = Collections.newSetFromMap(WeakHashMap<Activity, Boolean>())
+  @Volatile private var startedActivityCount = 0
   @Volatile private var pendingFirebaseConfig: AndroidFirebaseConfig? = null
   private val initializeWaiters = CopyOnWriteArrayList<(Exception?) -> Unit>()
 
@@ -63,8 +78,24 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     onDone(applyFirebaseConfig(context, config))
   }
 
-  fun setOnMessage(callback: (PushMessage) -> Unit) {
+  fun setOnMessage(callback: (PushMessage) -> Promise<Promise<Boolean>>) {
     onMessage = callback
+    val queued = pendingMessages.toList()
+    pendingMessages.clear()
+    queued.forEach { message ->
+      runOnMain {
+        val inForeground = startedActivityCount > 0 || currentActivity != null
+        resolveShouldShowBanner(message) { shouldShow ->
+          if (
+            shouldShow &&
+            inForeground &&
+            (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
+          ) {
+            postForegroundNotification(message)
+          }
+        }
+      }
+    }
   }
 
   fun setOnNotificationPress(callback: (PushMessage) -> Unit) {
@@ -112,12 +143,133 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     return token
   }
 
-  fun emitMessage(message: PushMessage) {
-    onMessage?.invoke(message)
+  fun emitMessage(remoteMessage: RemoteMessage) {
+    val message = remoteMessage.toPushMessage()
+    runOnMain {
+      val callback = onMessage
+      if (callback == null) {
+        pendingMessages.add(message)
+        return@runOnMain
+      }
+
+      val inForeground = startedActivityCount > 0 || currentActivity != null
+      resolveShouldShowBanner(message) { shouldShow ->
+        if (
+          shouldShow &&
+          inForeground &&
+          (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
+        ) {
+          postForegroundNotification(message)
+        }
+      }
+    }
   }
 
-  fun emitMessage(remoteMessage: RemoteMessage) {
-    emitMessage(remoteMessage.toPushMessage())
+  private fun runOnMain(block: () -> Unit) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      block()
+    } else {
+      mainHandler.post(block)
+    }
+  }
+
+  private fun resolveShouldShowBanner(
+    message: PushMessage,
+    onDone: (Boolean) -> Unit
+  ) {
+    val callback = onMessage
+    if (callback == null) {
+      onDone(false)
+      return
+    }
+
+    val delivered = AtomicBoolean(false)
+    val timeout = Runnable {
+      if (delivered.compareAndSet(false, true)) {
+        onDone(true)
+      }
+    }
+    mainHandler.postDelayed(timeout, FOREGROUND_TIMEOUT_MS)
+
+    val finish = { shouldShow: Boolean ->
+      if (delivered.compareAndSet(false, true)) {
+        mainHandler.removeCallbacks(timeout)
+        onDone(shouldShow)
+      }
+    }
+
+    try {
+      callback(message)
+        .then { inner ->
+          inner
+            .then { shouldShow -> finish(shouldShow) }
+            .catch { finish(true) }
+        }
+        .catch { finish(true) }
+    } catch (_: Throwable) {
+      finish(true)
+    }
+  }
+
+  private fun postForegroundNotification(message: PushMessage) {
+    val context = application ?: return
+    val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+      ?: return
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val existing = manager.getNotificationChannel(CHANNEL_ID)
+      if (existing == null) {
+        manager.createNotificationChannel(
+          NotificationChannel(
+            CHANNEL_ID,
+            "Notifications",
+            NotificationManager.IMPORTANCE_HIGH
+          )
+        )
+      }
+    }
+
+    val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+      ?: return
+    launchIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+    launchIntent.putExtra("google.message_id", message.id ?: UUID.randomUUID().toString())
+    message.title?.let { launchIntent.putExtra("gcm.notification.title", it) }
+    message.body?.let { launchIntent.putExtra("gcm.notification.body", it) }
+    message.data.forEach { (key, value) ->
+      launchIntent.putExtra(key, value)
+    }
+
+    val requestCode = (message.id ?: message.title ?: "push").hashCode()
+    val pendingIntent = PendingIntent.getActivity(
+      context,
+      requestCode,
+      launchIntent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+
+    val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+      .setSmallIcon(smallIcon(context))
+      .setContentTitle(message.title.orEmpty())
+      .setContentText(message.body.orEmpty())
+      .setContentIntent(pendingIntent)
+      .setAutoCancel(true)
+      .setPriority(NotificationCompat.PRIORITY_HIGH)
+      .setDefaults(NotificationCompat.DEFAULT_SOUND)
+      .setNumber(1)
+
+    manager.notify(requestCode, builder.build())
+  }
+
+  private fun smallIcon(context: Context): Int {
+    val named = context.resources.getIdentifier("ic_notification", "drawable", context.packageName)
+    if (named != 0) {
+      return named
+    }
+    val appIcon = context.applicationInfo.icon
+    if (appIcon != 0) {
+      return appIcon
+    }
+    return android.R.drawable.stat_notify_more
   }
 
   override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
@@ -126,7 +278,10 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     handleIntent(activity.intent)
   }
 
-  override fun onActivityStarted(activity: Activity) = Unit
+  override fun onActivityStarted(activity: Activity) {
+    currentActivity = activity
+    startedActivityCount += 1
+  }
 
   override fun onActivityResumed(activity: Activity) {
     currentActivity = activity
@@ -139,7 +294,12 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     }
   }
 
-  override fun onActivityStopped(activity: Activity) = Unit
+  override fun onActivityStopped(activity: Activity) {
+    startedActivityCount = (startedActivityCount - 1).coerceAtLeast(0)
+    if (currentActivity === activity) {
+      currentActivity = null
+    }
+  }
 
   override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
 
@@ -171,6 +331,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
 
   private fun applyFirebaseConfig(context: Context, config: AndroidFirebaseConfig): Exception? {
     if (FirebaseApp.getApps(context).isNotEmpty()) {
+      FirebaseMessaging.getInstance().isAutoInitEnabled = true
       return null
     }
 
@@ -187,6 +348,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
           .setGcmSenderId(config.project_number!!.trim())
           .build()
       FirebaseApp.initializeApp(context, options)
+      FirebaseMessaging.getInstance().isAutoInitEnabled = true
       null
     } catch (error: Exception) {
       error

package/android/src/main/java/com/margelo/nitro/pushsignal/PushSignalMessagingService.kt

@@ -9,7 +9,12 @@ class PushSignalMessagingService : FirebaseMessagingService() {
     PushSignalCenter.attach(applicationContext)
   }
 
+  override fun onNewToken(token: String) {
+    PushSignalCenter.attach(applicationContext)
+  }
+
   override fun onMessageReceived(message: RemoteMessage) {
+    PushSignalCenter.attach(applicationContext)
     PushSignalCenter.emitMessage(message)
   }
 }

package/ios/PushSignal.swift

@@ -19,7 +19,7 @@ class PushSignal: HybridPushSignalSpec {
     }
   }
 
-  func setOnMessage(callback: @escaping (PushMessage) -> Void) throws {
+  func setOnMessage(callback: @escaping (PushMessage) -> Promise<Promise<Bool>>) throws {
     PushSignalCenter.shared.onMessage = callback
   }
 

package/ios/PushSignalCenter.swift

@@ -1,4 +1,5 @@
 import Foundation
+import NitroModules
 import ObjectiveC
 import UIKit
 import UserNotifications
@@ -12,16 +13,31 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     shared.install()
   }
 
+  /// Called from ObjC `+load` / launch notifications so the UNUserNotificationCenter
+  /// delegate is set before the app finishes launching. If this happens after JS loads,
+  /// iOS never calls `willPresent` and foreground pushes never reach JS.
+  @objc static func installEarly() {
+    shared.install()
+  }
+
   private let lock = NSLock()
   private var didInstall = false
+  private var didSwizzleNotificationCenter = false
   private var deviceToken: String?
   private var registrationError: Error?
   private var tokenWaiters: [(Result<String, Error>) -> Void] = []
   private var pendingPress: PushMessage?
+  private var pendingMessages: [PushMessage] = []
   private var pendingLaunchOptions: [AnyHashable: Any]?
   private var didCaptureLaunchNotification = false
+  private var recentMessageIds: [String: Date] = [:]
+  private weak var forwardingDelegate: UNUserNotificationCenterDelegate?
 
-  var onMessage: ((PushMessage) -> Void)?
+  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)? {
+    didSet {
+      flushPendingMessages()
+    }
+  }
   var onNotificationPress: ((PushMessage) -> Void)? {
     didSet {
       flushPendingPress()
@@ -29,13 +45,21 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   }
 
   func install() {
-    DispatchQueue.main.async {
-      self.installOnMain()
+    if Thread.isMainThread {
+      installOnMain()
+    } else {
+      DispatchQueue.main.async {
+        self.installOnMain()
+      }
     }
   }
 
   private func installOnMain() {
+    swizzleNotificationCenterDelegateIfNeeded()
+
     guard !didInstall else {
+      UNUserNotificationCenter.current().delegate = self
+      swizzleAppDelegate()
       captureLaunchNotificationIfNeeded()
       return
     }
@@ -46,6 +70,12 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     captureLaunchNotificationIfNeeded()
   }
 
+  func rememberForwardingDelegate(_ delegate: UNUserNotificationCenterDelegate?) {
+    if let delegate, delegate !== self {
+      forwardingDelegate = delegate
+    }
+  }
+
   func fetchCredentials() async throws -> PushCredentials {
     await MainActor.run {
       self.installOnMain()
@@ -69,22 +99,39 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     finishRegistration(result: .failure(error))
   }
 
-  func userNotificationCenter(
+  @objc func userNotificationCenter(
     _ center: UNUserNotificationCenter,
     willPresent notification: UNNotification,
     withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
   ) {
-    emitMessage(Self.message(from: notification))
-    completionHandler([])
+    let message = Self.message(from: notification)
+    Task {
+      let shouldShow = await self.deliverMessage(message)
+      let ours: UNNotificationPresentationOptions = shouldShow ? Self.foregroundPresentationOptions : []
+      await MainActor.run {
+        self.forwardWillPresent(
+          center,
+          notification: notification,
+          ourOptions: ours,
+          completionHandler: completionHandler
+        )
+      }
+    }
   }
 
-  func userNotificationCenter(
+  @objc func userNotificationCenter(
     _ center: UNUserNotificationCenter,
     didReceive response: UNNotificationResponse,
     withCompletionHandler completionHandler: @escaping () -> Void
   ) {
     emitPress(Self.message(from: response.notification))
-    completionHandler()
+    if forwardingDelegate?.responds(
+      to: #selector(UNUserNotificationCenterDelegate.userNotificationCenter(_:didReceive:withCompletionHandler:))
+    ) == true {
+      forwardingDelegate?.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler)
+    } else {
+      completionHandler()
+    }
   }
 
   private func waitForToken() async throws -> String {
@@ -152,10 +199,125 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     waiters.forEach { $0(result) }
   }
 
-  private func emitMessage(_ message: PushMessage) {
+  private func synchronized<T>(_ body: () -> T) -> T {
+    lock.lock()
+    defer { lock.unlock() }
+    return body()
+  }
+
+  private func deliverMessage(_ message: PushMessage) async -> Bool {
+    guard shouldEmit(message) else {
+      return false
+    }
+
+    let callback = synchronized { onMessage }
+
+    guard let callback else {
+      synchronized { pendingMessages.append(message) }
+      // Still show the system banner so a visible push is not swallowed
+      // before JS has subscribed.
+      return true
+    }
+
+    return await invokeOnMessage(callback, message: message)
+  }
+
+  private func invokeOnMessage(
+    _ callback: @escaping (PushMessage) -> Promise<Promise<Bool>>,
+    message: PushMessage
+  ) async -> Bool {
+    await withCheckedContinuation { continuation in
+      let resumeLock = NSLock()
+      var resumed = false
+      let finish: (Bool) -> Void = { value in
+        resumeLock.lock()
+        defer { resumeLock.unlock() }
+        guard !resumed else {
+          return
+        }
+        resumed = true
+        continuation.resume(returning: value)
+      }
+
+      DispatchQueue.main.async {
+        Task {
+          do {
+            let inner = try await callback(message).await()
+            let shouldShow = try await inner.await()
+            finish(shouldShow)
+          } catch {
+            finish(true)
+          }
+        }
+      }
+
+      DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+        finish(true)
+      }
+    }
+  }
+
+  private func flushPendingMessages() {
     DispatchQueue.main.async {
-      self.onMessage?(message)
+      let callback = self.synchronized { self.onMessage }
+      let queued = self.synchronized { () -> [PushMessage] in
+        let messages = self.pendingMessages
+        self.pendingMessages.removeAll()
+        return messages
+      }
+      guard let callback, !queued.isEmpty else {
+        return
+      }
+
+      for message in queued {
+        Task {
+          _ = await self.invokeOnMessage(callback, message: message)
+        }
+      }
+    }
+  }
+
+  private func shouldEmit(_ message: PushMessage) -> Bool {
+    let key = message.id ?? "\(message.title ?? "")|\(message.body ?? "")"
+    return synchronized {
+      let now = Date()
+      recentMessageIds = recentMessageIds.filter { now.timeIntervalSince($0.value) < 5 }
+      if let last = recentMessageIds[key], now.timeIntervalSince(last) < 2 {
+        return false
+      }
+      recentMessageIds[key] = now
+      return true
+    }
+  }
+
+  private func forwardWillPresent(
+    _ center: UNUserNotificationCenter,
+    notification: UNNotification,
+    ourOptions: UNNotificationPresentationOptions,
+    completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+  ) {
+    let selector = #selector(
+      UNUserNotificationCenterDelegate.userNotificationCenter(_:willPresent:withCompletionHandler:)
+    )
+    guard let forwardingDelegate, forwardingDelegate.responds(to: selector) else {
+      completionHandler(ourOptions)
+      return
     }
+
+    forwardingDelegate.userNotificationCenter?(
+      center,
+      willPresent: notification,
+      withCompletionHandler: { forwarded in
+        completionHandler(ourOptions.union(forwarded))
+      }
+    )
+  }
+
+  private static var foregroundPresentationOptions: UNNotificationPresentationOptions {
+    if #available(iOS 14.0, *) {
+      return [.banner, .list, .sound, .badge]
+    }
+    return [.alert, .sound, .badge]
   }
 
   private func emitPress(_ message: PushMessage) {
@@ -333,6 +495,25 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     )
   }
 
+  private func swizzleNotificationCenterDelegateIfNeeded() {
+    guard !didSwizzleNotificationCenter else {
+      return
+    }
+    didSwizzleNotificationCenter = true
+
+    let target: AnyClass = UNUserNotificationCenter.self
+    let original = #selector(setter: UNUserNotificationCenter.delegate)
+    let replacement = #selector(UNUserNotificationCenter.pushSignal_setDelegate(_:))
+
+    guard let originalMethod = class_getInstanceMethod(target, original),
+          let replacementMethod = class_getInstanceMethod(target, replacement)
+    else {
+      return
+    }
+
+    method_exchangeImplementations(originalMethod, replacementMethod)
+  }
+
   private func swizzle(target: AnyClass, original: Selector, replacement: Selector, source: AnyClass) {
     guard let replacementMethod = class_getInstanceMethod(source, replacement) else {
       return
@@ -393,3 +574,15 @@ private final class PushSignalAppDelegateHook: NSObject {
     unsafeBitCast(method_getImplementation(method), to: Fn.self)(self, selector, application, error as NSError)
   }
 }
+
+extension UNUserNotificationCenter {
+  @objc func pushSignal_setDelegate(_ delegate: UNUserNotificationCenterDelegate?) {
+    if let delegate, delegate is PushSignalCenter {
+      pushSignal_setDelegate(delegate)
+      return
+    }
+
+    PushSignalCenter.shared.rememberForwardingDelegate(delegate)
+    pushSignal_setDelegate(PushSignalCenter.shared)
+  }
+}