react-native-push-signal 0.1.0 → 0.1.2

package/README.md

@@ -2,7 +2,7 @@
 
 English | [Русский](README.ru.md)
 
-Get push permission, device credentials for your server, and listen for incoming notifications or taps. The library does not send pushes — your backend talks to APNs and FCM.
+Get device credentials for your server and listen for incoming notifications or taps. The library does not send pushes — your backend talks to APNs and FCM. Request notification permission yourself with [`react-native-permissions`](https://github.com/zoontek/react-native-permissions).
 
 ## Installation
 
@@ -15,29 +15,39 @@ npm install react-native-push-signal react-native-nitro-modules
 ## Usage
 
 ```ts
+import {
+  checkNotifications,
+  requestNotifications,
+  RESULTS,
+} from 'react-native-permissions';
 import {
   getCredentials,
-  getPermissionStatus,
   initialize,
   onMessage,
   onNotificationPress,
-  requestPermission,
 } from 'react-native-push-signal';
 
-initialize({
-  projectId: 'my-project',
-  applicationId: '1:123456789:android:abcd',
-  apiKey: 'AIza...',
-  gcmSenderId: '123456789',
+await initialize({
+  project_id: 'my-project',
+  mobilesdk_app_id: '1:123456789:android:abcd',
+  current_key: 'AIza...',
+  project_number: '123456789',
 });
 
-const status = await getPermissionStatus();
-const afterRequest = await requestPermission();
+const { status } = await checkNotifications();
+if (status !== RESULTS.GRANTED) {
+  await requestNotifications(['alert', 'badge', 'sound']);
+}
+
 const credentials = await getCredentials();
 // POST credentials to your server: { platform, token, environment? }
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -75,15 +85,15 @@ Remote Android pushes go through FCM. You can either pass the client Firebase fi
 Call `initialize` with values from `google-services.json` (not a service account):
 
 ```ts
-initialize({
-  projectId: '...',       // project_id
-  applicationId: '...',   // mobilesdk_app_id
-  apiKey: '...',          // current_key
-  gcmSenderId: '...',     // project_number
+await initialize({
+  project_id: '...',
+  mobilesdk_app_id: '...',
+  current_key: '...',
+  project_number: '...',
 });
 ```
 
-All four fields are required for Firebase to start. If any is missing, `initialize` does nothing and does not throw. iOS ignores this call.
+All four fields are required for Firebase to start. If any is missing, `initialize` resolves and does nothing. iOS ignores the config and still resolves the promise.
 
 Keep the Firebase service account on your server. Do not put it in the app.
 
@@ -100,19 +110,26 @@ apply plugin: "com.google.gms.google-services"
 
 3. Add the plugin classpath in `android/build.gradle` / `settings.gradle` as in the [Firebase Android setup](https://firebase.google.com/docs/android/setup).
 
-Without `initialize(...)` or that file, `getCredentials()` throws. Notification permission (`POST_NOTIFICATIONS`) is requested on API 33+.
+Without `initialize(...)` or that file, `getCredentials()` throws.
 
 If the host app already declares its own `FirebaseMessagingService`, only one service can handle `com.google.firebase.MESSAGING_EVENT`. Prefer this library’s service or forward events into it.
 
 ## 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
 
-Permission helpers resolve to `denied`. `getCredentials()` throws. Listeners are no-ops.
+`initialize()` resolves. `getCredentials()` throws. Listeners (`onMessage`, `onNotificationPress`) are no-ops.
 
 ## Contributing
 

package/README.ru.md

@@ -2,7 +2,7 @@
 
 [English](README.md) | Русский
 
-Библиотека запрашивает разрешение на пуши, отдаёт токен устройства для вашего сервера и сообщает о входящем уведомлении или нажатии на него. Сами пуши она не отправляет — в APNs и FCM ходит бэкенд.
+Библиотека отдаёт токен устройства для вашего сервера и сообщает о входящем уведомлении или нажатии на него. Сами пуши она не отправляет — в APNs и FCM ходит бэкенд. Разрешение на уведомления запрашивайте сами через [`react-native-permissions`](https://github.com/zoontek/react-native-permissions).
 
 ## Установка
 
@@ -15,29 +15,39 @@ npm install react-native-push-signal react-native-nitro-modules
 ## Использование
 
 ```ts
+import {
+  checkNotifications,
+  requestNotifications,
+  RESULTS,
+} from 'react-native-permissions';
 import {
   getCredentials,
-  getPermissionStatus,
   initialize,
   onMessage,
   onNotificationPress,
-  requestPermission,
 } from 'react-native-push-signal';
 
-initialize({
-  projectId: 'my-project',
-  applicationId: '1:123456789:android:abcd',
-  apiKey: 'AIza...',
-  gcmSenderId: '123456789',
+await initialize({
+  project_id: 'my-project',
+  mobilesdk_app_id: '1:123456789:android:abcd',
+  current_key: 'AIza...',
+  project_number: '123456789',
 });
 
-const status = await getPermissionStatus();
-const afterRequest = await requestPermission();
+const { status } = await checkNotifications();
+if (status !== RESULTS.GRANTED) {
+  await requestNotifications(['alert', 'badge', 'sound']);
+}
+
 const credentials = await getCredentials();
 // POST credentials на сервер: { platform, token, environment? }
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -75,15 +85,15 @@ const stopPress = onNotificationPress((message) => {
 Вызовите `initialize` со значениями из `google-services.json` (не из service account):
 
 ```ts
-initialize({
-  projectId: '...', // project_id
-  applicationId: '...', // mobilesdk_app_id
-  apiKey: '...', // current_key
-  gcmSenderId: '...', // project_number
+await initialize({
+  project_id: '...',
+  mobilesdk_app_id: '...',
+  current_key: '...',
+  project_number: '...',
 });
 ```
 
-Нужны все четыре поля. Если чего-то нет, `initialize` тихо ничего не делает и не бросает ошибку. На iOS вызов игнорируется.
+Нужны все четыре поля. Если чего-то нет, `initialize` резолвится и ничего не делает. На iOS конфиг игнорируется, промис всё равно резолвится.
 
 Service account Firebase оставляйте на сервере. В приложение его класть нельзя.
 
@@ -100,19 +110,26 @@ apply plugin: "com.google.gms.google-services"
 
 3. Добавьте classpath плагина в `android/build.gradle` / `settings.gradle` по [инструкции Firebase для Android](https://firebase.google.com/docs/android/setup).
 
-Без `initialize(...)` или этого файла `getCredentials()` бросит ошибку. Разрешение на уведомления (`POST_NOTIFICATIONS`) запрашивается на API 33+.
+Без `initialize(...)` или этого файла `getCredentials()` бросит ошибку.
 
 Если в хост-приложении уже есть свой `FirebaseMessagingService`, обработать `com.google.firebase.MESSAGING_EVENT` может только один сервис. Оставьте сервис этой библиотеки или пробрасывайте события в него.
 
 ## Входящее сообщение и тап
 
-- `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
 
-Методы разрешения возвращают `denied`. `getCredentials()` бросает ошибку. Слушатели ничего не делают.
+`initialize()` резолвится. `getCredentials()` бросает ошибку. Слушатели (`onMessage`, `onNotificationPress`) ничего не делают.
 
 ## Contributing
 

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

@@ -5,20 +5,14 @@ import com.margelo.nitro.core.Promise
 
 @DoNotStrip
 class PushSignal : HybridPushSignalSpec() {
-  override fun initialize(config: AndroidFirebaseConfig) {
-    PushSignalCenter.initialize(config)
-  }
-
-  override fun getPermissionStatus(): Promise<PermissionStatus> {
-    return Promise.async {
-      PushSignalCenter.getPermissionStatus()
-    }
-  }
-
-  override fun requestPermission(): Promise<PermissionStatus> {
-    val promise = Promise<PermissionStatus>()
-    PushSignalCenter.requestPermission { status ->
-      promise.resolve(status)
+  override fun initialize(config: AndroidFirebaseConfig): Promise<Unit> {
+    val promise = Promise<Unit>()
+    PushSignalCenter.initialize(config) { error ->
+      if (error == null) {
+        promise.resolve(Unit)
+      } else {
+        promise.reject(error)
+      }
     }
     return promise
   }
@@ -27,14 +21,14 @@ class PushSignal : HybridPushSignalSpec() {
     return Promise.async {
       val token = PushSignalCenter.fetchToken()
       PushCredentials(
-        PushPlatform.ANDROID,
+        PushPlatform.ANDROID_OS,
         token,
         null
       )
     }
   }
 
-  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

@@ -1,43 +1,45 @@
 package com.margelo.nitro.pushsignal
 
-import android.Manifest
 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.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import androidx.activity.ComponentActivity
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
+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 PREFS_NAME = "pushsignal"
-  private const val PREF_ASKED_PERMISSION = "asked_notifications"
   private const val EXTRA_HANDLED = "pushsignal.handled"
-  private const val PERMISSION_LAUNCHER_KEY = "com.margelo.nitro.pushsignal.permission"
+  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 permissionLauncher: ActivityResultLauncher<String>? = 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 permissionWaiters = CopyOnWriteArrayList<(PermissionStatus) -> Unit>()
   private val registeredActivities = Collections.newSetFromMap(WeakHashMap<Activity, Boolean>())
   @Volatile private var pendingFirebaseConfig: AndroidFirebaseConfig? = null
+  private val initializeWaiters = CopyOnWriteArrayList<(Exception?) -> Unit>()
 
   fun attach(context: Context) {
     val app = context.applicationContext as? Application ?: return
@@ -54,25 +56,27 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     }
     pendingFirebaseConfig?.let { config ->
       pendingFirebaseConfig = null
-      applyFirebaseConfig(app, config)
+      finishInitialize(applyFirebaseConfig(app, config))
     }
   }
 
-  fun initialize(config: AndroidFirebaseConfig) {
+  fun initialize(config: AndroidFirebaseConfig, onDone: (Exception?) -> Unit) {
     if (!config.hasRequiredFields()) {
+      onDone(null)
       return
     }
 
     val context = application
     if (context == null) {
       pendingFirebaseConfig = config
+      initializeWaiters.add(onDone)
       return
     }
 
-    applyFirebaseConfig(context, config)
+    onDone(applyFirebaseConfig(context, config))
   }
 
-  fun setOnMessage(callback: (PushMessage) -> Unit) {
+  fun setOnMessage(callback: (PushMessage) -> Promise<Promise<Boolean>>) {
     onMessage = callback
   }
 
@@ -88,60 +92,6 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     }
   }
 
-  fun getPermissionStatus(): PermissionStatus {
-    val context = application ?: return PermissionStatus.NOTDETERMINED
-    val notificationsEnabled = NotificationManagerCompat.from(context).areNotificationsEnabled()
-
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-      return if (notificationsEnabled) {
-        PermissionStatus.AUTHORIZED
-      } else {
-        PermissionStatus.DENIED
-      }
-    }
-
-    val granted =
-      ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) ==
-        PackageManager.PERMISSION_GRANTED
-    if (granted && notificationsEnabled) {
-      return PermissionStatus.AUTHORIZED
-    }
-
-    val asked =
-      context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        .getBoolean(PREF_ASKED_PERMISSION, false)
-    return if (!asked && !granted) {
-      PermissionStatus.NOTDETERMINED
-    } else {
-      PermissionStatus.DENIED
-    }
-  }
-
-  fun requestPermission(onResult: (PermissionStatus) -> Unit) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-      onResult(getPermissionStatus())
-      return
-    }
-
-    val activity = currentActivity
-    val launcher = permissionLauncher
-    if (activity == null || launcher == null) {
-      onResult(getPermissionStatus())
-      return
-    }
-
-    if (
-      ContextCompat.checkSelfPermission(activity, Manifest.permission.POST_NOTIFICATIONS) ==
-        PackageManager.PERMISSION_GRANTED
-    ) {
-      onResult(getPermissionStatus())
-      return
-    }
-
-    permissionWaiters.add(onResult)
-    launcher.launch(Manifest.permission.POST_NOTIFICATIONS)
-  }
-
   fun fetchToken(): String {
     val context = application
       ?: throw IllegalStateException("PushSignal is not initialized")
@@ -153,7 +103,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
       FirebaseApp.getInstance()
     } catch (error: IllegalStateException) {
       throw IllegalStateException(
-        "Firebase is not configured. Call initialize({ projectId, applicationId, apiKey, gcmSenderId }) or add google-services.json.",
+        "Firebase is not configured. Call initialize({ project_id, mobilesdk_app_id, current_key, project_number }) or add google-services.json.",
         error
       )
     }
@@ -163,7 +113,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
       Tasks.await(task)
     } catch (error: Exception) {
       throw IllegalStateException(
-        "Failed to get an FCM token. Call initialize({ projectId, applicationId, apiKey, gcmSenderId }) or add google-services.json.",
+        "Failed to get an FCM token. Call initialize({ project_id, mobilesdk_app_id, current_key, project_number }) or add google-services.json.",
         error
       )
     }
@@ -175,12 +125,117 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     return token
   }
 
-  fun emitMessage(message: PushMessage) {
-    onMessage?.invoke(message)
+  fun emitMessage(remoteMessage: RemoteMessage) {
+    val message = remoteMessage.toPushMessage()
+    val inForeground = 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 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(false)
+      }
+    }
+    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(false) }
+        }
+        .catch { finish(false) }
+    } catch (_: Throwable) {
+      finish(false)
+    }
+  }
+
+  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?) {
@@ -209,7 +264,6 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
   override fun onActivityDestroyed(activity: Activity) {
     if (currentActivity === activity) {
       currentActivity = null
-      permissionLauncher = null
     }
   }
 
@@ -219,24 +273,6 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     }
 
     val componentActivity = activity as? ComponentActivity ?: return
-
-    permissionLauncher =
-      componentActivity.activityResultRegistry.register(
-        PERMISSION_LAUNCHER_KEY,
-        componentActivity,
-        ActivityResultContracts.RequestPermission()
-      ) {
-        activity
-          .getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-          .edit()
-          .putBoolean(PREF_ASKED_PERMISSION, true)
-          .apply()
-        val status = getPermissionStatus()
-        val waiters = permissionWaiters.toList()
-        permissionWaiters.clear()
-        waiters.forEach { it(status) }
-      }
-
     componentActivity.addOnNewIntentListener { intent ->
       handleIntent(intent)
     }
@@ -251,25 +287,36 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     emitPress(intent.toPushMessage())
   }
 
-  private fun applyFirebaseConfig(context: Context, config: AndroidFirebaseConfig) {
-    if (!config.hasRequiredFields() || FirebaseApp.getApps(context).isNotEmpty()) {
-      return
+  private fun applyFirebaseConfig(context: Context, config: AndroidFirebaseConfig): Exception? {
+    if (FirebaseApp.getApps(context).isNotEmpty()) {
+      return null
     }
 
-    try {
+    if (!config.hasRequiredFields()) {
+      return null
+    }
+
+    return try {
       val options =
         FirebaseOptions.Builder()
-          .setProjectId(config.projectId!!.trim())
-          .setApplicationId(config.applicationId!!.trim())
-          .setApiKey(config.apiKey!!.trim())
-          .setGcmSenderId(config.gcmSenderId!!.trim())
+          .setProjectId(config.project_id!!.trim())
+          .setApplicationId(config.mobilesdk_app_id!!.trim())
+          .setApiKey(config.current_key!!.trim())
+          .setGcmSenderId(config.project_number!!.trim())
           .build()
       FirebaseApp.initializeApp(context, options)
-    } catch (_: Exception) {
-      // Keep initialize quiet; getCredentials reports a missing Firebase app.
+      null
+    } catch (error: Exception) {
+      error
     }
   }
 
+  private fun finishInitialize(error: Exception?) {
+    val waiters = initializeWaiters.toList()
+    initializeWaiters.clear()
+    waiters.forEach { it(error) }
+  }
+
   private fun emitPress(message: PushMessage) {
     val listener = onNotificationPress
     if (listener != null) {
@@ -335,10 +382,10 @@ private fun Intent.toPushMessage(): PushMessage {
 }
 
 private fun AndroidFirebaseConfig.hasRequiredFields(): Boolean {
-  return !projectId.isNullOrBlank() &&
-    !applicationId.isNullOrBlank() &&
-    !apiKey.isNullOrBlank() &&
-    !gcmSenderId.isNullOrBlank()
+  return !project_id.isNullOrBlank() &&
+    !mobilesdk_app_id.isNullOrBlank() &&
+    !current_key.isNullOrBlank() &&
+    !project_number.isNullOrBlank()
 }
 
 private const val EXTRA_HANDLED_KEY = "pushsignal.handled"

package/ios/PushSignal.swift

@@ -6,19 +6,10 @@ class PushSignal: HybridPushSignalSpec {
     PushSignalCenter.shared.install()
   }
 
-  func initialize(config: AndroidFirebaseConfig) throws {
+  func initialize(config: AndroidFirebaseConfig) throws -> Promise<Void> {
     _ = config
-  }
-
-  func getPermissionStatus() throws -> Promise<PermissionStatus> {
-    return Promise.async {
-      await PushSignalCenter.shared.permissionStatus()
-    }
-  }
-
-  func requestPermission() throws -> Promise<PermissionStatus> {
     return Promise.async {
-      await PushSignalCenter.shared.requestPermission()
+      ()
     }
   }
 
@@ -28,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
   }