pushwoosh-react-native-plugin 6.1.14 → 6.1.16

package/index.d.ts

@@ -10,11 +10,23 @@ declare module 'pushwoosh-react-native-plugin' {
     userData?: Object;
   }
 
-  interface PushwooshTags {
-    [index: string]: string | number | string[] | number[]
+  type PushwooshTags = Record<string, string | number | string[] | number[] | boolean>
+
+  type InboxNotification = {
+    code: string;
+    title?: string;
+    message?: string;
+    imageUrl?: string;
+    sendDate?: string;
+    type?: number;
+    bannerUrl?: string;
+    customData?: Object;
+    isRead?: boolean;
+    isActionPerformed?: boolean;
   }
 
   interface Pushwoosh {
+    //general interaction with Pushwoosh
     init(config: PushwooshConfig, success?: () => void, fail?: () => void): void;
     createLocalNotification(notification: LocalNotification): void;
     clearLocalNotification(): void;
@@ -23,7 +35,7 @@ declare module 'pushwoosh-react-native-plugin' {
     unregister(success?: (token: string) => void, fail?: (error: Error) => void): void;
     onPushOpen(callback: () => void, fail?: ()=> void): void; 
     setTags(
-      tags: Record<string, PushwooshTags>,
+      tags: PushwooshTags,
       success?: () => void,
       fail?: (error: Error) => void
     ): void;
@@ -34,16 +46,36 @@ declare module 'pushwoosh-react-native-plugin' {
     getHwid(success: (hwid: string) => void): void;
     setUserId(userId: string, success?: ()=> void, fail?: (error: Error) => void): void;
     postEvent(event: string, attributes?: Record<string, string>): void;
+    enableHuaweiPushNotifications(): void;
+
+    //badge methods
     setApplicationIconBadgeNumber(badgeNumber: number): void;
     getApplicationIconBadgeNumber(callback: (badge: number) => void): void;
     addToApplicationIconBadgeNumber(badgeNumber: number): void;
+
+    //Notification appearance
     setMultiNotificationMode(on: boolean): void;
     setLightScreenOnNotification(on: boolean): void;
     setEnableLED(on: boolean): void;
     setColorLED(color: number): void;
     setSoundType(type: number): void;
     setVibrateType(type: number): void;
+    setNotificationIconBackgroundColor(color: string): void;
+    setLanguage(language: string): void;
+
+    //Inbox API
     presentInboxUI(style?: Object): void;
+    messagesWithNoActionPerformedCount(callback: (result: number) => void): void;
+    unreadMessagesCount(callback: (result: number) => void): void;
+    messagesCount(callback: (result: number) => void): void;
+    loadMessages(success: (notifications: InboxNotification[]) => void, fail?: (error: Error) => void): void;
+    readMessage(id: string): void;
+    readMessages(ids: string[]): void;
+    deleteMessage(id: string): void;
+    deleteMessages(ids: string[]): void;
+    performAction(id: string): void;
+
+    //GDPR methods
     showGDPRConsentUI(): void;
     showGDPRDeletionUI(): void;
     isDeviceDataRemoved(success: (isRemoved: boolean) => void): void;
@@ -51,11 +83,8 @@ declare module 'pushwoosh-react-native-plugin' {
     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;
+  const Pushwoosh: Pushwoosh;
   export = Pushwoosh;
-}
+}

package/index.js

@@ -459,6 +459,45 @@ class PushNotification {
 		PushwooshModule.presentInboxUI(style);
 	}
 
+	messagesWithNoActionPerformedCount(result: Function) {
+		PushwooshModule.messagesWithNoActionPerformedCount(result);
+	}
+
+	unreadMessagesCount(result: Function) {
+		PushwooshModule.unreadMessagesCount(result);
+	}
+
+	messagesCount(result: Function) {
+		PushwooshModule.messagesCount(result);
+	}
+
+	loadMessages(success: Function, fail: ?Function) {
+		if (!fail) {
+			fail = function() {};
+		}
+		PushwooshModule.loadMessages(success, fail);
+	}
+
+	readMessage(id: string) {
+		PushwooshModule.readMessage(id);
+	}
+
+	readMessages(ids: Array) {
+		PushwooshModule.readMessages(ids);
+	}
+
+	deleteMessage(id: string) {
+		PushwooshModule.deleteMessage(id);
+	}
+
+	deleteMessages(ids: Array) {
+		PushwooshModule.deleteMessages(ids);
+	}
+
+	performAction(id: string) {
+		PushwooshModule.performAction(id);
+	}
+
 	// Show inApp for change setting Enable/disable all communication with Pushwoosh
 	showGDPRConsentUI(){
 		PushwooshModule.showGDPRConsentUI();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.14",
+  "version": "6.1.16",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",

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.14"
+  s.version          = "6.1.16"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'

package/src/android/build.gradle

@@ -23,10 +23,10 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
     buildTypes {
         release {
@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.5.2"
+    pushwoosh = "6.6.2"
 }
 
 evaluationDependsOn(':app')

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

@@ -1,5 +1,9 @@
 package com.pushwoosh.reactnativeplugin;
 
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.facebook.react.bridge.ReadableArray;
@@ -10,6 +14,8 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.pushwoosh.inbox.data.InboxMessage;
+import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
 import com.pushwoosh.tags.TagsBundle;
 
@@ -178,4 +184,49 @@ public final class ConversionUtil {
 
 		return result;
 	}
+
+	public static WritableMap inboxMessageToWritableMap(InboxMessage message) {
+		return toWritableMap(inboxMessageToJson(message));
+	}
+
+	public 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.getSendDate().toString())
+					.put("type", message.getType().getCode())
+					.put("bannerUrl", message.getBannerUrl())
+					.put("isRead",message.isRead())
+					.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) {
+			Log.e("PushwooshInbox", "Failed to fetch inbox message :" + e.getMessage());
+		}
+		return object;
+	}
+	
+	public static ArrayList<String> messageCodesArrayToArrayList(ReadableArray readableArray) {
+		ArrayList<String> result = new ArrayList<>();
+		for (int i = 0; i < readableArray.size(); i++) {
+			ReadableType indexType = readableArray.getType(i);
+			try {
+				if (indexType == ReadableType.String) {
+					result.add(readableArray.getString(i));
+				} else {
+					PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".");
+				}
+			} catch (Exception e) {
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".", e);
+			}
+		}
+		return result;
+	}
 }

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

@@ -7,14 +7,20 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableNativeArray;
 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;
@@ -23,6 +29,9 @@ import com.pushwoosh.exception.RegisterForPushNotificationsException;
 import com.pushwoosh.exception.UnregisterForPushNotificationException;
 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.network.NetworkModule;
 import com.pushwoosh.internal.platform.AndroidPlatformModule;
@@ -36,6 +45,9 @@ import com.pushwoosh.notification.LocalNotificationReceiver;
 
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 public class PushwooshPlugin extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
 	static final String TAG = "ReactNativePlugin";
@@ -351,6 +363,92 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		}
 	}
 
+	@ReactMethod
+	public void messagesWithNoActionPerformedCount(final Callback callback) {
+		PushwooshInbox.messagesWithNoActionPerformedCount(new com.pushwoosh.function.Callback<Integer, InboxMessagesException>() {
+			@Override
+			public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+				if (result.isSuccess() && callback != null) {
+					callback.invoke(result.getData());
+				}
+			}
+		});
+	}
+
+	@ReactMethod
+	public void unreadMessagesCount(final Callback callback) {
+		PushwooshInbox.unreadMessagesCount(new com.pushwoosh.function.Callback<Integer, InboxMessagesException>() {
+			@Override
+			public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+				if (result.isSuccess() && callback != null) {
+					callback.invoke(result.getData());
+				}
+			}
+		});
+	}
+
+	@ReactMethod
+	public void messagesCount(final Callback callback) {
+		PushwooshInbox.messagesCount(new com.pushwoosh.function.Callback<Integer, InboxMessagesException>() {
+			@Override
+			public void process(@NonNull Result<Integer, InboxMessagesException> result) {
+				if (result.isSuccess() && callback != null) {
+					callback.invoke(result.getData());
+				}
+			}
+		});
+	}
+
+	@ReactMethod
+	public void loadMessages(@NonNull final Callback success, @Nullable final Callback error) {
+		PushwooshInbox.loadMessages(new com.pushwoosh.function.Callback<Collection<InboxMessage>, InboxMessagesException>() {
+			@Override
+			public void process(@NonNull Result<Collection<InboxMessage>, InboxMessagesException> result) {
+				try {
+					if (result.isSuccess() && result.getData() != null) {
+						ArrayList<InboxMessage> messagesList = new ArrayList<>(result.getData());
+						WritableNativeArray writableArray = new WritableNativeArray();
+						for (InboxMessage message : messagesList) {
+							writableArray.pushMap(ConversionUtil.inboxMessageToWritableMap(message));
+						}
+						success.invoke(writableArray);
+					} else if (error != null) {
+						error.invoke(TAG + "Failed to fetch inbox messages from server");
+					}
+				} catch (Exception e) {
+					if (error != null) {
+						error.invoke(e.getLocalizedMessage());
+					}
+				}
+			}
+		});
+	}
+
+	@ReactMethod
+	public void readMessage(String id) {
+		PushwooshInbox.readMessage(id);
+	}
+
+	@ReactMethod
+	public void readMessages(ReadableArray codes) {
+		PushwooshInbox.readMessages(ConversionUtil.messageCodesArrayToArrayList(codes));
+	}
+
+	@ReactMethod
+	public void deleteMessage(String id) {
+		PushwooshInbox.deleteMessage(id);
+	}
+
+	@ReactMethod
+	public void deleteMessages(ReadableArray codes) {
+		PushwooshInbox.deleteMessages(ConversionUtil.messageCodesArrayToArrayList(codes));
+	}
+
+	@ReactMethod
+	public void performAction(String id) {
+		PushwooshInbox.performAction(id);
+	}
+
 	@ReactMethod
 	public void showGDPRConsentUI(){
 		GDPRManager.getInstance().showGDPRConsentUI();
@@ -504,7 +602,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 +612,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/Pushwoosh.h

@@ -18,15 +18,15 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.4.2"
+#define PUSHWOOSH_VERSION @"6.4.5"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
 
 
-typedef void (^PushwooshRegistrationHandler)(NSString *token, NSError *error);
-typedef void (^PushwooshGetTagsHandler)(NSDictionary *tags);
-typedef void (^PushwooshErrorHandler)(NSError *error);
+typedef void (^PushwooshRegistrationHandler)(NSString * _Nullable token, NSError * _Nullable error);
+typedef void (^PushwooshGetTagsHandler)(NSDictionary * _Nullable tags);
+typedef void (^PushwooshErrorHandler)(NSError * _Nullable error);
 
 
 /**
@@ -43,7 +43,7 @@ typedef void (^PushwooshErrorHandler)(NSError *error);
  @param pushwoosh The push manager that received the remote notification.
  @param message A PWMessage object that contains information referring to the remote notification, potentially including a badge number for the application icon, an alert sound, an alert message to display to the user, a notification identifier, and custom data.
 */
-- (void)pushwoosh:(Pushwoosh *)pushwoosh onMessageReceived:(PWMessage *)message;
+- (void)pushwoosh:(Pushwoosh * _Nonnull)pushwoosh onMessageReceived:(PWMessage * _Nonnull)message;
 
 /**
 Tells the delegate that the user has pressed on the push notification banner.
@@ -51,7 +51,32 @@ Tells the delegate that the user has pressed on the push notification banner.
 @param pushwoosh The push manager that received the remote notification.
 @param message A PWMessage object that contains information about the remote notification, potentially including a badge number for the application icon, an alert sound, an alert message to display to the user, a notification identifier, and custom data.
 */
-- (void)pushwoosh:(Pushwoosh *)pushwoosh onMessageOpened:(PWMessage *)message;
+- (void)pushwoosh:(Pushwoosh * _Nonnull)pushwoosh onMessageOpened:(PWMessage * _Nonnull)message;
+
+@end
+
+/**
+ `PWPurchaseDelegate` protocol defines the methods that can be implemented in the delegate of the `Pushwoosh` class' singleton object.
+ These methods provide callbacks for events related to purchasing In-App products from rich medias, such as successful purchase event, failed payment, etc.
+ These methods implementation allows to react on such events properly.
+ */
+
+@protocol PWPurchaseDelegate <NSObject>
+
+//list of products
+-(void)onPWInAppPurchaseHelperProducts:(NSArray<SKProduct *>* _Nullable)products;
+
+//payment complete
+-(void)onPWInAppPurchaseHelperPaymentComplete:(NSString* _Nullable)identifier;
+
+//payment failed
+-(void)onPWInAppPurchaseHelperPaymentFailedProductIdentifier:(NSString* _Nullable)identifier error:(NSError* _Nullable)error;
+
+//promoted In-App purchase
+-(void)onPWInAppPurchaseHelperCallPromotedPurchase:(NSString* _Nullable)identifier;
+
+//Tells the observer that an error occurred while restoring transactions.
+-(void)onPWInAppPurchaseHelperRestoreCompletedTransactionsFailed:(NSError * _Nullable)error;
 
 @end
 
@@ -64,17 +89,17 @@ Tells the delegate that the user has pressed on the push notification banner.
 /**
  Title of the push message.
 */
-@property (nonatomic, readonly) NSString *title;
+@property (nonatomic, readonly) NSString * _Nullable title;
 
 /**
  Subtitle of the push message.
 */
-@property (nonatomic, readonly) NSString *subTitle;
+@property (nonatomic, readonly) NSString * _Nullable subTitle;
 
 /**
  Body of the push message.
 */
-@property (nonatomic, readonly) NSString *message;
+@property (nonatomic, readonly) NSString * _Nullable message;
 
 /**
  Badge number of the push message.
@@ -89,7 +114,7 @@ Tells the delegate that the user has pressed on the push notification banner.
 /**
  Remote URL or deeplink from the push message.
 */
-@property (nonatomic, readonly) NSString *link;
+@property (nonatomic, readonly) NSString * _Nullable link;
 
 /**
  Returns YES if this message received/opened then the app is in foreground state.
@@ -109,17 +134,17 @@ Tells the delegate that the user has pressed on the push notification banner.
 /**
  Gets custom JSON data from push notifications dictionary as specified in Pushwoosh Control Panel.
 */
-@property (nonatomic, readonly) NSDictionary *customData;
+@property (nonatomic, readonly) NSDictionary * _Nullable customData;
 
 /**
  Original payload of the message.
 */
-@property (nonatomic, readonly) NSDictionary *payload;
+@property (nonatomic, readonly) NSDictionary * _Nullable payload;
 
 /**
  Returns YES if this message is recieved from Pushwoosh.
 */
-+ (BOOL)isPushwooshMessage:(NSDictionary *)userInfo;
++ (BOOL)isPushwooshMessage:(NSDictionary *_Nonnull)userInfo;
 
 @end
 
@@ -132,13 +157,18 @@ Tells the delegate that the user has pressed on the push notification banner.
 /**
  Pushwoosh Application ID. Usually retrieved automatically from Info.plist parameter `Pushwoosh_APPID`
  */
-@property (nonatomic, copy, readonly) NSString *applicationCode;
+@property (nonatomic, copy, readonly) NSString * _Nonnull applicationCode;
 
 /**
  `PushNotificationDelegate` protocol delegate that would receive the information about events for push notification manager such as registering with APS services, receiving push notifications or working with the received notification.
  Pushwoosh Runtime sets it to ApplicationDelegate by default
  */
-@property (nonatomic, weak) NSObject<PWMessagingDelegate> *delegate;
+@property (nonatomic, weak) NSObject<PWMessagingDelegate> * _Nullable delegate;
+
+/**
+ `PushPurchaseDelegate` protocol delegate that would receive the information about events related to purchasing InApp products from rich medias
+ */
+@property (nonatomic, weak) NSObject<PWPurchaseDelegate> * _Nullable purchaseDelegate;
 
 #if TARGET_OS_IOS || TARGET_OS_WATCH
 
@@ -157,62 +187,62 @@ Tells the delegate that the user has pressed on the push notification banner.
 /**
  Returns push notification payload if the app was started in response to push notification or null otherwise
  */
-@property (nonatomic, copy, readonly) NSDictionary *launchNotification;
+@property (nonatomic, copy, readonly) NSDictionary * _Nullable launchNotification;
 
 /**
  Proxy contains UNUserNotificationCenterDelegate objects.
 */
-@property (nonatomic, readonly) PWNotificationCenterDelegateProxy *notificationCenterDelegateProxy;
+@property (nonatomic, readonly) PWNotificationCenterDelegateProxy * _Nullable notificationCenterDelegateProxy;
 
 /**
  Set custom application language. Must be a lowercase two-letter code according to ISO-639-1 standard ("en", "de", "fr", etc.).
  Device language used by default.
  Set to nil if you want to use device language again.
  */
-@property (nonatomic) NSString *language;
+@property (nonatomic) NSString * _Nonnull language;
 
 /**
  Initializes Pushwoosh.
  @param appCode Pushwoosh App ID.
  */
-+ (void)initializeWithAppCode:(NSString *)appCode;
++ (void)initializeWithAppCode:(NSString *_Nonnull)appCode;
 
 /**
  Returns an object representing the current push manager.
  
  @return A singleton object that represents the push manager.
  */
-+ (instancetype)sharedInstance;
++ (instancetype _Nonnull )sharedInstance;
 
 /**
  Registers for push notifications. By default registeres for "UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert" flags.
  Automatically detects if you have "newsstand-content" in "UIBackgroundModes" and adds "UIRemoteNotificationTypeNewsstandContentAvailability" flag.
  */
 - (void)registerForPushNotifications;
-- (void)registerForPushNotificationsWithCompletion:(PushwooshRegistrationHandler)completion;
+- (void)registerForPushNotificationsWithCompletion:(PushwooshRegistrationHandler _Nullable )completion;
 
 /**
 Unregisters from push notifications.
 */
 - (void)unregisterForPushNotifications;
-- (void)unregisterForPushNotificationsWithCompletion:(void (^)(NSError *error))completion;
+- (void)unregisterForPushNotificationsWithCompletion:(void (^_Nullable)(NSError * _Nullable error))completion;
 
 /**
  Handle registration to remote notifications.
 */
-- (void)handlePushRegistration:(NSData *)devToken;
-- (void)handlePushRegistrationFailure:(NSError *)error;
+- (void)handlePushRegistration:(NSData * _Nonnull)devToken;
+- (void)handlePushRegistrationFailure:(NSError * _Nonnull)error;
 
 /**
  Handle received push notification.
 */
-- (BOOL)handlePushReceived:(NSDictionary *)userInfo;
+- (BOOL)handlePushReceived:(NSDictionary * _Nonnull)userInfo;
 
 /**
  * Change default base url to reverse proxy url
  * @param url - reverse proxy url
 */
-- (void)setReverseProxy:(NSString *)url;
+- (void)setReverseProxy:(NSString * _Nonnull)url;
 
 /**
  * Disables reverse proxy
@@ -235,16 +265,16 @@ Unregisters from push notifications.
  
  @param tags Dictionary representation of tags to send.
  */
-- (void)setTags:(NSDictionary *)tags;
+- (void)setTags:(NSDictionary * _Nonnull)tags;
 
 /**
  Send tags to server with completion block. If setTags succeeds competion is called with nil argument. If setTags fails completion is called with error.
  */
-- (void)setTags:(NSDictionary *)tags completion:(void (^)(NSError *error))completion;
+- (void)setTags:(NSDictionary * _Nonnull)tags completion:(void (^_Nullable)(NSError * _Nullable error))completion;
 
-- (void)setEmailTags:(NSDictionary *)tags forEmail:(NSString *)email;
+- (void)setEmailTags:(NSDictionary * _Nonnull)tags forEmail:(NSString * _Nonnull)email;
 
-- (void)setEmailTags:(NSDictionary *)tags forEmail:(NSString *)email completion:(void(^)(NSError *error))completion;
+- (void)setEmailTags:(NSDictionary * _Nonnull)tags forEmail:(NSString * _Nonnull)email completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Get tags from server. Calls delegate method if exists and handler (block).
@@ -257,7 +287,7 @@ Unregisters from push notifications.
  }
  @param errorHandler The block is executed on the unsuccessful completion of the request. This block has no return value and takes one argument: the error that occurred during the request.
  */
-- (void)getTags:(PushwooshGetTagsHandler)successHandler onFailure:(PushwooshErrorHandler)errorHandler;
+- (void)getTags:(PushwooshGetTagsHandler _Nullable)successHandler onFailure:(PushwooshErrorHandler _Nullable)errorHandler;
 
 /**
  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.
@@ -270,7 +300,7 @@ Unregisters from push notifications.
 /**
  Pushwoosh SDK version.
 */
-+ (NSString *)version;
++ (NSString * _Nonnull)version;
 
 #if TARGET_OS_IOS
 /**
@@ -285,7 +315,7 @@ Unregisters from push notifications.
  
  @param transactions Array of SKPaymentTransaction items as received in the payment queue.
  */
-- (void)sendSKPaymentTransactions:(NSArray *)transactions;
+- (void)sendSKPaymentTransactions:(NSArray * _Nonnull)transactions;
 
 /**
  Tracks individual in-app purchase. See recommended `sendSKPaymentTransactions:` method.
@@ -295,7 +325,7 @@ Unregisters from push notifications.
  @param currencyCode currency of the price (ex: @"USD")
  @param date time of the purchase (ex: [NSDate now])
  */
-- (void)sendPurchase:(NSString *)productIdentifier withPrice:(NSDecimalNumber *)price currencyCode:(NSString *)currencyCode andDate:(NSDate *)date;
+- (void)sendPurchase:(NSString * _Nonnull)productIdentifier withPrice:(NSDecimalNumber * _Nonnull)price currencyCode:(NSString * _Nonnull)currencyCode andDate:(NSDate * _Nonnull)date;
 
 #endif
 /**
@@ -303,7 +333,7 @@ Unregisters from push notifications.
  
  @return Current push token. May be nil if no push token is available yet.
  */
-- (NSString *)getPushToken;
+- (NSString * _Nullable)getPushToken;
 
 /**
  Gets HWID. Unique device identifier that used in all API calls with Pushwoosh.
@@ -311,7 +341,7 @@ Unregisters from push notifications.
  
  @return Unique device identifier.
  */
-- (NSString *)getHWID;
+- (NSString * _Nonnull)getHWID;
 
 /**
  Returns dictionary with enabled remove notificaton types.
@@ -341,7 +371,7 @@ Unregisters from push notifications.
  
  Note: In the latter example "enabled" field means that device can receive push notification but could not display alerts (ex: silent push)
  */
-+ (NSMutableDictionary *)getRemoteNotificationStatus;
++ (NSMutableDictionary * _Nullable)getRemoteNotificationStatus;
 
 /**
  Clears the notifications from the notification center.
@@ -355,7 +385,7 @@ Unregisters from push notifications.
  
  @param userId user identifier
  */
-- (void)setUserId:(NSString *)userId completion:(void(^)(NSError * error))completion;
+- (void)setUserId:(NSString * _Nonnull)userId completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
@@ -363,7 +393,7 @@ Unregisters from push notifications.
  
  @param userId user identifier
  */
-- (void)setUserId:(NSString *)userId;
+- (void)setUserId:(NSString * _Nonnull)userId;
 
 /**
  Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
@@ -373,7 +403,7 @@ Unregisters from push notifications.
  @param userId user identifier
  @param emails user's emails array
  */
-- (void)setUser:(NSString *)userId emails:(NSArray *)emails completion:(void(^)(NSError * error))completion;
+- (void)setUser:(NSString * _Nonnull)userId emails:(NSArray * _Nonnull)emails completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 
 /**
@@ -383,7 +413,7 @@ Unregisters from push notifications.
  @param userId user identifier
  @param emails user's emails array
  */
-- (void)setUser:(NSString *)userId emails:(NSArray *)emails;
+- (void)setUser:(NSString * _Nonnull)userId emails:(NSArray * _Nonnull)emails;
 
 /**
  Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
@@ -393,7 +423,7 @@ Unregisters from push notifications.
  @param userId user identifier
  @param email user's email string
  */
-- (void)setUser:(NSString *)userId email:(NSString *)email completion:(void(^)(NSError * error))completion;
+- (void)setUser:(NSString * _Nonnull)userId email:(NSString * _Nonnull)email completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Register emails list associated to the current user.
@@ -401,14 +431,14 @@ Unregisters from push notifications.
  
  @param emails user's emails array
  */
-- (void)setEmails:(NSArray *)emails completion:(void(^)(NSError * error))completion;
+- (void)setEmails:(NSArray * _Nonnull)emails completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Register emails list associated to the current user.
  
  @param emails user's emails array
  */
-- (void)setEmails:(NSArray *)emails;
+- (void)setEmails:(NSArray * _Nonnull)emails;
 
 /**
  Register email associated to the current user. Email should be a string and could not be null or empty.
@@ -416,14 +446,14 @@ Unregisters from push notifications.
  
  @param email user's email string
  */
-- (void)setEmail:(NSString *)email completion:(void(^)(NSError * error))completion;
+- (void)setEmail:(NSString * _Nonnull)email completion:(void(^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Register email associated to the current user. Email should be a string and could not be null or empty.
  
  @param email user's email string
  */
-- (void)setEmail:(NSString *)email;
+- (void)setEmail:(NSString * _Nonnull)email;
 
 /**
  Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed.
@@ -433,7 +463,7 @@ Unregisters from push notifications.
  @param doMerge if false all events for oldUserId are removed, if true all events for oldUserId are moved to newUserId
  @param completion callback
  */
-- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion;
+- (void)mergeUserId:(NSString * _Nonnull)oldUserId to:(NSString * _Nonnull)newUserId doMerge:(BOOL)doMerge completion:(void (^ _Nullable)(NSError * _Nullable error))completion;
 
 /**
  Starts communication with Pushwoosh server.
@@ -451,7 +481,7 @@ Unregisters from push notifications.
  @param url Deep Link URL
 */
 #if TARGET_OS_IOS || TARGET_OS_WATCH
-- (BOOL)handleOpenURL:(NSURL *)url;
+- (BOOL)handleOpenURL:(NSURL * _Nonnull)url;
 #endif
 
 @end
@@ -468,7 +498,7 @@ Unregisters from push notifications.
  Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10
 */
 #if TARGET_OS_IOS || TARGET_OS_WATCH
-@property (nonatomic, strong, readonly) id<UNUserNotificationCenterDelegate> defaultNotificationCenterDelegate;
+@property (nonatomic, strong, readonly) id<UNUserNotificationCenterDelegate> _Nonnull defaultNotificationCenterDelegate;
 #elif TARGET_OS_OSX
 @property (nonatomic, strong, readonly) id<NSUserNotificationCenterDelegate> defaultNotificationCenterDelegate;
 #endif
@@ -477,7 +507,7 @@ Unregisters from push notifications.
  Adds extra UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10.
 */
 #if TARGET_OS_IOS || TARGET_OS_WATCH
-- (void)addNotificationCenterDelegate:(id<UNUserNotificationCenterDelegate>)delegate;
+- (void)addNotificationCenterDelegate:(id<UNUserNotificationCenterDelegate> _Nonnull)delegate;
 #endif
 @end
 
@@ -504,7 +534,7 @@ Unregisters from push notifications.
  
  @return Dictionary, that needs to be sent as the value for the tag
  */
-+ (NSDictionary *)incrementalTagWithInteger:(NSInteger)delta;
++ (NSDictionary * _Nullable)incrementalTagWithInteger:(NSInteger)delta;
 
 /**
  Creates a dictionary for extending Tag’s values list with additional values
@@ -525,6 +555,6 @@ Unregisters from push notifications.
  
  @return Dictionary to be sent as the value for the tag
  */
-+ (NSDictionary *)appendValuesToListTag:(NSArray<NSString *> *)array;
++ (NSDictionary * _Nullable)appendValuesToListTag:(NSArray<NSString *> * _Nonnull)array;
 
 @end

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -42,25 +42,25 @@ RCT_EXPORT_MODULE(Pushwoosh);
 }
 
 RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)error) {
-	NSString *appCode = config[@"pw_appid"];
+    NSString *appCode = config[@"pw_appid"];
     NSString *notificationHandling = config[@"pw_notification_handling"];
     
-	if (!appCode || ![appCode isKindOfClass:[NSString class]]) {
-		if (error) {
-			error(@[ @"pw_appid is missing" ]);
-		}
-		
-		return;
-	}
+    if (!appCode || ![appCode isKindOfClass:[NSString class]]) {
+        if (error) {
+            error(@[ @"pw_appid is missing" ]);
+        }
+        
+        return;
+    }
     
     NSString *proxyUrl = config[@"reverse_proxy_url"];
     if (proxyUrl && ![proxyUrl isEqualToString:@""]) {
         [[Pushwoosh sharedInstance] setReverseProxy:proxyUrl];
     }
     
-	[PushNotificationManager initializeWithAppCode:appCode appName:nil];
-	[[PushNotificationManager pushManager] sendAppOpen];
-	[PushNotificationManager pushManager].delegate = self;
+    [PushNotificationManager initializeWithAppCode:appCode appName:nil];
+    [[PushNotificationManager pushManager] sendAppOpen];
+    [PushNotificationManager pushManager].delegate = self;
 
     // We set Pushwoosh UNUserNotificationCenter delegate unless CUSTOM is specified in the config
     if(![notificationHandling isEqualToString:@"CUSTOM"]) {
@@ -71,7 +71,7 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
         success(@[]);
     }
     
-	if (gStartPushData) {
+    if (gStartPushData) {
         NSString *link = gStartPushData[@"l"];
         
         //get deeplink from the payload and write it to the launchOptions for proper RCTLinking behavior
@@ -82,7 +82,7 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
         }
         
         [self sendJSEvent:kPushReceivedJSEvent withArgs:gStartPushData];
-		[self sendJSEvent:kPushOpenJSEvent withArgs:gStartPushData];
+        [self sendJSEvent:kPushOpenJSEvent withArgs:gStartPushData];
     } else if([PushNotificationManager pushManager].launchNotification) {
         [self sendJSEvent:kPushReceivedJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
         [self sendJSEvent:kPushOpenJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
@@ -90,10 +90,10 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
 }
 
 RCT_EXPORT_METHOD(register:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)error) {
-	[[PWEventDispatcher sharedDispatcher] subscribe:success toEvent:kRegistrationSuccesEvent];
-	[[PWEventDispatcher sharedDispatcher] subscribe:error toEvent:kRegistrationErrorEvent];
-	
-	[[PushNotificationManager pushManager] registerForPushNotifications];
+    [[PWEventDispatcher sharedDispatcher] subscribe:success toEvent:kRegistrationSuccesEvent];
+    [[PWEventDispatcher sharedDispatcher] subscribe:error toEvent:kRegistrationErrorEvent];
+    
+    [[PushNotificationManager pushManager] registerForPushNotifications];
 }
 
 RCT_EXPORT_METHOD(unregister:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
@@ -109,13 +109,13 @@ RCT_EXPORT_METHOD(unregister:(RCTResponseSenderBlock)successCallback error:(RCTR
 }
 
 RCT_EXPORT_METHOD(onPushOpen:(RCTResponseSenderBlock)callback) {
-	[[PWEventDispatcher sharedDispatcher] subscribe:callback toEvent:kPushOpenEvent];
-	
-	if (gStartPushData) {
-		NSDictionary *pushData = gStartPushData;
-		gStartPushData = nil;
-		[[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(pushData) ]];
-	}
+    [[PWEventDispatcher sharedDispatcher] subscribe:callback toEvent:kPushOpenEvent];
+    
+    if (gStartPushData) {
+        NSDictionary *pushData = gStartPushData;
+        gStartPushData = nil;
+        [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(pushData) ]];
+    }
 }
 
 RCT_EXPORT_METHOD(onPushReceived:(RCTResponseSenderBlock)callback) {
@@ -129,39 +129,39 @@ RCT_EXPORT_METHOD(onPushReceived:(RCTResponseSenderBlock)callback) {
 }
 
 RCT_EXPORT_METHOD(getHwid:(RCTResponseSenderBlock)callback) {
-	if (callback) {
-		callback(@[ [[PushNotificationManager pushManager] getHWID] ]);
-	}
+    if (callback) {
+        callback(@[ [[PushNotificationManager pushManager] getHWID] ]);
+    }
 }
 
 RCT_EXPORT_METHOD(getPushToken:(RCTResponseSenderBlock)callback) {
-	if (callback) {
-		callback(@[ objectOrNull([[PushNotificationManager pushManager] getPushToken]) ]);
-	}
+    if (callback) {
+        callback(@[ objectOrNull([[PushNotificationManager pushManager] getPushToken]) ]);
+    }
 }
 
 RCT_EXPORT_METHOD(setTags:(NSDictionary*)tags success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-	[[PushNotificationManager pushManager] setTags:tags withCompletion:^(NSError* error) {
-		if (!error && successCallback) {
-			successCallback(@[]);
-		}
-		
-		if (error && errorCallback) {
-			errorCallback(@[ objectOrNull([error localizedDescription]) ]);
-		}
-	}];
+    [[PushNotificationManager pushManager] setTags:tags withCompletion:^(NSError* error) {
+        if (!error && successCallback) {
+            successCallback(@[]);
+        }
+        
+        if (error && errorCallback) {
+            errorCallback(@[ objectOrNull([error localizedDescription]) ]);
+        }
+    }];
 }
 
 RCT_EXPORT_METHOD(getTags:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-	[[PushNotificationManager pushManager] loadTags:^(NSDictionary* tags) {
-		if (successCallback) {
-			successCallback(@[ tags ]);
-		}
-	} error:^(NSError *error) {
-		if (errorCallback) {
-			errorCallback(@[ objectOrNull([error localizedDescription]) ]);
-		}
-	}];
+    [[PushNotificationManager pushManager] loadTags:^(NSDictionary* tags) {
+        if (successCallback) {
+            successCallback(@[ tags ]);
+        }
+    } error:^(NSError *error) {
+        if (errorCallback) {
+            errorCallback(@[ objectOrNull([error localizedDescription]) ]);
+        }
+    }];
 }
 
 RCT_EXPORT_METHOD(setShowPushnotificationAlert:(BOOL)showPushnotificationAlert) {
@@ -175,7 +175,7 @@ RCT_EXPORT_METHOD(getShowPushnotificationAlert:(RCTResponseSenderBlock)callback)
 }
 
 RCT_EXPORT_METHOD(setUserId:(NSString*)userId) {
-	[[PWInAppManager sharedManager] setUserId:userId];
+    [[PWInAppManager sharedManager] setUserId:userId];
 }
 
 RCT_EXPORT_METHOD(setUserId:(NSString*)userId success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
@@ -192,7 +192,7 @@ RCT_EXPORT_METHOD(setUserId:(NSString*)userId success:(RCTResponseSenderBlock)su
 }
 
 RCT_EXPORT_METHOD(postEvent:(NSString*)event withAttributes:(NSDictionary*)attributes) {
-	[[PWInAppManager sharedManager] postEvent:event withAttributes:attributes];
+    [[PWInAppManager sharedManager] postEvent:event withAttributes:attributes];
 }
 
 RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(nonnull NSNumber*)badgeNumber) {
@@ -206,11 +206,11 @@ RCT_EXPORT_METHOD(setLanguage:(NSString *)language) {
 }
 
 RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback) {
-	if(callback) {
+    if(callback) {
         dispatch_async(dispatch_get_main_queue(), ^{
            callback(@[ @([UIApplication sharedApplication].applicationIconBadgeNumber) ]);
         });
-	}
+    }
 }
 
 RCT_EXPORT_METHOD(addToApplicationIconBadgeNumber:(nonnull NSNumber*)badgeNumber) {
@@ -239,6 +239,98 @@ RCT_EXPORT_METHOD(presentInboxUI:(NSDictionary *)styleDictionary) {
     }
 }
 
+RCT_EXPORT_METHOD(messagesWithNoActionPerformedCount:(RCTResponseSenderBlock)callback) {
+    [PWInbox messagesWithNoActionPerformedCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (callback) {
+            callback(@[ @(count) ]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(unreadMessagesCount:(RCTResponseSenderBlock)callback) {
+    [PWInbox unreadMessagesCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (callback) {
+            callback(@[ @(count) ]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(messagesCount:(RCTResponseSenderBlock)callback) {
+    [PWInbox messagesCountWithCompletion:^(NSInteger count, NSError *error) {
+        if (callback) {
+            callback(@[ @(count) ]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(loadMessages:(RCTResponseSenderBlock)success fail:(RCTResponseSenderBlock)fail) {
+    [PWInbox loadMessagesWithCompletion:^(NSArray<NSObject<PWInboxMessageProtocol> *> *messages, NSError *error) {
+        if (success) {
+            NSMutableArray* array = [[NSMutableArray alloc] init];
+                for (NSObject<PWInboxMessageProtocol>* message in messages) {
+                    NSDictionary* dict = [self inboxMessageToDictionary:message];
+                    [array addObject:dict];
+                }
+            success( @[ array ]);
+        } else if (error != nil && fail != nil) {
+            fail(@[ error ]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(readMessage:(NSString*)code) {
+    NSArray* arr = [NSArray arrayWithObject:code];
+    [PWInbox readMessagesWithCodes:arr];
+}
+
+RCT_EXPORT_METHOD(readMessages:(NSArray<NSString*>*)codes) {
+    [PWInbox readMessagesWithCodes:codes];
+}
+
+RCT_EXPORT_METHOD(deleteMessage:(NSString*)code) {
+    NSArray* arr = [NSArray arrayWithObject:code];
+    [PWInbox deleteMessagesWithCodes:arr];
+}
+
+RCT_EXPORT_METHOD(deleteMessages:(NSArray<NSString*>*)codes) {
+    [PWInbox deleteMessagesWithCodes:codes];
+}
+
+RCT_EXPORT_METHOD(performAction:(NSString*)code) {
+    [PWInbox performActionForMessageWithCode:code];
+}
+
+- (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 setFormatterBehavior:NSDateFormatterBehaviorDefault];
+    [formatter setDateStyle:NSDateFormatterFullStyle];
+    [formatter setTimeStyle:NSDateFormatterMediumStyle];
+    return [formatter stringFromDate:date];
+}
+
 - (PWIInboxStyle *)inboxStyleForDictionary:(NSDictionary *)styleDictionary {
     PWIInboxStyle *style = [PWIInboxStyle defaultStyle];
     
@@ -484,11 +576,11 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
 #pragma mark - PushNotificationDelegate
 
 - (void)onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token {
-	[[PWEventDispatcher sharedDispatcher] dispatchEvent:kRegistrationSuccesEvent withArgs:@[ objectOrNull(token) ]];
+    [[PWEventDispatcher sharedDispatcher] dispatchEvent:kRegistrationSuccesEvent withArgs:@[ objectOrNull(token) ]];
 }
 
 - (void)onDidFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	[[PWEventDispatcher sharedDispatcher] dispatchEvent:kRegistrationErrorEvent withArgs:@[ objectOrNull([error localizedDescription]) ]];
+    [[PWEventDispatcher sharedDispatcher] dispatchEvent:kRegistrationErrorEvent withArgs:@[ objectOrNull([error localizedDescription]) ]];
 }
 
 - (void)onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
@@ -498,20 +590,20 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
 }
 
 - (void)onPushAccepted:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
-	[[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(pushNotification) ]];
-	
+    [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(pushNotification) ]];
+    
     [self sendJSEvent:kPushOpenJSEvent withArgs:pushNotification];
 }
 
 #pragma mark - RCTEventEmitter
 
 - (void)sendJSEvent:(NSString*)event withArgs:(NSDictionary*)args {
-//	[self sendEventWithName:event body:args];
-	[self.bridge.eventDispatcher sendDeviceEventWithName:event body:args];
+//    [self sendEventWithName:event body:args];
+    [self.bridge.eventDispatcher sendDeviceEventWithName:event body:args];
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-	return @[ kPushOpenJSEvent ];
+    return @[ kPushOpenJSEvent ];
 }
 
 @end
@@ -519,7 +611,7 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
 @implementation UIApplication (InternalPushRuntime)
 
 - (BOOL)pushwooshUseRuntimeMagic {
-	return YES;
+    return YES;
 }
 
 // Just keep the launch notification until the module starts and callback functions initalizes
@@ -529,13 +621,13 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
     }
 }
 - (void)onPushAccepted:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
-	if (onStart) {
-		gStartPushData = pushNotification;
-	}
+    if (onStart) {
+        gStartPushData = pushNotification;
+    }
 }
 
 - (NSObject<PushNotificationDelegate> *)getPushwooshDelegate {
-	return (NSObject<PushNotificationDelegate> *)self;
+    return (NSObject<PushNotificationDelegate> *)self;
 }
 
 @end