pushwoosh-cordova-plugin 6.1.0 → 6.1.1

package/src/ios/PushNotification.m

@@ -12,17 +12,43 @@
 
 #import "PushNotification.h"
 #import "PWLog.h"
-#import <CoreLocation/CoreLocation.h>
+#import "PushwooshInboxUI.h"
+#import "PWGDPRManager.h"
+#import "PWInAppManager.h"
+#import "PWBackward.h"
+#import "Pushwoosh.h"
+
 #import "AppDelegate.h"
 
+#import <UserNotifications/UserNotifications.h>
+
 #import <objc/runtime.h>
 
+
 #define WRITEJS(VAL) [NSString stringWithFormat:@"setTimeout(function() { %@; }, 0);", VAL]
 
-@interface PushNotification()
+
+@interface PWCommonJSBridge: NSObject <PWJavaScriptInterface>
+
+@property (nonatomic) CDVPlugin *plugin;
+
+@end
+
+
+@implementation PWCommonJSBridge
+
+- (void)callFunction:(NSString *)functionName :(NSString *)parameters {
+    NSString *function = parameters != nil ? [NSString stringWithFormat:@"%@(%@)", functionName, parameters] : [NSString stringWithFormat:@"%@()", functionName];
+    [_plugin.webViewEngine evaluateJavaScript:function completionHandler:nil];
+}
+
+@end
+
+@interface PushNotification() <PWMessagingDelegate>
 
 @property (nonatomic, retain) NSMutableDictionary *callbackIds;
 @property (nonatomic, retain) PushNotificationManager *pushManager;
+@property (nonatomic, retain) Pushwoosh *pushwoosh;
 @property (nonatomic, copy) NSDictionary *startPushData;
 @property (nonatomic, assign) BOOL startPushCleared;
 @property (nonatomic, assign) BOOL deviceReady;
@@ -31,7 +57,21 @@
 
 @end
 
-void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, const char * signature);
+void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, const char * signature) {
+	Method method = nil;
+	method = class_getInstanceMethod(class, fromChange);
+	
+	if (method) {
+		//method exists add a new method and swap with original
+		class_addMethod(class, toChange, impl, signature);
+		method_exchangeImplementations(class_getInstanceMethod(class, fromChange), class_getInstanceMethod(class, toChange));
+	} else {
+		//just add as orignal method
+		class_addMethod(class, fromChange, impl, signature);
+	}
+}
+
+static PushNotification *pw_PushNotificationPlugin;
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
@@ -40,31 +80,44 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 
 #pragma clang diagnostic pop
 
+- (void)pluginInitialize {
+    [super pluginInitialize];
+    pw_PushNotificationPlugin = self;
+}
+
 - (NSMutableDictionary *)callbackIds {
-	if (_callbackIds == nil) {
-		_callbackIds = [[NSMutableDictionary alloc] init];
-	}
-	return _callbackIds;
+    if (_callbackIds == nil) {
+        _callbackIds = [[NSMutableDictionary alloc] init];
+    }
+    return _callbackIds;
 }
 
 - (PushNotificationManager *)pushManager {
-	if (_pushManager == nil) {
-		_pushManager = [PushNotificationManager pushManager];
-		_pushManager.delegate = self;
-	}
-	return _pushManager;
+    if (_pushManager == nil) {
+        _pushManager = [PushNotificationManager pushManager];
+        _pushManager.delegate = self;
+    }
+    return _pushManager;
+}
+
+- (Pushwoosh *)pushwoosh {
+    if (_pushwoosh == nil) {
+        _pushwoosh = [Pushwoosh sharedInstance];
+        _pushwoosh.delegate = self;
+    }
+    return _pushwoosh;
 }
 
 - (void)getPushToken:(CDVInvokedUrlCommand *)command {
-	NSString *token = [[PushNotificationManager pushManager] getPushToken];
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:token];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    NSString *token = [[PushNotificationManager pushManager] getPushToken];
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:token];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)getPushwooshHWID:(CDVInvokedUrlCommand *)command {
-	NSString *token = [[PushNotificationManager pushManager] getHWID];
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:token];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    NSString *token = [[PushNotificationManager pushManager] getHWID];
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:token];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)onDeviceReady:(CDVInvokedUrlCommand *)command {
@@ -87,42 +140,64 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 	else {
 		[PushNotificationManager initializeWithAppCode:appid appName:appname];
 	}
-
+    
+	[UNUserNotificationCenter currentNotificationCenter].delegate = [PushNotificationManager pushManager].notificationCenterDelegate;
 	[self.pushManager sendAppOpen];
 
 	NSString * alertTypeString = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"Pushwoosh_ALERT_TYPE"];
 	if([alertTypeString isKindOfClass:[NSString class]] && [alertTypeString isEqualToString:@"NONE"]) {
 		self.pushManager.showPushnotificationAlert = NO;
 	}
+    
+    _deviceReady = YES;
 	
-	AppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	PushNotification *pushHandler = [delegate.viewController getCommandInstance:@"PushNotification"];
-	if (pushHandler.startPushData && !_deviceReady) {
-		[self dispatchPush:pushHandler.startPushData];
+	if (self.pushwoosh.launchNotification) {
+        NSDictionary *notification = [self createNotificationDataForPush:self.pushwoosh.launchNotification onStart:YES];
+        [self dispatchPushReceive:notification];
+        [self dispatchPushAccept:notification];
 	}
 
-	_deviceReady = YES;
-
 	[[NSUserDefaults standardUserDefaults] synchronize];
 }
 
-- (void)dispatchPush:(NSDictionary *)pushData {
-	NSData *json = [NSJSONSerialization dataWithJSONObject:pushData options:NSJSONWritingPrettyPrinted error:nil];
-	NSString *jsonString = [[NSString alloc] initWithData:json encoding:NSUTF8StringEncoding];
-
-	NSString *pushOpenJsStatement = [NSString stringWithFormat: @"cordova.require(\"pushwoosh-cordova-plugin.PushNotification\").notificationCallback(%@);", jsonString];
-	NSString *pushReceiveJsStatement = [NSString stringWithFormat: @"cordova.require(\"pushwoosh-cordova-plugin.PushNotification\").pushReceivedCallback(%@);", jsonString];
-
-	if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground) {
-		[self.commandDelegate evalJs:WRITEJS(pushReceiveJsStatement)];
-	}
-	else if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
-		[self.commandDelegate evalJs:WRITEJS(pushReceiveJsStatement)];
-		[self.commandDelegate evalJs:WRITEJS(pushOpenJsStatement)];
-	}
-	else {
-		[self.commandDelegate evalJs:WRITEJS(pushOpenJsStatement)];
-	}
+// 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];
+        
+    NSString *pushReceiveJsStatement = [NSString stringWithFormat: @"cordova.require(\"pushwoosh-cordova-plugin.PushNotification\").pushReceivedCallback(%@);", jsonString];
+        
+    [self.commandDelegate evalJs:WRITEJS(pushReceiveJsStatement)];
+}
+
+- (void)dispatchPushAccept:(NSDictionary *)pushData {
+    NSData *json = [NSJSONSerialization dataWithJSONObject:pushData options:NSJSONWritingPrettyPrinted error:nil];
+    NSString *jsonString = [[NSString alloc] initWithData:json encoding:NSUTF8StringEncoding];
+    
+    NSString *pushOpenJsStatement = [NSString stringWithFormat: @"cordova.require(\"pushwoosh-cordova-plugin.PushNotification\").notificationCallback(%@);", jsonString];
+    
+    [self.commandDelegate evalJs:WRITEJS(pushOpenJsStatement)];
 }
 
 - (void)registerDevice:(CDVInvokedUrlCommand *)command {
@@ -139,23 +214,30 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 }
 
 - (void)unregisterDevice:(CDVInvokedUrlCommand *)command {
-	[[PushNotificationManager pushManager] unregisterForPushNotifications];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    self.callbackIds[@"unregisterDevice"] = command.callbackId;
+    
+    [[PushNotificationManager pushManager] unregisterForPushNotificationsWithCompletion:^(NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"unregisterDevice"]];
+        } else {
+            NSMutableDictionary *results = [NSMutableDictionary dictionary];
+            results[@"error"] = [NSString stringWithFormat:@"%@", error];
+            
+            CDVPluginResult *pluginResult =
+            [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:results];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"unregisterDevice"]];
+        }
+    }];
 }
 
 - (void)startBeaconPushes:(CDVInvokedUrlCommand *)command {
-	[[PushNotificationManager pushManager] startBeaconTracking];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
+	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:@{ @"error" : @"Beacon tracking is not supported" }];
 	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)stopBeaconPushes:(CDVInvokedUrlCommand *)command {
-	[[PushNotificationManager pushManager] stopBeaconTracking];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
+	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:@{ @"error" : @"Beacon tracking is not supported" }];
 	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
@@ -188,102 +270,119 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 	}];
 }
 
-- (void)sendLocation:(CDVInvokedUrlCommand *)command {
-	NSNumber *lat = command.arguments[0][@"lat"];
-	NSNumber *lon = command.arguments[0][@"lon"];
-	CLLocation *location = [[CLLocation alloc] initWithLatitude:[lat doubleValue] longitude:[lon doubleValue]];
-	[[PushNotificationManager pushManager] sendLocation:location];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
-- (void)startLocationTracking:(CDVInvokedUrlCommand *)command {
-	[[PushNotificationManager pushManager] startLocationTracking];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
-- (void)stopLocationTracking:(CDVInvokedUrlCommand *)command {
-	[[PushNotificationManager pushManager] stopLocationTracking];
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+- (void)createLocalNotification:(CDVInvokedUrlCommand *)command {
+    NSDictionary *params = command.arguments[0];
+    NSString *body = params[@"msg"];
+    NSUInteger delay = [params[@"seconds"] unsignedIntegerValue];
+    NSDictionary *userData = params[@"userData"];
+    
+    [self sendLocalNotificationWithBody:body delay:delay userData:userData];
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:nil];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)sendLocalNotificationWithBody:(NSString *)body delay:(NSUInteger)delay userData:(NSDictionary *)userData {
+    if (@available(iOS 10, *)) {
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        UNMutableNotificationContent *content = [UNMutableNotificationContent new];
+        content.body = body;
+        content.sound = [UNNotificationSound defaultSound];
+        content.userInfo = userData;
+        UNTimeIntervalNotificationTrigger *trigger = [UNTimeIntervalNotificationTrigger triggerWithTimeInterval:delay repeats:NO];
+        NSString *identifier = @"LocalNotification";
+        UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:identifier
+                                                                              content:content
+                                                                              trigger:trigger];
+        
+        [center addNotificationRequest:request withCompletionHandler:^(NSError *_Nullable error) {
+            if (error != nil) {
+                NSLog(@"Something went wrong: %@", error);
+            }
+        }];
+    } else {
+        UILocalNotification *localNotification = [[UILocalNotification alloc] init];
+        localNotification.fireDate = [NSDate dateWithTimeIntervalSinceNow:delay];
+        localNotification.alertBody = body;
+        localNotification.timeZone = [NSTimeZone defaultTimeZone];
+        localNotification.userInfo = userData;
+        [[UIApplication sharedApplication] scheduleLocalNotification:localNotification];
+    }
 }
 
 - (void)onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token {
-	NSMutableDictionary *results = [PushNotificationManager getRemoteNotificationStatus];
-	results[@"pushToken"] = token;
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:results];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"registerDevice"]];
+	if (self.callbackIds[@"registerDevice"]) {
+		NSMutableDictionary *results = [PushNotificationManager getRemoteNotificationStatus];
+		results[@"pushToken"] = token;
+		CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:results];
+		[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"registerDevice"]];
+	}
 }
 
 - (void)onDidFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	NSMutableDictionary *results = [NSMutableDictionary dictionary];
-	results[@"error"] = [NSString stringWithFormat:@"%@", error];
-
-	CDVPluginResult *pluginResult =
-		[CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:results];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"registerDevice"]];
-}
-
-- (void)onPushAccepted:(PushNotificationManager *)manager
-	  withNotification:(NSDictionary *)pushNotification
-			   onStart:(BOOL)onStart {
-	
-	if (!onStart && !_deviceReady) {
-		PWLogWarn(@"PUSHWOOSH WARNING: push notification onStart is false, but onDeviceReady has not been called. Did you "
-			  @"forget to call onDeviceReady?");
-	}
-
-	NSMutableDictionary *notification = [NSMutableDictionary new];
-	
-	notification[@"onStart"] = @(onStart);
-	
-	BOOL isForegound = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
-	notification[@"foreground"] = @(isForegound);
-	
-	id alert = pushNotification[@"aps"][@"alert"];
-	NSString *message = alert;
-	if ([alert isKindOfClass:[NSDictionary class]]) {
-		message = alert[@"body"];
-	}
-
-	if (message) {
-		notification[@"message"] = message;
-	}
-	
-	//pase JSON string in custom data to JSON Object
-	NSString *userdata = pushNotification[@"u"];
-
-	if (userdata) {
-		id parsedData = [NSJSONSerialization JSONObjectWithData:[userdata dataUsingEncoding:NSUTF8StringEncoding]
-															 options:NSJSONReadingMutableContainers
-															   error:nil];
-
-		if (parsedData) {
-			notification[@"userdata"] = parsedData;
-		}
-	}
-	
-	notification[@"ios"] = pushNotification;
-
-	PWLogDebug(@"Notification opened: %@", notification);
-
-	if (onStart) {
-		//keep the start push
-		AppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-		PushNotification *pushHandler = [delegate.viewController getCommandInstance:@"PushNotification"];
-		pushHandler.startPushData = notification;
-		pushHandler.startPushCleared = NO;
+	if (self.callbackIds[@"registerDevice"]) {
+		NSMutableDictionary *results = [NSMutableDictionary dictionary];
+		results[@"error"] = [NSString stringWithFormat:@"%@", error];
+		CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:results];
+		[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"registerDevice"]];
 	}
+}
 
-	if (_deviceReady) {
-		//send it to the webview
-		[self dispatchPush:notification];
-	}
+- (NSDictionary *)createNotificationDataForPush:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
+    if (!onStart && !_deviceReady) {
+        PWLogWarn(@"PUSHWOOSH WARNING: onStart is false, but onDeviceReady has not been called. Did you "
+                  @"forget to call onDeviceReady?");
+    }
+    
+    NSMutableDictionary *notification = [NSMutableDictionary new];
+    
+    notification[@"onStart"] = @(onStart);
+    
+    BOOL isForegound = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
+    notification[@"foreground"] = @(isForegound);
+    
+    id alert = pushNotification[@"aps"][@"alert"];
+    NSString *message = alert;
+    if ([alert isKindOfClass:[NSDictionary class]]) {
+        message = alert[@"body"];
+    }
+    
+    if (message) {
+        notification[@"message"] = message;
+    }
+    
+    NSDictionary *userdata = [[PushNotificationManager pushManager] getCustomPushDataAsNSDict:pushNotification];
+    if (userdata) {
+        notification[@"userdata"] = userdata;
+    }
+    
+    notification[@"ios"] = pushNotification;
+    
+    PWLogDebug(@"Notification opened: %@", notification);
+    
+    if (onStart) {
+        //keep the start push
+        self.startPushData = notification;
+        self.startPushCleared = NO;
+    }
+    
+    return notification;
+}
+
+- (void)onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
+    if (_deviceReady) {
+        NSDictionary *notification = [self createNotificationDataForPush:pushNotification onStart:onStart];
+        //send it to the webview
+        [self dispatchPushReceive:notification];
+    }
+}
+
+- (void)onPushAccepted:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
+    if (_deviceReady) {
+        NSDictionary *notification = [self createNotificationDataForPush:pushNotification onStart:onStart];
+        //send it to the webview
+        [self dispatchPushAccept:notification];
+    }
 }
 
 - (void)getRemoteNotificationStatus:(CDVInvokedUrlCommand *)command {
@@ -302,10 +401,10 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 }
 
 - (void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
-	NSInteger badge = [UIApplication sharedApplication].applicationIconBadgeNumber;
-
-	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:badge];
-	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    NSInteger badge = [UIApplication sharedApplication].applicationIconBadgeNumber;
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(int)badge];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)addToApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
@@ -317,7 +416,7 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 }
 
 - (void)cancelAllLocalNotifications:(CDVInvokedUrlCommand *)command {
-	[[UIApplication sharedApplication] cancelAllLocalNotifications];
+	[UIApplication sharedApplication].scheduledLocalNotifications = @[];
 
 	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
 	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
@@ -338,19 +437,177 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 }
 
 - (void)setUserId:(CDVInvokedUrlCommand *)command {
-	NSString *userId = command.arguments[0];
-	[self.pushManager setUserId:userId];
+    NSString *userId = command.arguments[0];
+    [[PWInAppManager sharedManager] setUserId:userId];
 }
 
 - (void) postEvent:(CDVInvokedUrlCommand *)command {
-	NSString *event = command.arguments[0];
-	NSDictionary *attributes = command.arguments[1];
-	[self.pushManager postEvent:event withAttributes:attributes];
+    NSString *event = command.arguments[0];
+    NSDictionary *attributes = command.arguments[1];
+    [[PWInAppManager sharedManager] postEvent:event withAttributes:attributes];
+}
+
+- (void)addJavaScriptInterface:(CDVInvokedUrlCommand *)command {
+    NSString *name = command.arguments[0];
+    PWCommonJSBridge *bridge = [PWCommonJSBridge new];
+    bridge.plugin = self;
+    [[PWInAppManager sharedManager] addJavascriptInterface:bridge withName:name];
+}
+
+- (void)showGDPRConsentUI:(CDVInvokedUrlCommand *)command {
+    [[PWGDPRManager sharedManager] showGDPRConsentUI];
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)showGDPRDeletionUI:(CDVInvokedUrlCommand *)command {
+    [[PWGDPRManager sharedManager] showGDPRDeletionUI];
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)setCommunicationEnabled:(CDVInvokedUrlCommand *)command {
+    self.callbackIds[@"setCommunicationEnabled"] = command.callbackId;
+    
+    NSNumber *enabledObject = [command.arguments firstObject];
+    
+    BOOL enabled = [enabledObject boolValue];
+    
+    [[PWGDPRManager sharedManager] setCommunicationEnabled:enabled completion:^(NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"setCommunicationEnabled"]];
+        } else {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:error.localizedDescription];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"setCommunicationEnabled"]];
+        }
+    }];
+}
+
+- (void)removeAllDeviceData:(CDVInvokedUrlCommand *)command {
+    self.callbackIds[@"removeAllDeviceData"] = command.callbackId;
+    
+    [[PWGDPRManager sharedManager] removeAllDeviceDataWithCompletion:^(NSError *error) {
+        if (!error) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"removeAllDeviceData"]];
+        } else {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:error.localizedDescription];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"removeAllDeviceData"]];
+        }
+    }];
+}
+
+- (void)isCommunicationEnabled:(CDVInvokedUrlCommand *)command {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:[[PWGDPRManager sharedManager] isCommunicationEnabled]];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)isDeviceDataRemoved:(CDVInvokedUrlCommand *)command {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:[[PWGDPRManager sharedManager] isDeviceDataRemoved]];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)isAvailableGDPR:(CDVInvokedUrlCommand *)command {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:[[PWGDPRManager sharedManager] isAvailable]];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)enableHuaweiPushNotifications:(CDVInvokedUrlCommand *)command {
+    // Stub
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (UIImage *)imageFromInboxStyleDict:(NSDictionary *)dict forKey:(NSString *)key {
+    NSObject *object = dict[key];
+    if (object != nil && [object isKindOfClass:[NSString class]]) {
+        return [UIImage imageWithContentsOfFile:[self.commandDelegate pathForResource:(NSString *)object]];
+    }
+    return nil;
+}
+
+- (UIColor *)colorFromInboxStyleDict:(NSDictionary *)dict forKey:(NSString *)key {
+    NSObject *object = dict[key];
+    if (object != nil && [object isKindOfClass:[NSString class]]) {
+        return [PWBackward colorFromColorString:(NSString *)object cordovaViewController:((CDVViewController *)self.viewController)];
+    }
+    return nil;
+}
+
+- (NSString *)stringFromInboxStyleDict:(NSDictionary *)dict forKey:(NSString *)key {
+    NSObject *object = dict[key];
+    if (object != nil && [object isKindOfClass:[NSString class]]) {
+        return (NSString *)object;
+    }
+    return nil;
+}
+
+- (NSString *(^)(NSDate *date, NSObject *owner))dateFormatterBlockFromInboxStyleDict:(NSDictionary *)dict forKey:(NSString *)key {
+    NSObject *object = dict[key];
+    if (object != nil && [object isKindOfClass:[NSString class]]) {
+        NSDateFormatter *formatter = [NSDateFormatter new];
+        formatter.dateFormat = (NSString*)object;
+        return ^NSString *(NSDate *date, NSObject *owner) {
+            return [formatter stringFromDate:date];
+        };
+    }
+    return nil;
+}
+
+- (PWIInboxStyle *)inboxStyleForDictionary:(NSDictionary *)styleDictionary {
+    PWIInboxStyle *style = [PWIInboxStyle defaultStyle];
+    
+    if (![self.viewController isKindOfClass:[CDVViewController class]] || ![styleDictionary isKindOfClass:[NSDictionary class]]) {
+        return style;
+    }
+    
+#define styleValue(prop, key, type) { id val = [self type##FromInboxStyleDict:styleDictionary forKey:key]; if (val != nil) prop = val; }
+    
+    styleValue(style.defaultImageIcon, @"defaultImageIcon", image);
+    styleValue(style.dateFormatterBlock, @"dateFormat", dateFormatterBlock);
+    styleValue(style.listErrorMessage, @"listErrorMessage", string);
+    styleValue(style.listEmptyMessage, @"listEmptyMessage", string);
+    styleValue(style.accentColor, @"accentColor", color);
+    styleValue(style.defaultTextColor, @"defaultTextColor", color);
+    styleValue(style.backgroundColor, @"backgroundColor", color);
+    styleValue(style.selectionColor, @"highlightColor", color);
+    styleValue(style.titleColor, @"titleColor", color);
+    styleValue(style.descriptionColor, @"descriptionColor", color);
+    styleValue(style.dateColor, @"dateColor", color);
+    styleValue(style.separatorColor, @"dividerColor", color);
+    
+    styleValue(style.listErrorImage, @"listErrorImage", image);
+    styleValue(style.listEmptyImage, @"listEmptyImage", image);
+    styleValue(style.unreadImage, @"unreadImage", image);
+    
+    styleValue(style.barTextColor, @"barTextColor", color);
+    styleValue(style.barAccentColor, @"barAccentColor", color);
+    styleValue(style.barBackgroundColor, @"barBackgroundColor", color);
+    styleValue(style.barTitle, @"barTitle", string);
+#undef styleValue
+    
+    return style;
+}
+
+- (void)presentInboxUI:(CDVInvokedUrlCommand *)command {
+    NSDictionary *styleDictionary = [command.arguments firstObject];
+    UIViewController *inboxViewController = [PWIInboxUI createInboxControllerWithStyle:[self inboxStyleForDictionary:styleDictionary]];
+    inboxViewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", @"Close") style:UIBarButtonItemStylePlain target:self action:@selector(closeInbox)];
+    [self.viewController presentViewController:[[UINavigationController alloc] initWithRootViewController:inboxViewController] animated:YES completion:nil];
+}
+
+- (void)closeInbox {
+    if ([self.viewController.presentedViewController isKindOfClass:[UINavigationController class]] && [((UINavigationController*)self.viewController.presentedViewController).viewControllers.firstObject isKindOfClass:[PWIInboxViewController class]]) {
+        [self.viewController dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 
 BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id application, id notificationSettings) {
-	AppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	PushNotification *pushHandler = [delegate.viewController getCommandInstance:@"PushNotification"];
+	PushNotification *pushHandler = pw_PushNotificationPlugin;
 	
 	UIUserNotificationSettings *settings = notificationSettings;
 	
@@ -413,10 +670,4 @@ BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id applicat
 	return YES;
 }
 
-- (NSObject<PushNotificationDelegate> *)getPushwooshDelegate {
-	AppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	PushNotification *pushHandler = [delegate.viewController getCommandInstance:@"PushNotification"];
-	return pushHandler;
-}
-
 @end