pushwoosh-react-native-plugin 6.1.12 → 6.1.15

package/README.md

@@ -12,12 +12,27 @@ React Native Pushwoosh Push Notifications module
 
 
 ### Installation
-
 ```
 npm install pushwoosh-react-native-plugin --save
 react-native link pushwoosh-react-native-plugin
 ```
 
+For Android platform, also add the following lines to your project's build.gradle:
+
+```
+//you should already have buildscript and dependencies blocks in your project's build.gradle so just put the classpath line there
+buildscript {
+ dependencies {
+ classpath 'com.google.gms:google-services:4.3.3'
+ }
+}
+
+//add these lines to the very end of your build.gradle
+apply {
+ plugin com.google.gms.googleservices.GoogleServicesPlugin
+}
+```
+
 ### Usage
 
 ```js

package/index.d.ts

@@ -0,0 +1,61 @@
+declare module 'pushwoosh-react-native-plugin' {
+  interface PushwooshConfig {
+    pw_appid: string;
+    project_number: string;
+    pw_notification_handling?: string;
+  }
+  type LocalNotification = {
+    msg: string;
+    seconds: number;
+    userData?: Object;
+  }
+
+  interface PushwooshTags {
+    [index: string]: string | number | string[] | number[]
+  }
+
+  interface Pushwoosh {
+    init(config: PushwooshConfig, success?: () => void, fail?: () => void): void;
+    createLocalNotification(notification: LocalNotification): void;
+    clearLocalNotification(): void;
+    clearNotificationCenter(): void;
+    register(success?: (token: string) => void, fail?: (error: Error) => void): void;
+    unregister(success?: (token: string) => void, fail?: (error: Error) => void): void;
+    onPushOpen(callback: () => void, fail?: ()=> void): void; 
+    setTags(
+      tags: Record<string, PushwooshTags>,
+      success?: () => void,
+      fail?: (error: Error) => void
+    ): void;
+    getTags(success: (tags: PushwooshTags) => void, fail?: (error: Error) => void): void;
+    setShowPushnotificationAlert(showAlert: boolean): void;
+    getShowPushnotificationAlert(callback: (willShow: boolean) => void): void;
+    getPushToken(success?: (token: string) => void): void;
+    getHwid(success: (hwid: string) => void): void;
+    setUserId(userId: string, success?: ()=> void, fail?: (error: Error) => void): void;
+    postEvent(event: string, attributes?: Record<string, string>): void;
+    setApplicationIconBadgeNumber(badgeNumber: number): void;
+    getApplicationIconBadgeNumber(callback: (badge: number) => void): void;
+    addToApplicationIconBadgeNumber(badgeNumber: number): void;
+    setMultiNotificationMode(on: boolean): void;
+    setLightScreenOnNotification(on: boolean): void;
+    setEnableLED(on: boolean): void;
+    setColorLED(color: number): void;
+    setSoundType(type: number): void;
+    setVibrateType(type: number): void;
+    presentInboxUI(style?: Object): void;
+    showGDPRConsentUI(): void;
+    showGDPRDeletionUI(): void;
+    isDeviceDataRemoved(success: (isRemoved: boolean) => void): void;
+    isCommunicationEnabled(success: (isEnabled: boolean)=> void): void;
+    isAvailableGDPR(success: (isAvailable: boolean) => void): void;
+    setCommunicationEnabled(enabled: boolean, success?: () => void, fail?: (error: Error) => void): void;
+    removeAllDeviceData(success?: () => void, fail?: (error: Error) => void): void;
+    setNotificationIconBackgroundColor(color: string): void;
+    setLanguage(language: string): void;
+    enableHuaweiPushNotifications(): void;
+  }
+
+  declare const Pushwoosh: Pushwoosh;
+  export = Pushwoosh;
+}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.12",
+  "version": "6.1.15",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
+  "types": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Pushwoosh/pushwoosh-react-native-plugin.git"

package/pushwoosh-react-native-plugin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "6.1.12"
+  s.version          = "6.1.15"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'Pushwoosh'
-  s.dependency 'PushwooshInboxUI'
-end
+  s.dependency 'PushwooshXCFramework'
+  s.dependency 'PushwooshInboxUIXCFramework'
+end

package/src/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url "https://maven.google.com"
         }
@@ -8,13 +8,12 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.4'
-        classpath 'com.google.gms:google-services:4.3.3'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url "https://maven.google.com"
         }
@@ -38,21 +37,11 @@ android {
 }
 
 ext {
-    pushwoosh = "6.4.1"
+    pushwoosh = "6.6.0"
 }
 
 evaluationDependsOn(':app')
 
-rootProject.subprojects {
-    if (name == "app") {
-        if (!plugins.hasPlugin('com.google.gms.google-services')) {
-            apply {
-                plugin com.google.gms.googleservices.GoogleServicesPlugin
-            }
-        }
-    }
-}
-
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation "com.pushwoosh:pushwoosh:${pushwoosh}"

package/src/android/src/main/AndroidManifest.xml

@@ -11,7 +11,14 @@
 		<meta-data
 			android:name="com.pushwoosh.internal.plugin_provider"
 			android:value="com.pushwoosh.reactnativeplugin.internal.ReactNativePluginProvider" />
+            
+<!--    <service android:name="com.pushwoosh.reactnativeplugin.CustomFirebaseMessagingService" android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+-->
 	
 	</application>
 
-</manifest>
+</manifest>

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/CustomFirebaseMessagingService.java

@@ -0,0 +1,29 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import androidx.annotation.NonNull;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import com.pushwoosh.firebase.PushwooshFcmHelper;
+
+public class CustomFirebaseMessagingService extends FirebaseMessagingService {
+    @Override
+    public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        if (PushwooshFcmHelper.isPushwooshMessage(remoteMessage)){
+            PushwooshFcmHelper.onMessageReceived(this, remoteMessage);
+        } else {
+            //handle push from a different service here
+        }
+    }
+
+    @Override
+    public void onNewToken(@NonNull String s) {
+        super.onNewToken(s);
+        PushwooshFcmHelper.onTokenRefresh(s);
+        sendTokenToAnotherService();
+    }
+
+    public void sendTokenToAnotherService() {
+        //handle push registration of another service here
+    }
+}

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshPlugin.java

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.pushwoosh.GDPRManager;
 import com.pushwoosh.Pushwoosh;
+import com.pushwoosh.RegisterForPushNotificationsResultData;
 import com.pushwoosh.badge.PushwooshBadge;
 import com.pushwoosh.exception.GetTagsException;
 import com.pushwoosh.exception.PushwooshException;
@@ -504,7 +505,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		}
 	}
 
-	private class RegisterForPushNotificationCallback implements com.pushwoosh.function.Callback<String, RegisterForPushNotificationsException> {
+	private class RegisterForPushNotificationCallback implements com.pushwoosh.function.Callback<RegisterForPushNotificationsResultData, RegisterForPushNotificationsException> {
 		private Callback success;
 		private Callback error;
 
@@ -514,10 +515,10 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		}
 
 		@Override
-		public void process(Result<String, RegisterForPushNotificationsException> result) {
+		public void process(Result<RegisterForPushNotificationsResultData, RegisterForPushNotificationsException> result) {
 			if (result.isSuccess()) {
-				if (success != null) {
-					success.invoke(result.getData());
+				if (success != null && result.getData() != null) {
+					success.invoke(result.getData().getToken());
 					success = null;
 				}
 			} else if (result.getException() != null) {

package/src/ios/PWNotificationExtensionManager.h

@@ -28,6 +28,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)handleNotificationRequest:(UNNotificationRequest *)request contentHandler:(void (^)(UNNotificationContent *))contentHandler;
 
+/**
+ Example:
+ @code
+ - (void)didReceiveNotificationRequest:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent * _Nonnull))contentHandler {
+     self.contentHandler = contentHandler;
+     self.bestAttemptContent = [request.content mutableCopy];
+     
+     [[PWNotificationExtensionManager sharedManager] handleNotificationRequest:request withAppGroups:@"group.com.example_domain.example_app_name."];
+ }
+ @endcode
+ */
+- (void)handleNotificationRequest:(UNNotificationRequest *)request withAppGroups:(NSString * _Nullable)appGroupsName;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/src/ios/PushNotificationManager.h

@@ -385,14 +385,6 @@ typedef void (^PushwooshErrorHandler)(NSError *error);
  */
 - (void)sendAppOpen;
 
-/**
- Sends current badge value to server. Called internally by SDK Runtime when `UIApplication` `setApplicationBadgeNumber:` is set. This function is used for "auto-incremeting" badges to work.
- This way Pushwoosh server can know what current badge value is set for the application.
- 
- @param badge Current badge value.
- */
-- (void)sendBadges:(NSInteger)badge __API_AVAILABLE(macos(10.10), ios(8.0));
-
 + (NSString *)pushwooshVersion;
 
 #if TARGET_OS_IOS

package/src/ios/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.3.3"
+#define PUSHWOOSH_VERSION @"6.4.3"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -81,6 +81,11 @@ Tells the delegate that the user has pressed on the push notification banner.
 */
 @property (nonatomic, readonly) NSUInteger badge;
 
+/**
+ Extension badge number of the push message.
+*/
+@property (nonatomic, readonly) NSUInteger badgeExtension;
+
 /**
  Remote URL or deeplink from the push message.
 */