pushwoosh-cordova-plugin 8.2.3 → 8.3.2

package/README.md

@@ -14,13 +14,13 @@ Cross-Platform push notifications by Pushwoosh for Cordova / PhoneGap
 Using npm (requires cordova 7.0+):
 
 ```
-cordova plugin add pushwoosh-cordova-plugin@8.2.3
+cordova plugin add pushwoosh-cordova-plugin@8.3.2
 ```
 
 Using git:
 
 ```
-cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.2.3
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.2
 ```
 
 #### Phonegap
@@ -28,7 +28,7 @@ cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.
 Using npm (requires phonegap 7.1+):
 
 ```
-cordova plugin add pushwoosh-cordova-plugin@8.2.3
+cordova plugin add pushwoosh-cordova-plugin@8.3.2
 ```
 
 ### Guide

package/README_PGB.md

@@ -14,7 +14,7 @@ Cross-Platform push notifications by Pushwoosh for PhoneGap
 Using npm (requires cordova 5.0+):
 
 ```
-cordova plugin add pushwoosh-pgb-plugin@8.2.3
+cordova plugin add pushwoosh-pgb-plugin@8.3.2
 ```
 
 ### Guide

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.2.3",
+  "version": "8.3.2",
   "description": "\n    This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n    ",
   "cordova": {
     "id": "pushwoosh-cordova-plugin",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.2.3">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.2">
 
 	<name>Pushwoosh</name>
 
@@ -26,7 +26,10 @@
 
 	<!-- android -->
 	<platform name="android">
-		<framework src="build.gradle" custom="true" type="gradleReference" />
+        <config-file target="config.xml" parent="/*">
+            <preference name="GradlePluginGoogleServicesEnabled" value="true" />
+            <preference name="GradlePluginGoogleServicesVersion" value="4.3.10" />
+        </config-file>
 
 		<config-file target="AndroidManifest.xml" parent="/manifest/application">
 			<meta-data android:name="com.pushwoosh.log_level" android:value="$LOG_LEVEL" />
@@ -35,6 +38,12 @@
 			<meta-data android:name="com.pushwoosh.notification_service_extension" android:value="com.pushwoosh.plugin.pushnotifications.PushwooshNotificationServiceExtension" />
 
 			<meta-data android:name="com.pushwoosh.internal.plugin_provider"	android:value="com.pushwoosh.plugin.internal.PhonegapPluginProvider" />
+            
+<!--            <service android:name="com.pushwoosh.plugin.pushnotifications.CustomFirebaseMessagingService" android:exported="false">-->
+<!--                <intent-filter>-->
+<!--                    <action android:name="com.google.firebase.MESSAGING_EVENT"/>-->
+<!--                </intent-filter>-->
+<!--            </service>-->
 		</config-file>
 
 		<config-file target="res/xml/config.xml" parent="/*">
@@ -51,6 +60,9 @@
 
 		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/PushwooshNotificationServiceExtension.java"
 			target-dir="src/com/pushwoosh/plugin/pushnotifications" />
+            
+        <source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/CustomFirebaseMessagingService.java"
+            target-dir="src/com/pushwoosh/plugin/pushnotifications"/>
 
 		<source-file src="src/android/src/com/pushwoosh/plugin/internal/PhonegapPluginProvider.java"
 			target-dir="src/com/pushwoosh/plugin/internal" />
@@ -65,13 +77,13 @@
         <framework src="com.android.support.constraint:constraint-layout:1.0.2" />
         <framework src="com.github.bumptech.glide:glide:4.7.1" />
         <framework src="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" />
-        <framework src="com.pushwoosh:pushwoosh:6.3.6"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.3.6"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.3.6"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.3.6"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.3.6"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.3.6"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.3.6"/>
+        <framework src="com.pushwoosh:pushwoosh:6.4.4"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.4.4"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.4.4"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.4.4"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.4.4"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.4.4"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.4.4"/>
 	</platform>
 
 	<!-- ios -->

package/src/android/src/com/pushwoosh/plugin/pushnotifications/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/com/pushwoosh/plugin/pushnotifications/PushNotifications.java

@@ -165,6 +165,11 @@ public class PushNotifications extends CordovaPlugin {
 		return true;
 	}
 
+	@CordovaMethod
+	private boolean additionalAuthorizationOptions(JSONArray data, CallbackContext callbackContext) {
+		// Stub, this is iOS only method
+	}
+
 	@CordovaMethod
 	private boolean registerDevice(JSONArray data, CallbackContext callbackContext) {
 		try {
@@ -300,14 +305,12 @@ public class PushNotifications extends CordovaPlugin {
 			if (message == null) {
 				return false;
 			}
-
-			String userData = params.getString("userData");
-
+			
 			Bundle extras = new Bundle();
-			if (userData != null) {
-				extras.putString("u", userData);
+			if (params.has("userData")) {
+				extras.putString("u", params.getString("userData"));
 			}
-
+			
 			LocalNotification notification = new LocalNotification.Builder()
 					.setMessage(message)
 					.setDelay(seconds)

package/src/ios/PushNotification.m

@@ -160,6 +160,28 @@ static PushNotification *pw_PushNotificationPlugin;
 	[[NSUserDefaults standardUserDefaults] synchronize];
 }
 
+// Authorization options in addition to UNAuthorizationOptionBadge | UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionCarPlay. Should be called before registering for pushes
+- (void)additionalAuthorizationOptions:(CDVInvokedUrlCommand *)command {
+    NSDictionary *options = [command.arguments firstObject];
+    NSString* critical = options[@"UNAuthorizationOptionCriticalAlert"];
+    NSString* provisional = options[@"UNAuthorizationOptionProvisional"];
+    NSString* providesSettings = options[@"UNAuthorizationOptionProvidesAppNotificationSettings"];
+    
+    UNAuthorizationOptions authOptions = 0;
+    if (@available(iOS 12.0, *)) {
+        if (critical) {
+            authOptions |= UNAuthorizationOptionCriticalAlert;
+        }
+        if (provisional) {
+            authOptions |= UNAuthorizationOptionProvisional;
+        }
+        if (providesSettings) {
+            authOptions |= UNAuthorizationOptionProvidesAppNotificationSettings;
+        }
+        [Pushwoosh sharedInstance].additionalAuthorizationOptions = authOptions;
+    }
+}
+
 - (void)dispatchPushReceive:(NSDictionary *)pushData {
     NSData *json = [NSJSONSerialization dataWithJSONObject:pushData options:NSJSONWritingPrettyPrinted error:nil];
     NSString *jsonString = [[NSString alloc] initWithData:json encoding:NSUTF8StringEncoding];

package/src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.3.1"
+#define PUSHWOOSH_VERSION @"6.3.5"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;

package/www/PushNotification.js

@@ -79,6 +79,26 @@ PushNotification.prototype.registerDevice = function(success, fail) {
 	exec(success, fail, "PushNotification", "registerDevice", []);
 };
 
+//Function: additionalAuthorizationOptions
+//[ios] Authorization options in addition to UNAuthorizationOptionBadge | UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionCarPlay. 
+//Should be called before registering for pushes
+//
+//Parameters:
+// "options.UNAuthorizationOptionCriticalAlert" - adds UNAuthorizationOptionCriticalAlert option
+// "options.UNAuthorizationOptionProvisional" - adds UNAuthorizationOptionProvisional option
+// "options.UNAuthorizationOptionProvidesAppNotificationSettings" - adds UNAuthorizationOptionProvidesAppNotificationSettings option
+//
+//Example:
+//(start code)
+//	pushwoosh.additionalAuthorizationOptions({ 
+//		"UNAuthorizationOptionCriticalAlert" : 1,
+//		"UNAuthorizationOptionProvisional": 0 // set 0 or don't specify the option if you don't want to add it to your app. 
+//	});
+//(end)
+PushNotification.prototype.additionalAuthorizationOptions = function(options) {
+	exec(null, null, "PushNotification", "additionalAuthorizationOptions", options ? [options] : []);
+}
+
 //Function: unregisterDevice
 //[android, ios, wp8, windows] Unregister device form receiving push notifications
 //

package/build.gradle

@@ -1,25 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.+'
-        classpath 'com.google.gms:google-services:4.3.3'
-    }
-}
-
-cdvPluginPostBuildExtras.add({
-    rootProject.subprojects {
-        if (name == "app") {
-            if (!plugins.hasPlugin('com.google.gms.google-services')) {
-                apply {
-                    plugin com.google.gms.googleservices.GoogleServicesPlugin
-                }
-            }
-        }
-    }
-})