react-native-push-signal 0.1.0 → 0.1.2

package/ios/PushSignalCenter.swift

@@ -1,4 +1,5 @@
 import Foundation
+import NitroModules
 import ObjectiveC
 import UIKit
 import UserNotifications
@@ -21,7 +22,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   private var pendingLaunchOptions: [AnyHashable: Any]?
   private var didCaptureLaunchNotification = false
 
-  var onMessage: ((PushMessage) -> Void)?
+  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)?
   var onNotificationPress: ((PushMessage) -> Void)? {
     didSet {
       flushPendingPress()
@@ -46,28 +47,6 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     captureLaunchNotificationIfNeeded()
   }
 
-  func permissionStatus() async -> PermissionStatus {
-    await withCheckedContinuation { continuation in
-      UNUserNotificationCenter.current().getNotificationSettings { settings in
-        continuation.resume(returning: Self.map(settings.authorizationStatus))
-      }
-    }
-  }
-
-  func requestPermission() async -> PermissionStatus {
-    do {
-      let granted = try await UNUserNotificationCenter.current()
-        .requestAuthorization(options: [.alert, .badge, .sound])
-      if granted {
-        return await permissionStatus()
-      }
-
-      return await permissionStatus()
-    } catch {
-      return .denied
-    }
-  }
-
   func fetchCredentials() async throws -> PushCredentials {
     await MainActor.run {
       self.installOnMain()
@@ -96,8 +75,11 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     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.shouldShowForegroundBanner(for: message)
+      completionHandler(shouldShow ? Self.foregroundPresentationOptions : [])
+    }
   }
 
   func userNotificationCenter(
@@ -174,12 +156,38 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     waiters.forEach { $0(result) }
   }
 
-  private func emitMessage(_ message: PushMessage) {
-    DispatchQueue.main.async {
-      self.onMessage?(message)
+  private func shouldShowForegroundBanner(for message: PushMessage) async -> Bool {
+    guard let callback = onMessage else {
+      return false
+    }
+
+    return await withTaskGroup(of: Bool.self) { group in
+      group.addTask {
+        do {
+          let inner = try await callback(message).await()
+          return try await inner.await()
+        } catch {
+          return false
+        }
+      }
+      group.addTask {
+        try? await Task.sleep(nanoseconds: 2_000_000_000)
+        return false
+      }
+
+      let first = await group.next() ?? false
+      group.cancelAll()
+      return first
     }
   }
 
+  private static var foregroundPresentationOptions: UNNotificationPresentationOptions {
+    if #available(iOS 14.0, *) {
+      return [.banner, .list, .sound, .badge]
+    }
+    return [.alert, .sound, .badge]
+  }
+
   private func emitPress(_ message: PushMessage) {
     DispatchQueue.main.async {
       if let onNotificationPress = self.onNotificationPress {
@@ -267,19 +275,6 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     }
   }
 
-  private static func map(_ status: UNAuthorizationStatus) -> PermissionStatus {
-    switch status {
-    case .authorized, .provisional, .ephemeral:
-      return .authorized
-    case .denied:
-      return .denied
-    case .notDetermined:
-      return .notdetermined
-    @unknown default:
-      return .denied
-    }
-  }
-
   private static func message(from notification: UNNotification) -> PushMessage {
     let content = notification.request.content
     return message(

package/lib/module/index.js

@@ -1,4 +1,4 @@
 "use strict";
 
-export { getCredentials, getPermissionStatus, initialize, onMessage, onNotificationPress, requestPermission } from './pushSignal';
+export { getCredentials, initialize, onMessage, onNotificationPress } from './pushSignal';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCredentials","getPermissionStatus","initialize","onMessage","onNotificationPress","requestPermission"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAQA,SACEA,cAAc,EACdC,mBAAmB,EACnBC,UAAU,EACVC,SAAS,EACTC,mBAAmB,EACnBC,iBAAiB,QACZ,cAAc","ignoreList":[]}
+{"version":3,"names":["getCredentials","initialize","onMessage","onNotificationPress"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAQA,SACEA,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,mBAAmB,QACd,cAAc","ignoreList":[]}

package/lib/module/pushSignal.js

@@ -1,12 +1,6 @@
 "use strict";
 
-export function initialize(_config = {}) {}
-export async function getPermissionStatus() {
-  return 'denied';
-}
-export async function requestPermission() {
-  return 'denied';
-}
+export async function initialize(_config = {}) {}
 export async function getCredentials() {
   throw new Error('Push credentials are not supported on web');
 }

package/lib/module/pushSignal.js.map

@@ -1 +1 @@
-{"version":3,"names":["initialize","_config","getPermissionStatus","requestPermission","getCredentials","Error","onMessage","_listener","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.tsx"],"mappings":";;AAOA,OAAO,SAASA,UAAUA,CAACC,OAA8B,GAAG,CAAC,CAAC,EAAQ,CAAC;AAEvE,OAAO,eAAeC,mBAAmBA,CAAA,EAA8B;EACrE,OAAO,QAAQ;AACjB;AAEA,OAAO,eAAeC,iBAAiBA,CAAA,EAA8B;EACnE,OAAO,QAAQ;AACjB;AAEA,OAAO,eAAeC,cAAcA,CAAA,EAA6B;EAC/D,MAAM,IAAIC,KAAK,CAAC,2CAA2C,CAAC;AAC9D;AAEA,OAAO,SAASC,SAASA,CACvBC,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB;AAEA,OAAO,SAASC,mBAAmBA,CACjCD,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB","ignoreList":[]}
+{"version":3,"names":["initialize","_config","getCredentials","Error","onMessage","_listener","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.tsx"],"mappings":";;AAOA,OAAO,eAAeA,UAAUA,CAC9BC,OAA8B,GAAG,CAAC,CAAC,EACpB,CAAC;AAElB,OAAO,eAAeC,cAAcA,CAAA,EAA6B;EAC/D,MAAM,IAAIC,KAAK,CAAC,2CAA2C,CAAC;AAC9D;AAEA,OAAO,SAASC,SAASA,CAACC,SAA4B,EAAc;EAClE,OAAO,MAAM,CAAC,CAAC;AACjB;AAEA,OAAO,SAASC,mBAAmBA,CACjCD,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB","ignoreList":[]}

package/lib/module/pushSignal.native.js

@@ -10,21 +10,22 @@ function bindNativeCallbacks() {
     return;
   }
   nativeCallbacksBound = true;
-  PushSignalHybridObject.setOnMessage(message => {
-    messageListeners.forEach(listener => listener(message));
+  PushSignalHybridObject.setOnMessage(async message => {
+    const results = await Promise.all([...messageListeners].map(async listener => {
+      try {
+        return await listener(message);
+      } catch {
+        return false;
+      }
+    }));
+    return results.some(result => result === true);
   });
   PushSignalHybridObject.setOnNotificationPress(message => {
     pressListeners.forEach(listener => listener(message));
   });
 }
 export function initialize(config = {}) {
-  PushSignalHybridObject.initialize(config);
-}
-export function getPermissionStatus() {
-  return PushSignalHybridObject.getPermissionStatus();
-}
-export function requestPermission() {
-  return PushSignalHybridObject.requestPermission();
+  return PushSignalHybridObject.initialize(config);
 }
 export function getCredentials() {
   return PushSignalHybridObject.getCredentials();

package/lib/module/pushSignal.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","forEach","listener","setOnNotificationPress","initialize","config","getPermissionStatus","requestPermission","getCredentials","onMessage","add","delete","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.native.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AASzD,MAAMC,sBAAsB,GAC1BD,YAAY,CAACE,kBAAkB,CAAa,YAAY,CAAC;AAE3D,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAAiC,CAAC;AAClE,MAAMC,cAAc,GAAG,IAAID,GAAG,CAAiC,CAAC;AAChE,IAAIE,oBAAoB,GAAG,KAAK;AAEhC,SAASC,mBAAmBA,CAAA,EAAG;EAC7B,IAAID,oBAAoB,EAAE;IACxB;EACF;EAEAA,oBAAoB,GAAG,IAAI;EAE3BL,sBAAsB,CAACO,YAAY,CAAEC,OAAO,IAAK;IAC/CN,gBAAgB,CAACO,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAACF,OAAO,CAAC,CAAC;EAC3D,CAAC,CAAC;EAEFR,sBAAsB,CAACW,sBAAsB,CAAEH,OAAO,IAAK;IACzDJ,cAAc,CAACK,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAACF,OAAO,CAAC,CAAC;EACzD,CAAC,CAAC;AACJ;AAEA,OAAO,SAASI,UAAUA,CAACC,MAA6B,GAAG,CAAC,CAAC,EAAQ;EACnEb,sBAAsB,CAACY,UAAU,CAACC,MAAM,CAAC;AAC3C;AAEA,OAAO,SAASC,mBAAmBA,CAAA,EAA8B;EAC/D,OAAOd,sBAAsB,CAACc,mBAAmB,CAAC,CAAC;AACrD;AAEA,OAAO,SAASC,iBAAiBA,CAAA,EAA8B;EAC7D,OAAOf,sBAAsB,CAACe,iBAAiB,CAAC,CAAC;AACnD;AAEA,OAAO,SAASC,cAAcA,CAAA,EAA6B;EACzD,OAAOhB,sBAAsB,CAACgB,cAAc,CAAC,CAAC;AAChD;AAEA,OAAO,SAASC,SAASA,CACvBP,QAAwC,EAC5B;EACZJ,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACgB,GAAG,CAACR,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXR,gBAAgB,CAACiB,MAAM,CAACT,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASU,mBAAmBA,CACjCV,QAAwC,EAC5B;EACZJ,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACc,GAAG,CAACR,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXN,cAAc,CAACe,MAAM,CAACT,QAAQ,CAAC;EACjC,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","results","Promise","all","map","listener","some","result","setOnNotificationPress","forEach","initialize","config","getCredentials","onMessage","add","delete","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.native.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AASzD,MAAMC,sBAAsB,GAC1BD,YAAY,CAACE,kBAAkB,CAAa,YAAY,CAAC;AAE3D,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAAoB,CAAC;AACrD,MAAMC,cAAc,GAAG,IAAID,GAAG,CAAiC,CAAC;AAChE,IAAIE,oBAAoB,GAAG,KAAK;AAEhC,SAASC,mBAAmBA,CAAA,EAAG;EAC7B,IAAID,oBAAoB,EAAE;IACxB;EACF;EAEAA,oBAAoB,GAAG,IAAI;EAE3BL,sBAAsB,CAACO,YAAY,CAAC,MAAOC,OAAO,IAAK;IACrD,MAAMC,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC/B,CAAC,GAAGT,gBAAgB,CAAC,CAACU,GAAG,CAAC,MAAOC,QAAQ,IAAK;MAC5C,IAAI;QACF,OAAO,MAAMA,QAAQ,CAACL,OAAO,CAAC;MAChC,CAAC,CAAC,MAAM;QACN,OAAO,KAAK;MACd;IACF,CAAC,CACH,CAAC;IAED,OAAOC,OAAO,CAACK,IAAI,CAAEC,MAAM,IAAKA,MAAM,KAAK,IAAI,CAAC;EAClD,CAAC,CAAC;EAEFf,sBAAsB,CAACgB,sBAAsB,CAAER,OAAO,IAAK;IACzDJ,cAAc,CAACa,OAAO,CAAEJ,QAAQ,IAAKA,QAAQ,CAACL,OAAO,CAAC,CAAC;EACzD,CAAC,CAAC;AACJ;AAEA,OAAO,SAASU,UAAUA,CAACC,MAA6B,GAAG,CAAC,CAAC,EAAiB;EAC5E,OAAOnB,sBAAsB,CAACkB,UAAU,CAACC,MAAM,CAAC;AAClD;AAEA,OAAO,SAASC,cAAcA,CAAA,EAA6B;EACzD,OAAOpB,sBAAsB,CAACoB,cAAc,CAAC,CAAC;AAChD;AAEA,OAAO,SAASC,SAASA,CAACR,QAA2B,EAAc;EACjEP,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACoB,GAAG,CAACT,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXX,gBAAgB,CAACqB,MAAM,CAACV,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASW,mBAAmBA,CACjCX,QAAwC,EAC5B;EACZP,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACkB,GAAG,CAACT,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXT,cAAc,CAACmB,MAAM,CAACV,QAAQ,CAAC;EACjC,CAAC;AACH","ignoreList":[]}

package/lib/typescript/src/PushSignal.nitro.d.ts

@@ -1,6 +1,6 @@
 import type { HybridObject } from 'react-native-nitro-modules';
-export type PermissionStatus = 'authorized' | 'denied' | 'notDetermined';
-export type PushPlatform = 'ios' | 'android';
+/** JS/C++ name cannot be `android`: NDK defines `-DANDROID` and breaks the generated enum. */
+export type PushPlatform = 'ios' | 'android_os';
 export type PushEnvironment = 'sandbox' | 'production';
 export interface PushCredentials {
     platform: PushPlatform;
@@ -13,21 +13,20 @@ export interface PushMessage {
     body?: string;
     data: Record<string, string>;
 }
+export type OnMessageListener = (message: PushMessage) => boolean | void | Promise<boolean | void>;
 export interface AndroidFirebaseConfig {
-    projectId?: string;
-    applicationId?: string;
-    apiKey?: string;
-    gcmSenderId?: string;
+    project_id?: string;
+    mobilesdk_app_id?: string;
+    current_key?: string;
+    project_number?: string;
 }
 export interface PushSignal extends HybridObject<{
     ios: 'swift';
     android: 'kotlin';
 }> {
-    initialize(config: AndroidFirebaseConfig): void;
-    getPermissionStatus(): Promise<PermissionStatus>;
-    requestPermission(): Promise<PermissionStatus>;
+    initialize(config: AndroidFirebaseConfig): Promise<void>;
     getCredentials(): Promise<PushCredentials>;
-    setOnMessage(callback: (message: PushMessage) => void): void;
+    setOnMessage(callback: (message: PushMessage) => Promise<boolean>): void;
     setOnNotificationPress(callback: (message: PushMessage) => void): void;
 }
 //# sourceMappingURL=PushSignal.nitro.d.ts.map

package/lib/typescript/src/PushSignal.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PushSignal.nitro.d.ts","sourceRoot":"","sources":["../../../src/PushSignal.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,QAAQ,GAAG,eAAe,CAAC;AACzE,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,SAAS,CAAC;AAC7C,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY,CAAC;IAC/C,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;IACA,UAAU,CAAC,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAChD,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjD,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/C,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;IAC7D,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;CACxE"}
+{"version":3,"file":"PushSignal.nitro.d.ts","sourceRoot":"","sources":["../../../src/PushSignal.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,8FAA8F;AAC9F,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,YAAY,CAAC;AAChD,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,WAAW,KACjB,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;AAE9C,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY,CAAC;IAC/C,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;IACA,UAAU,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACzE,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;CACxE"}

package/lib/typescript/src/index.d.ts

@@ -1,3 +1,3 @@
-export type { AndroidFirebaseConfig, PermissionStatus, PushCredentials, PushEnvironment, PushMessage, PushPlatform, } from './PushSignal.nitro.js';
-export { getCredentials, getPermissionStatus, initialize, onMessage, onNotificationPress, requestPermission, } from './pushSignal';
+export type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushEnvironment, PushMessage, PushPlatform, } from './PushSignal.nitro.js';
+export { getCredentials, initialize, onMessage, onNotificationPress, } from './pushSignal';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,YAAY,EACV,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,WAAW,EACX,YAAY,GACb,MAAM,uBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,YAAY,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,WAAW,EACX,YAAY,GACb,MAAM,uBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,mBAAmB,GACpB,MAAM,cAAc,CAAC"}

package/lib/typescript/src/pushSignal.d.ts

@@ -1,8 +1,6 @@
-import type { AndroidFirebaseConfig, PermissionStatus, PushCredentials, PushMessage } from './PushSignal.nitro.js';
-export declare function initialize(_config?: AndroidFirebaseConfig): void;
-export declare function getPermissionStatus(): Promise<PermissionStatus>;
-export declare function requestPermission(): Promise<PermissionStatus>;
+import type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushMessage } from './PushSignal.nitro.js';
+export declare function initialize(_config?: AndroidFirebaseConfig): Promise<void>;
 export declare function getCredentials(): Promise<PushCredentials>;
-export declare function onMessage(_listener: (message: PushMessage) => void): () => void;
+export declare function onMessage(_listener: OnMessageListener): () => void;
 export declare function onNotificationPress(_listener: (message: PushMessage) => void): () => void;
 //# sourceMappingURL=pushSignal.d.ts.map

package/lib/typescript/src/pushSignal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushSignal.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,WAAW,EACZ,MAAM,uBAAoB,CAAC;AAE5B,wBAAgB,UAAU,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI,CAAG;AAExE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAErE;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAEnE;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAE/D;AAED,wBAAgB,SAAS,CACvB,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ"}
+{"version":3,"file":"pushSignal.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EACZ,MAAM,uBAAoB,CAAC;AAE5B,wBAAsB,UAAU,CAC9B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAAG;AAEnB,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAE/D;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAElE;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ"}

package/lib/typescript/src/pushSignal.native.d.ts

@@ -1,8 +1,6 @@
-import type { AndroidFirebaseConfig, PermissionStatus, PushCredentials, PushMessage } from './PushSignal.nitro.js';
-export declare function initialize(config?: AndroidFirebaseConfig): void;
-export declare function getPermissionStatus(): Promise<PermissionStatus>;
-export declare function requestPermission(): Promise<PermissionStatus>;
+import type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushMessage } from './PushSignal.nitro.js';
+export declare function initialize(config?: AndroidFirebaseConfig): Promise<void>;
 export declare function getCredentials(): Promise<PushCredentials>;
-export declare function onMessage(listener: (message: PushMessage) => void): () => void;
+export declare function onMessage(listener: OnMessageListener): () => void;
 export declare function onNotificationPress(listener: (message: PushMessage) => void): () => void;
 //# sourceMappingURL=pushSignal.native.d.ts.map

package/lib/typescript/src/pushSignal.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushSignal.native.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,WAAW,EAEZ,MAAM,uBAAoB,CAAC;AAyB5B,wBAAgB,UAAU,CAAC,MAAM,GAAE,qBAA0B,GAAG,IAAI,CAEnE;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAE/D;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAE7D;AAED,wBAAgB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAEzD;AAED,wBAAgB,SAAS,CACvB,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ"}
+{"version":3,"file":"pushSignal.native.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAEZ,MAAM,uBAAoB,CAAC;AAmC5B,wBAAgB,UAAU,CAAC,MAAM,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;AAED,wBAAgB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAEzD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAMjE;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ"}

package/nitrogen/generated/android/c++/JAndroidFirebaseConfig.hpp

@@ -32,19 +32,19 @@ namespace margelo::nitro::pushsignal {
     [[nodiscard]]
     AndroidFirebaseConfig toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldProjectId = clazz->getField<jni::JString>("projectId");
-      jni::local_ref<jni::JString> projectId = this->getFieldValue(fieldProjectId);
-      static const auto fieldApplicationId = clazz->getField<jni::JString>("applicationId");
-      jni::local_ref<jni::JString> applicationId = this->getFieldValue(fieldApplicationId);
-      static const auto fieldApiKey = clazz->getField<jni::JString>("apiKey");
-      jni::local_ref<jni::JString> apiKey = this->getFieldValue(fieldApiKey);
-      static const auto fieldGcmSenderId = clazz->getField<jni::JString>("gcmSenderId");
-      jni::local_ref<jni::JString> gcmSenderId = this->getFieldValue(fieldGcmSenderId);
+      static const auto fieldProject_id = clazz->getField<jni::JString>("project_id");
+      jni::local_ref<jni::JString> project_id = this->getFieldValue(fieldProject_id);
+      static const auto fieldMobilesdk_app_id = clazz->getField<jni::JString>("mobilesdk_app_id");
+      jni::local_ref<jni::JString> mobilesdk_app_id = this->getFieldValue(fieldMobilesdk_app_id);
+      static const auto fieldCurrent_key = clazz->getField<jni::JString>("current_key");
+      jni::local_ref<jni::JString> current_key = this->getFieldValue(fieldCurrent_key);
+      static const auto fieldProject_number = clazz->getField<jni::JString>("project_number");
+      jni::local_ref<jni::JString> project_number = this->getFieldValue(fieldProject_number);
       return AndroidFirebaseConfig(
-        projectId != nullptr ? std::make_optional(projectId->toStdString()) : std::nullopt,
-        applicationId != nullptr ? std::make_optional(applicationId->toStdString()) : std::nullopt,
-        apiKey != nullptr ? std::make_optional(apiKey->toStdString()) : std::nullopt,
-        gcmSenderId != nullptr ? std::make_optional(gcmSenderId->toStdString()) : std::nullopt
+        project_id != nullptr ? std::make_optional(project_id->toStdString()) : std::nullopt,
+        mobilesdk_app_id != nullptr ? std::make_optional(mobilesdk_app_id->toStdString()) : std::nullopt,
+        current_key != nullptr ? std::make_optional(current_key->toStdString()) : std::nullopt,
+        project_number != nullptr ? std::make_optional(project_number->toStdString()) : std::nullopt
       );
     }
 
@@ -59,10 +59,10 @@ namespace margelo::nitro::pushsignal {
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
-        value.projectId.has_value() ? jni::make_jstring(value.projectId.value()) : nullptr,
-        value.applicationId.has_value() ? jni::make_jstring(value.applicationId.value()) : nullptr,
-        value.apiKey.has_value() ? jni::make_jstring(value.apiKey.value()) : nullptr,
-        value.gcmSenderId.has_value() ? jni::make_jstring(value.gcmSenderId.value()) : nullptr
+        value.project_id.has_value() ? jni::make_jstring(value.project_id.value()) : nullptr,
+        value.mobilesdk_app_id.has_value() ? jni::make_jstring(value.mobilesdk_app_id.value()) : nullptr,
+        value.current_key.has_value() ? jni::make_jstring(value.current_key.value()) : nullptr,
+        value.project_number.has_value() ? jni::make_jstring(value.project_number.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp

@@ -0,0 +1,128 @@
+///
+/// JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include <NitroModules/Promise.hpp>
+#include "PushMessage.hpp"
+#include <functional>
+#include <NitroModules/JNICallable.hpp>
+#include <NitroModules/JPromise.hpp>
+#include "JPushMessage.hpp"
+#include <string>
+#include <optional>
+#include <unordered_map>
+
+namespace margelo::nitro::pushsignal {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(message: PushMessage) -> Promise<Promise<Boolean>>`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage: public jni::JavaClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/pushsignal/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage` instance holds through JNI.
+     */
+    std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> invoke(const PushMessage& message) const {
+      static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JPushMessage> /* message */)>("invoke");
+      auto __result = method(self(), JPushMessage::fromCpp(message));
+      return [&]() {
+        auto __promise = Promise<std::shared_ptr<Promise<bool>>>::create();
+        __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
+          auto __result = jni::static_ref_cast<JPromise::javaobject>(__boxedResult);
+          __promise->resolve([&]() {
+            auto __promise = Promise<bool>::create();
+            __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
+              auto __result = jni::static_ref_cast<jni::JBoolean>(__boxedResult);
+              __promise->resolve(static_cast<bool>(__result->value()));
+            });
+            __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+              jni::JniException __jniError(__throwable);
+              __promise->reject(std::make_exception_ptr(__jniError));
+            });
+            return __promise;
+          }());
+        });
+        __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+          jni::JniException __jniError(__throwable);
+          __promise->reject(std::make_exception_ptr(__jniError));
+        });
+        return __promise;
+      }();
+    }
+  };
+
+  /**
+   * An implementation of Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  class JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage> {
+  public:
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& func) {
+      return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx` instance holds.
+     */
+    jni::local_ref<JPromise::javaobject> invoke_cxx(jni::alias_ref<JPushMessage> message) {
+      std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> __result = _func(message->toCpp());
+      return [&]() {
+        jni::local_ref<JPromise::javaobject> __localPromise = JPromise::create();
+        jni::global_ref<JPromise::javaobject> __promise = jni::make_global(__localPromise);
+        __result->addOnResolvedListener([=](const std::shared_ptr<Promise<bool>>& __result) {
+          __promise->cthis()->resolve([&]() {
+            jni::local_ref<JPromise::javaobject> __localPromise = JPromise::create();
+            jni::global_ref<JPromise::javaobject> __promise = jni::make_global(__localPromise);
+            __result->addOnResolvedListener([=](const bool& __result) {
+              __promise->cthis()->resolve(jni::JBoolean::valueOf(__result));
+            });
+            __result->addOnRejectedListener([=](const std::exception_ptr& __error) {
+              auto __jniError = jni::getJavaExceptionForCppException(__error);
+              __promise->cthis()->reject(__jniError);
+            });
+            return __localPromise;
+          }());
+        });
+        __result->addOnRejectedListener([=](const std::exception_ptr& __error) {
+          auto __jniError = jni::getJavaExceptionForCppException(__error);
+          __promise->cthis()->reject(__jniError);
+        });
+        return __localPromise;
+      }();
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/pushsignal/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)> _func;
+  };
+
+} // namespace margelo::nitro::pushsignal

package/nitrogen/generated/android/c++/JHybridPushSignalSpec.cpp

@@ -7,8 +7,6 @@
 
 #include "JHybridPushSignalSpec.hpp"
 
-// Forward declaration of `PermissionStatus` to properly resolve imports.
-namespace margelo::nitro::pushsignal { enum class PermissionStatus; }
 // Forward declaration of `PushCredentials` to properly resolve imports.
 namespace margelo::nitro::pushsignal { struct PushCredentials; }
 // Forward declaration of `PushPlatform` to properly resolve imports.
@@ -20,10 +18,9 @@ namespace margelo::nitro::pushsignal { struct AndroidFirebaseConfig; }
 // Forward declaration of `PushMessage` to properly resolve imports.
 namespace margelo::nitro::pushsignal { struct PushMessage; }
 
-#include "PermissionStatus.hpp"
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
-#include "JPermissionStatus.hpp"
+#include <NitroModules/JUnit.hpp>
 #include "PushCredentials.hpp"
 #include "JPushCredentials.hpp"
 #include "PushPlatform.hpp"
@@ -36,10 +33,11 @@ namespace margelo::nitro::pushsignal { struct PushMessage; }
 #include "JAndroidFirebaseConfig.hpp"
 #include "PushMessage.hpp"
 #include <functional>
-#include "JFunc_void_PushMessage.hpp"
+#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp"
 #include <NitroModules/JNICallable.hpp>
 #include "JPushMessage.hpp"
 #include <unordered_map>
+#include "JFunc_void_PushMessage.hpp"
 
 namespace margelo::nitro::pushsignal {
 
@@ -74,34 +72,13 @@ namespace margelo::nitro::pushsignal {
   
 
   // Methods
-  void JHybridPushSignalSpec::initialize(const AndroidFirebaseConfig& config) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JAndroidFirebaseConfig> /* config */)>("initialize");
-    method(_javaPart, JAndroidFirebaseConfig::fromCpp(config));
-  }
-  std::shared_ptr<Promise<PermissionStatus>> JHybridPushSignalSpec::getPermissionStatus() {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getPermissionStatus");
-    auto __result = method(_javaPart);
+  std::shared_ptr<Promise<void>> JHybridPushSignalSpec::initialize(const AndroidFirebaseConfig& config) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JAndroidFirebaseConfig> /* config */)>("initialize");
+    auto __result = method(_javaPart, JAndroidFirebaseConfig::fromCpp(config));
     return [&]() {
-      auto __promise = Promise<PermissionStatus>::create();
-      __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JPermissionStatus>(__boxedResult);
-        __promise->resolve(__result->toCpp());
-      });
-      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
-        jni::JniException __jniError(__throwable);
-        __promise->reject(std::make_exception_ptr(__jniError));
-      });
-      return __promise;
-    }();
-  }
-  std::shared_ptr<Promise<PermissionStatus>> JHybridPushSignalSpec::requestPermission() {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestPermission");
-    auto __result = method(_javaPart);
-    return [&]() {
-      auto __promise = Promise<PermissionStatus>::create();
-      __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JPermissionStatus>(__boxedResult);
-        __promise->resolve(__result->toCpp());
+      auto __promise = Promise<void>::create();
+      __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& /* unit */) {
+        __promise->resolve();
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);
@@ -126,9 +103,9 @@ namespace margelo::nitro::pushsignal {
       return __promise;
     }();
   }
-  void JHybridPushSignalSpec::setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PushMessage::javaobject> /* callback */)>("setOnMessage_cxx");
-    method(_javaPart, JFunc_void_PushMessage_cxx::fromCpp(callback));
+  void JHybridPushSignalSpec::setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage::javaobject> /* callback */)>("setOnMessage_cxx");
+    method(_javaPart, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::fromCpp(callback));
   }
   void JHybridPushSignalSpec::setOnNotificationPress(const std::function<void(const PushMessage& /* message */)>& callback) {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PushMessage::javaobject> /* callback */)>("setOnNotificationPress_cxx");

package/nitrogen/generated/android/c++/JHybridPushSignalSpec.hpp

@@ -54,11 +54,9 @@ namespace margelo::nitro::pushsignal {
 
   public:
     // Methods
-    void initialize(const AndroidFirebaseConfig& config) override;
-    std::shared_ptr<Promise<PermissionStatus>> getPermissionStatus() override;
-    std::shared_ptr<Promise<PermissionStatus>> requestPermission() override;
+    std::shared_ptr<Promise<void>> initialize(const AndroidFirebaseConfig& config) override;
     std::shared_ptr<Promise<PushCredentials>> getCredentials() override;
-    void setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) override;
+    void setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) override;
     void setOnNotificationPress(const std::function<void(const PushMessage& /* message */)>& callback) override;
 
   private:

package/nitrogen/generated/android/c++/JPushPlatform.hpp

@@ -45,9 +45,9 @@ namespace margelo::nitro::pushsignal {
         case PushPlatform::IOS:
           static const auto fieldIOS = clazz->getStaticField<JPushPlatform>("IOS");
           return clazz->getStaticFieldValue(fieldIOS);
-        case PushPlatform::ANDROID:
-          static const auto fieldANDROID = clazz->getStaticField<JPushPlatform>("ANDROID");
-          return clazz->getStaticFieldValue(fieldANDROID);
+        case PushPlatform::ANDROID_OS:
+          static const auto fieldANDROID_OS = clazz->getStaticField<JPushPlatform>("ANDROID_OS");
+          return clazz->getStaticFieldValue(fieldANDROID_OS);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
           throw std::invalid_argument("Invalid enum value (" + stringValue + "!");