pushwoosh-cordova-plugin 8.3.3 → 8.3.6

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.3.3
+cordova plugin add pushwoosh-cordova-plugin@8.3.6
 ```
 
 Using git:
 
 ```
-cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.3
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.6
 ```
 
 #### 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.3.3
+cordova plugin add pushwoosh-cordova-plugin@8.3.6
 ```
 
 ### 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.3.3
+cordova plugin add pushwoosh-pgb-plugin@8.3.6
 ```
 
 ### Guide

package/package.json

@@ -1,7 +1,9 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.3",
+  "version": "8.3.6",
   "description": "\n    This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n    ",
+  "main":"www/PushNotification.js",
+  "typings":"types/index.d.ts",
   "cordova": {
     "id": "pushwoosh-cordova-plugin",
     "platforms": [

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.3.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.6">
 
 	<name>Pushwoosh</name>
 
@@ -77,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.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"/>
+        <framework src="com.pushwoosh:pushwoosh:6.6.1"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.6.1"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.6.1"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.6.1"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.6.1"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.6.1"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.6.1"/>
 	</platform>
 
 	<!-- ios -->
@@ -98,6 +98,12 @@
 				<param name="ios-package" value="PushNotification"/>
 			</feature>
 		</config-file>
+        
+        <config-file target="*-Info.plist" parent="UIBackgroundModes">
+          <array>
+            <string>remote-notification</string>
+          </array>
+        </config-file>
 
 		<config-file target="*-Info.plist" parent="Pushwoosh_LOG_LEVEL">
 			<string>$LOG_LEVEL</string>
@@ -113,23 +119,24 @@
 		<config-file parent="aps-environment" target="*/Entitlements-Release.plist">
 			<string>production</string>
 		</config-file>
+        
+        <podspec>
+            <config>
+                <source url="https://github.com/CocoaPods/Specs.git"/>
+            </config>
+            <pods use-frameworks="true">
+                <pod name="PushwooshXCFramework" spec="6.4.5" />
+                <pod name="PushwooshInboxUIXCFramework" spec="6.1.1" />
+            </pods>
+        </podspec>
+        <framework src="Pods/PushwooshXCFramework/XCFramework/Pushwoosh.xcframework" embed="true" />
 
 		<header-file src="src/ios/PushNotification.h" target-dir="ios"/>
 		<source-file src="src/ios/PushNotification.m" target-dir="ios"/>
         <header-file src="src/ios/PWBackward.h" target-dir="ios"/>
         <source-file src="src/ios/PWBackward.m" target-dir="ios"/>
-		<header-file src="src/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h" target-dir="ios"/>
-		<header-file src="src/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h" target-dir="ios"/>
-		<header-file src="src/ios/Pushwoosh.framework/Versions/A/Headers/PWGDPRManager.h" target-dir="ios"/>
-		<header-file src="src/ios/PWLog.h" target-dir="ios"/>
-        <header-file src="src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h" target-dir="ios"/>
-        <header-file src="src/ios/PushwooshInboxUI.framework/Versions/A/Headers/PushwooshInboxUI.h" target-dir="ios"/>
-        <header-file src="src/ios/PushwooshInboxUI.framework/Versions/A/Headers/PWIInboxStyle.h" target-dir="ios"/>
-        <header-file src="src/ios/PushwooshInboxUI.framework/Versions/A/Headers/PWIInboxUI.h" target-dir="ios"/>
-        
-		<source-file src="src/ios/Pushwoosh.framework/Versions/A/libPushwoosh.a" framework="true"/>
-        <source-file src="src/ios/PushwooshInboxUI.framework/Versions/A/libPushwooshInboxUI.a" framework="true"/>
-        <resource-file src="src/ios/PushwooshInboxBundle.bundle" />
+        <header-file src="src/ios/PWLog.h" target-dir="ios"/>
+        <resource-file src="src/ios/" />
 	</platform>
 
 	<!-- wp8 -->

package/src/android/src/com/pushwoosh/plugin/pushnotifications/PushNotifications.java

@@ -20,6 +20,7 @@ import android.webkit.JavascriptInterface;
 
 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;
@@ -175,11 +176,11 @@ public class PushNotifications extends CordovaPlugin {
 	private boolean registerDevice(JSONArray data, CallbackContext callbackContext) {
 		try {
 			callbackIds.put("registerDevice", callbackContext);
-			Pushwoosh.getInstance().registerForPushNotifications(new Callback<String, RegisterForPushNotificationsException>() {
+			Pushwoosh.getInstance().registerForPushNotifications(new Callback<RegisterForPushNotificationsResultData, RegisterForPushNotificationsException>() {
 				@Override
-				public void process(@NonNull final Result<String, RegisterForPushNotificationsException> result) {
-					if (result.isSuccess()) {
-						doOnRegistered(result.getData());
+				public void process(@NonNull final Result<RegisterForPushNotificationsResultData, RegisterForPushNotificationsException> result) {
+					if (result.isSuccess() && result.getData != null) {
+						doOnRegistered(result.getData().getToken());
 					} else if (result.getException() != null) {
 						doOnRegisteredError(result.getException().getMessage());
 					}

package/src/ios/PushNotification.h

@@ -12,7 +12,8 @@
 #import <Foundation/Foundation.h>
 #import <Cordova/CDV.h>
 #import <Cordova/CDVPlugin.h>
-#import "PushNotificationManager.h"
+#import <Pushwoosh/Pushwoosh.h>
+#import <Pushwoosh/PushNotificationManager.h>
 
 @interface PushNotification : CDVPlugin <PushNotificationDelegate> 
 

package/src/ios/PushNotification.m

@@ -12,11 +12,10 @@
 
 #import "PushNotification.h"
 #import "PWLog.h"
-#import "PushwooshInboxUI.h"
-#import "PWGDPRManager.h"
-#import "PWInAppManager.h"
+#import <PushwooshInboxUI/PushwooshInboxUI.h>
+#import <Pushwoosh/PWGDPRManager.h>
+#import <Pushwoosh/PWInAppManager.h>
 #import "PWBackward.h"
-#import "Pushwoosh.h"
 
 #import "AppDelegate.h"
 

package/src/ios/Pushwoosh.framework/Versions/A/Headers/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/Pushwoosh.framework/Versions/A/Headers/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.framework/Versions/A/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.3.5"
+#define PUSHWOOSH_VERSION @"6.4.2"
 
 
 @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.
 */

package/types/PushNotification.d.ts

@@ -0,0 +1,68 @@
+interface PushwooshConfig {
+	projectid: string,
+	appid: string,
+	serviceName?: string
+}
+
+type SuccessRegistrationCallback = {
+	pushToken: string;
+}
+
+type LocalNotification = {
+	msg: string;
+	seconds: number;
+	userData?: Object;
+}
+
+type AuthOptions = Record<string, number|string>
+
+type RemoteNotificationStatus = Record<string,string|number|boolean>
+
+interface PushwooshTags {
+	[index: string]: string | number | string[] | number[]
+}
+
+export interface PushNotification {
+	onDeviceReady(config: PushwooshConfig): void;
+	onAppActivated(config: Object): void;
+	registerDevice(success?: (callback: SuccessRegistrationCallback) => void, fail?: (error: Error|string) => void): void;
+	unregisterDevice(success?: (callback?: string) => void, fail?: (error?: Error|string) => void): void;
+	additionalAuthorizationOptions(options: AuthOptions): void;
+	setTags(config: PushwooshTags, success?: (tags?: Record<string,PushwooshTags>) => void, fail?: (error?: Error|string) => void): void;
+	getTags(success?: (tags: PushwooshTags) => void, fail?: (error?: Error|string) => void): void;
+	getPushToken(success?: (pushToken: string) => void): void;
+	getPushwooshHWID(success?: (hwid: string) => void): void;
+	getRemoteNotificationStatus(success?: (status: RemoteNotificationStatus) => void, fail?: (error: Error|string) => void): void;
+	setApplicationIconBadgeNumber(badge: number): void;
+	getApplicationIconBadgeNumber(success?: (badge: number) => void): void;
+	addToApplicationIconBadgeNumber(badge: number|string): void;
+	getLaunchNotification(success?: (notification: string) => void): void;
+	clearLaunchNotification(success?: () => void): void;
+	setUserId(userId: string): void;
+	postEvent(event: string, attributes?: Record<string, string>): void;
+	addJavaScriptInterface(bridgeName: string): void;
+	createLocalNotification(notification: LocalNotification, success?: () => void, fail?: () => void): void;
+	clearLocalNotification(): void;
+	clearNotificationCenter(): void;
+	setMultiNotificationMode(success?: () => void, fail?: () => void): void;
+	setSingleNotificationMode(success?: () => void, fail?: () => void): void;
+	cancelAllLocalNotifications(success?: () => void): void;
+	pushReceivedCallback(notification: string): void;
+	notificationCallback(notification: string): void;
+	presentInboxUI(params?: Record<string,any>): void;
+	showGDPRConsentUI(): void;
+	showGDPRDeletionUI(): void;
+	setCommunicationEnabled(enable: boolean, success?: () => void, fail?: (callback: Error|string) => void): void;
+	removeAllDeviceData(success?: () => void, fail?: (callback: Error|string) => void): void;
+	isCommunicationEnabled(success: (enabled: boolean) => void): void;
+	isDeviceDataRemoved(success: (removed: boolean) => void): void;
+	isAvailableGDPR(success: (isAvailable: boolean) => void): void;
+	enableHuaweiPushNotifications(): void;
+	setSoundType(type: string, success?: () => void, fail?: () => void): void;
+	setVibrateType(type: string, success?: () => void, fail?: () => void): void;
+	setLightScreenOnNotification(on: boolean, success?: () => void, fail?: () => void): void;
+	setEnableLED(on: boolean, success?: () => void, fail?: () => void): void;
+	setColorLED(color: string, success?: () => void, fail?: () => void): void;
+	getPushHistory(success?: (pushHistory: Object) => void): void;
+	clearPushHistory(callback: () => void): void;
+}

package/types/index.d.ts

@@ -0,0 +1,5 @@
+import { PushNotification } from './PushNotification';
+
+export declare const Pushwoosh: PushNotification;
+export { PushNotification };
+export default Pushwoosh;

package/www/PushNotification.js

@@ -9,7 +9,7 @@
 //
 // MIT Licensed
 
-var exec = require('cordova/exec');
+var exec = window.cordova.exec;
 
 //Class: PushNotification
 //Class to interact with Pushwoosh Push Notifications plugin