pushwoosh-cordova-plugin 8.3.16 → 8.3.17

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.16",
+  "version": "8.3.17",
   "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",

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.16">
+<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.17">
 
 	<name>Pushwoosh</name>
 
@@ -77,13 +77,13 @@
         <framework src="com.github.bumptech.glide:glide:4.10.0" />
         <framework src="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" />
 
-        <framework src="com.pushwoosh:pushwoosh:6.6.16"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.6.16"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.6.16"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.6.16"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.6.16"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.6.16"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.6.16"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.0"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.0"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.0"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.0"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.0"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.0"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.0"/>
 	</platform>
 
 	<!-- ios -->

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

@@ -29,8 +29,12 @@ import com.pushwoosh.exception.UnregisterForPushNotificationException;
 import com.pushwoosh.function.Callback;
 import com.pushwoosh.function.Result;
 import com.pushwoosh.inapp.PushwooshInApp;
+import com.pushwoosh.inbox.PushwooshInbox;
+import com.pushwoosh.inbox.data.InboxMessage;
+import com.pushwoosh.inbox.exception.InboxMessagesException;
 import com.pushwoosh.inbox.ui.presentation.view.activity.InboxActivity;
 import com.pushwoosh.internal.platform.utils.GeneralUtils;
+import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
 import com.pushwoosh.notification.LocalNotification;
 import com.pushwoosh.notification.LocalNotificationReceiver;
@@ -43,7 +47,6 @@ import com.pushwoosh.tags.TagsBundle;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.CordovaWebView;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -52,6 +55,7 @@ import java.lang.annotation.Retention;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -322,12 +326,12 @@ public class PushNotifications extends CordovaPlugin {
 			if (message == null) {
 				return false;
 			}
-			
+
 			Bundle extras = new Bundle();
 			if (params.has("userData")) {
 				extras.putString("u", params.getString("userData"));
 			}
-			
+
 			LocalNotification notification = new LocalNotification.Builder()
 					.setMessage(message)
 					.setDelay(seconds)
@@ -603,6 +607,156 @@ public class PushNotifications extends CordovaPlugin {
 		return true;
 	}
 
+	@CordovaMethod
+	private boolean loadMessages(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			callbackIds.put("loadMessages", callbackContext);
+			PushwooshInbox.loadMessages(new Callback<Collection<InboxMessage>, InboxMessagesException>() {
+				@Override
+				public void process(@NonNull Result<Collection<InboxMessage>, InboxMessagesException> result) {
+					CallbackContext callback = callbackIds.get("loadMessages");
+					if (callback == null)
+						return;
+
+					if(result.isSuccess() && result.getData() != null) {
+						ArrayList<InboxMessage> messagesList = new ArrayList<>(result.getData());
+						JSONArray jsonArray = new JSONArray();
+						for (InboxMessage message : messagesList){
+							jsonArray.put(inboxMessageToJson(message));
+						}
+						callback.success(jsonArray);
+					} else if (result.getException() != null){
+						callback.error(result.getException().getMessage());
+					}
+				}
+			});
+		} catch (java.lang.RuntimeException e) {
+			callbackIds.remove("loadMessages");
+			PWLog.error(TAG, "Failed to load inbox messages", e);
+
+			callbackContext.error(e.getMessage());
+		}
+
+		return true;
+	}
+
+	@CordovaMethod
+	public boolean messagesWithNoActionPerformedCount(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			callbackIds.put("messagesWithNoActionPerformedCount", callbackContext);
+			PushwooshInbox.messagesWithNoActionPerformedCount(new Callback<Integer, InboxMessagesException>() {
+				@Override
+				public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+					CallbackContext callback = callbackIds.get("messagesWithNoActionPerformedCount");
+					if (callback == null)
+						return;
+
+					if(result.isSuccess() && result.getData() != null) {
+						callback.success(result.getData());
+					} else if (result.getException() != null){
+						callback.error(result.getException().getMessage());
+					}
+				}
+			});
+		} catch (java.lang.RuntimeException e) {
+			callbackIds.remove("messagesWithNoActionPerformedCount");
+			PWLog.error(TAG, "Failed to get number of messages with no action", e);
+
+			callbackContext.error(e.getMessage());
+		}
+
+		return true;
+	}
+
+	@CordovaMethod
+	public boolean unreadMessagesCount(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			callbackIds.put("unreadMessagesCount", callbackContext);
+			PushwooshInbox.unreadMessagesCount(new Callback<Integer, InboxMessagesException>() {
+				@Override
+				public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+					CallbackContext callback = callbackIds.get("unreadMessagesCount");
+					if (callback == null)
+						return;
+
+					if(result.isSuccess() && result.getData() != null) {
+						callback.success(result.getData());
+					} else if (result.getException() != null){
+						callback.error(result.getException().getMessage());
+					}
+				}
+			});
+		} catch (java.lang.RuntimeException e) {
+			callbackIds.remove(" unreadMessagesCount");
+			PWLog.error(TAG, "Failed to get number of unread messages", e);
+
+			callbackContext.error(e.getMessage());
+		}
+
+		return true;
+	}
+
+	@CordovaMethod
+	public boolean messagesCount(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			callbackIds.put("messagesCount", callbackContext);
+			PushwooshInbox.messagesCount(new Callback<Integer, InboxMessagesException>() {
+				@Override
+				public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+					CallbackContext callback = callbackIds.get("messagesCount");
+					if (callback == null)
+						return;
+
+					if(result.isSuccess() && result.getData() != null) {
+						callback.success(result.getData());
+					} else if (result.getException() != null){
+						callback.error(result.getException().getMessage());
+					}
+				}
+			});
+		} catch (java.lang.RuntimeException e) {
+			callbackIds.remove(" messagesCount");
+			PWLog.error(TAG, "Failed to get total number of inbox messages", e);
+
+			callbackContext.error(e.getMessage());
+		}
+
+		return true;
+	}
+
+	@CordovaMethod
+	public boolean readMessage(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			PushwooshInbox.readMessage(data.getString(0));
+			return true;
+		} catch (JSONException e) {
+			PWLog.error(TAG, "Failed to mark inbox message as read", e);
+			return false;
+		}
+	}
+
+	@CordovaMethod
+	public boolean deleteMessage(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			PushwooshInbox.deleteMessage(data.getString(0));
+			return true;
+		} catch (JSONException e) {
+			PWLog.error(TAG, "Failed to delete inbox message", e);
+			return false;
+		}
+	}
+
+	@CordovaMethod
+	public boolean performAction(JSONArray data, final CallbackContext callbackContext) {
+		try {
+			PushwooshInbox.performAction(data.getString(0));
+			return true;
+		} catch (JSONException e) {
+			PWLog.error(TAG, "Failed to perform action for inbox message", e);
+			return false;
+		}
+	}
+
 	@CordovaMethod
 	public boolean showGDPRConsentUI(JSONArray data, final CallbackContext callbackContext){
 		GDPRManager.getInstance().showGDPRConsentUI();
@@ -887,4 +1041,29 @@ public class PushNotifications extends CordovaPlugin {
 		return true;
 	}
 
+	private static JSONObject inboxMessageToJson(InboxMessage message) {
+		JSONObject object = new JSONObject();
+		try {
+			object.put("code", message.getCode())
+					.put("title", message.getTitle())
+					.put("imageUrl", message.getImageUrl())
+					.put("message",message.getMessage())
+					.put("sendDate",message.getISO8601SendDate())
+					.put("type", message.getType().getCode())
+					.put("bannerUrl", message.getBannerUrl())
+					.put("isRead",message.isRead())
+					.put("actionParams",message.getActionParams())
+					.put("isActionPerformed",message.isActionPerformed());
+
+			Bundle bundle = JsonUtils.jsonStringToBundle( message.getActionParams());
+			String customData = bundle.getString("u");
+			if (customData != null) {
+				object.put("customData", customData);
+			}
+		} catch (JSONException e) {
+			PWLog.error("PushwooshInbox", "Failed to fetch inbox message :" + e.getMessage());
+		}
+		return object;
+	}
+
 }

package/src/ios/PushNotification.m

@@ -15,6 +15,7 @@
 #import <PushwooshInboxUI/PushwooshInboxUI.h>
 #import <Pushwoosh/PWGDPRManager.h>
 #import <Pushwoosh/PWInAppManager.h>
+#import <Pushwoosh/PWInbox.h>
 #import "PWBackward.h"
 
 #import "AppDelegate.h"
@@ -274,6 +275,83 @@ static PushNotification *pw_PushNotificationPlugin;
 	}];
 }
 
+- (void)loadMessages:(CDVInvokedUrlCommand *)command {
+    // The first argument in the arguments parameter is the callbackID.
+    self.callbackIds[@"loadMessages"] = command.callbackId;
+    [PWInbox loadMessagesWithCompletion:^(NSArray<NSObject<PWInboxMessageProtocol> *> *messages, NSError *error) {
+        if (!error) {
+            NSMutableArray* array = [[NSMutableArray alloc] init];
+            for (NSObject<PWInboxMessageProtocol>* message in messages) {
+                NSDictionary* dict = [self inboxMessageToDictionary:message];
+                [array addObject:dict];
+            }
+            
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:array];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"loadMessages"]];
+        } else {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:error.localizedDescription];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"loadMessages"]];
+        }
+    }];
+}
+
+- (void)unreadMessagesCount:(CDVInvokedUrlCommand *)command {
+    // The first argument in the arguments parameter is the callbackID.
+    self.callbackIds[@"unreadMessagesCount"] = command.callbackId;
+    [PWInbox unreadMessagesCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(int)count];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"unreadMessagesCount"]];
+        }
+    }];
+}
+
+- (void)messagesWithNoActionPerformedCount:(CDVInvokedUrlCommand *)command {
+    // The first argument in the arguments parameter is the callbackID.
+    self.callbackIds[@"messagesWithNoActionPerformedCount"] = command.callbackId;
+    [PWInbox messagesWithNoActionPerformedCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(int)count];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"messagesWithNoActionPerformedCount"]];
+        }
+    }];
+}
+
+- (void)messagesCount:(CDVInvokedUrlCommand *)command {
+    // The first argument in the arguments parameter is the callbackID.
+    self.callbackIds[@"messagesCount"] = command.callbackId;
+    [PWInbox messagesCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(int)count];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"messagesCount"]];
+        }
+    }];
+}
+
+- (void)readMessage:(CDVInvokedUrlCommand *)command {
+    NSString *messageCode = command.arguments[0];
+    if (messageCode.length != 0) {
+        NSArray *array = [NSArray arrayWithObject:messageCode];
+        [PWInbox readMessagesWithCodes:array];
+    }
+}
+
+- (void)deleteMessage:(CDVInvokedUrlCommand *)command {
+    NSString *messageCode = command.arguments[0];
+    if (messageCode.length != 0) {
+        NSArray *array = [NSArray arrayWithObject:messageCode];
+        [PWInbox deleteMessagesWithCodes:array];
+    }
+}
+
+- (void)performAction:(CDVInvokedUrlCommand *)command {
+    NSString *messageCode = command.arguments[0];
+    if (messageCode.length != 0) {
+        [PWInbox performActionForMessageWithCode:messageCode];
+    }
+}
+
+
 - (void)createLocalNotification:(CDVInvokedUrlCommand *)command {
     NSDictionary *params = command.arguments[0];
     NSString *body = params[@"msg"];
@@ -661,6 +739,35 @@ BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id applicat
 	pushwoosh_swizzle([delegate class], @selector(application:didRegisterUserNotificationSettings:), @selector(application:pwplugin_didRegisterUserNotificationSettings:), (IMP)pwplugin_didRegisterUserNotificationSettings, "v@:::");
 }
 
+- (NSDictionary*)inboxMessageToDictionary:(NSObject<PWInboxMessageProtocol>*) message {
+    NSMutableDictionary* dictionary = [[NSMutableDictionary alloc] init];
+    [dictionary setValue:@(message.type) forKey:@"type"];
+    [dictionary setValue:[self stringOrEmpty: message.imageUrl] forKey:@"imageUrl"];
+    [dictionary setValue:[self stringOrEmpty: message.code] forKey:@"code"];
+    [dictionary setValue:[self stringOrEmpty: message.title] forKey:@"title"];
+    [dictionary setValue:[self stringOrEmpty: message.message] forKey:@"message"];
+    [dictionary setValue:[self stringOrEmpty: [self dateToString:message.sendDate]] forKey:@"sendDate"];
+    [dictionary setValue:@(message.isRead) forKey:@"isRead"];
+    [dictionary setValue:@(message.isActionPerformed) forKey:@"isActionPerformed"];
+    
+    NSDictionary* actionParams = [NSDictionary dictionaryWithDictionary:message.actionParams];
+    NSData* customData = [actionParams valueForKey:@"u"];
+    [dictionary setValue:customData forKey:@"customData"];
+    
+    NSDictionary* result = [NSDictionary dictionaryWithDictionary:dictionary];
+    return result;
+}
+
+- (NSString *)stringOrEmpty:(NSString *)string {
+    return string != nil ? string : @"";
+}
+
+- (NSString*)dateToString:(NSDate*)date {
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyy-MM-dd'T'H:mm:ssZ"];
+    return [formatter stringFromDate:date];
+}
+
 - (void)dealloc {
 	self.pushManager = nil;
 	self.startPushData = nil;

package/types/PushNotification.d.ts

@@ -14,6 +14,20 @@ type LocalNotification = {
 	userData?: Object;
 }
 
+type InboxNotification = {
+	code: string;
+	title?: string;
+	message?: string;
+	imageUrl?: string;
+	sendDate?: string;
+	type?: number;
+	bannerUrl?: string;
+	customData?: Object;
+	isRead?: boolean;
+	actionParams?: Object;
+	isActionPerformed?: boolean;
+}
+
 type AuthOptions = Record<string, number|string>
 
 type RemoteNotificationStatus = Record<string,string|number|boolean>
@@ -39,6 +53,7 @@ export interface PushNotification {
 	getLaunchNotification(success?: (notification: string) => void): void;
 	clearLaunchNotification(success?: () => void): void;
 	setUserId(userId: string): void;
+	setLanguage(language: string): void;
 	postEvent(event: string, attributes?: Record<string, string>): void;
 	addJavaScriptInterface(bridgeName: string): void;
 	createLocalNotification(notification: LocalNotification, success?: () => void, fail?: () => void): void;
@@ -50,6 +65,13 @@ export interface PushNotification {
 	pushReceivedCallback(notification: string): void;
 	notificationCallback(notification: string): void;
 	presentInboxUI(params?: Record<string,any>): void;
+	loadMessages(success?: (messages: InboxNotification[]) =>void, fail?: (error?: Error|string) => void): void;
+	messagesWithNoActionPerformedCount(callback: (result: number) => void): void;
+    unreadMessagesCount(callback: (result: number) => void): void;
+    messagesCount(callback: (result: number) => void): void;
+    readMessage(id: string): void;
+    deleteMessage(id: string): void;
+    performAction(id: string): void;
 	showGDPRConsentUI(): void;
 	showGDPRDeletionUI(): void;
 	setCommunicationEnabled(enable: boolean, success?: () => void, fail?: (callback: Error|string) => void): void;

package/www/PushNotification.js

@@ -552,6 +552,41 @@ PushNotification.prototype.presentInboxUI = function(params) {
 	exec(null, null, "PushNotification", "presentInboxUI", [ params ]);
 }
 
+// Load an array of InboxNotification objects
+PushNotification.prototype.loadMessages = function(success, fail) {
+	exec(success, fail, "PushNotification", "loadMessages", []);
+}
+
+// Get number of inbox messages with no action performed
+PushNotification.prototype.messagesWithNoActionPerformedCount = function(success) {
+	exec(success, null, "PushNotification", "messagesWithNoActionPerformedCount", []);
+}
+
+// Get number of unread inbox messages
+PushNotification.prototype.unreadMessagesCount = function(success) {
+	exec(success, null,"PushNotification", "unreadMessagesCount", []);
+}
+
+// Get total number of inbox messages
+PushNotification.prototype.messagesCount = function(success) {
+	exec(success, null,"PushNotification", "messagesCount", []);
+}
+
+// Mark inbox message as read
+PushNotification.prototype.readMessage = function(number) {
+	exec(null, null, "PushNotification", "readMessage", [number]);
+}
+
+// Delete message from inbox
+PushNotification.prototype.deleteMessage = function(number) {
+	exec(null, null, "PushNotification", "deleteMessage", [number]);
+}
+
+// Perform action for specified inbox message (i.e. open URL)
+PushNotification.prototype.performAction = function(number) {
+	exec(null, null, "PushNotification", "performAction", [number]);
+}
+
 // Show inApp for change setting Enable/disable all communication with Pushwoosh
 PushNotification.prototype.showGDPRConsentUI = function() {
 	exec(null, null, "PushNotification", "showGDPRConsentUI", []);