pushwoosh-react-native-plugin 6.1.42 → 6.1.43

package/docs/README.md

@@ -57,10 +57,7 @@ DeviceEventEmitter.addListener('pushOpened', (e: Event) => {
 <tr class="even"><td><a href="#setsoundtype">setSoundType(type)</a></td></tr>
 <tr class="even"><td><a href="#setvibratetype">setVibrateType(type)</a></td></tr>
 <tr class="even"><td><a href="#presentinboxui">presentInboxUI()</a></td></tr>
-<tr class="even"><td><a href="#showgdprconsentui">showGDPRConsentUI()</a></td></tr>
-<tr class="even"><td><a href="#showgdprdeletionui">showGDPRDeletionUI()</a></td></tr>
 <tr class="even"><td><a href="#setcommunicationenabled">setCommunicationEnabled()</a></td></tr>
-<tr class="even"><td><a href="#removealldevicedata">removeAllDeviceData()</a></td></tr>
 <tr class="even"><td><a href="#enableHuaweiPushNotifications">enableHuaweiPushNotifications()</a></td></tr>
 <tr class="even"><td><a href="#registersmsnumber">registerSMSNumber(phoneNumber)</a></td></tr>
 <tr class="even"><td><a href="#registerwhatsappnumber">registerWhatsappNumber(phoneNumber)</a></td></tr>
@@ -450,23 +447,6 @@ Opens [Inbox](https://www.pushwoosh.com/docs/message-inbox) screen.
 Before using Message Inbox, please add node_modules/pushwoosh-react-native-plugin/src/ios/PushwooshInboxBundle.bundle to your project. Or, launch a script 'node node_modules/pushwoosh-react-native-plugin/scripts/add_inbox_ios_resources.js' to do it.
 
 
-### showGDPRConsentUI
-
-```js
-showGDPRConsentUI()
-```
-**[android, ios]**  
-A part of [The GDPR Compliance](https://www.pushwoosh.com/docs/the-gdpr-compliance) solution that shows the GDPR Consent Form, ensuring lawful basis for processing personal data of EU citizens.
-
-
-### showGDPRDeletionUI
-
-```js
-showGDPRDeletionUI()
-```
-**[android, ios]**  
-A part of [The GDPR Compliance](https://www.pushwoosh.com/docs/the-gdpr-compliance) solution that shows the GDPR Deletion Form, ensuring means to comply with the right to erasure.
-
 
 ### setCommunicationEnabled
 
@@ -477,13 +457,6 @@ setCommunicationEnabled(on: boolean)
 A binary method enabling/disabling all communication with Pushwoosh. The boolean value is false unsubscribes the device from receiving push notifications and stops in-app messages download. The value true reverses the effect.
 
 
-### removeAllDeviceData
-
-```js
-removeAllDeviceData()
-```
-**[android, ios]**  
-Removes all data about the device. Cannot be undone.
 
 ### enableHuaweiPushNotifications
 

package/index.d.ts

@@ -83,14 +83,9 @@ declare module 'pushwoosh-react-native-plugin' {
     deleteMessages(ids: string[]): void;
     performAction(id: string): void;
 
-    //GDPR methods
-    showGDPRConsentUI(): void;
-    showGDPRDeletionUI(): void;
-    isDeviceDataRemoved(success: (isRemoved: boolean) => void): void;
+    //Communication methods
     isCommunicationEnabled(success: (isEnabled: boolean)=> void): void;
-    isAvailableGDPR(success: (isAvailable: boolean) => void): void;
     setCommunicationEnabled(enabled: boolean, success?: () => void, fail?: (error: Error) => void): void;
-    removeAllDeviceData(success?: () => void, fail?: (error: Error) => void): void;
 
   }
 

package/index.js

@@ -590,29 +590,12 @@ class PushNotification {
 		PushwooshModule.performAction(id);
 	}
 
-	// Show inApp for change setting Enable/disable all communication with Pushwoosh
-	showGDPRConsentUI(){
-		PushwooshModule.showGDPRConsentUI();
-	}
-
-	// Show inApp for all device data from Pushwoosh and stops all interactions and communication permanently.
-	showGDPRDeletionUI(){
-		PushwooshModule.showGDPRDeletionUI();
-	}
-
-	isDeviceDataRemoved(success: Function){
-		 PushwooshModule.isDeviceDataRemoved(success);
-	}
 
 	// Return flag is enable communication with server
 	isCommunicationEnabled(success: Function){
 		PushwooshModule.isCommunicationEnabled(success);
 	}
 
-	// Return flag is enabled GDPR on server	
-	isAvailableGDPR(success: Function){
-		PushwooshModule.isAvailableGDPR(success);
-	}
 
 	// Enable/disable all communication with Pushwoosh. Enabled by default.
 	setCommunicationEnabled(enable: boolean, success: ?Function, fail: ?Function) {
@@ -625,16 +608,6 @@ class PushNotification {
 		PushwooshModule.setCommunicationEnabled(enable, success, fail);
 	}
 
-	// Removes all device data from Pushwoosh and stops all interactions and communication permanently.
-	removeAllDeviceData( success: ?Function, fail: ?Function) {
-		if (!success) {
-			success = function() {};
-		}
-		if (!fail) {
-			fail = function(error) {};
-		}
-		PushwooshModule.removeAllDeviceData(success, fail);
-	}
 
 	// Set notification icon background color
 	setNotificationIconBackgroundColor(color: string) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.42",
+  "version": "6.1.43",
   "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.42"
+  s.version          = "6.1.43"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'PushwooshXCFramework', '6.10.4'
+  s.dependency 'PushwooshXCFramework', '6.10.5'
   s.dependency 'PushwooshInboxUIXCFramework'
 end

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

@@ -18,7 +18,6 @@ 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;
@@ -30,7 +29,7 @@ import com.pushwoosh.exception.SetUserIdException;
 import com.pushwoosh.exception.RegisterForPushNotificationsException;
 import com.pushwoosh.exception.UnregisterForPushNotificationException;
 import com.pushwoosh.function.Result;
-import com.pushwoosh.inapp.PushwooshInApp;
+import com.pushwoosh.inapp.InAppManager;
 import com.pushwoosh.inbox.PushwooshInbox;
 import com.pushwoosh.inbox.data.InboxMessage;
 import com.pushwoosh.inbox.exception.InboxMessagesException;
@@ -306,7 +305,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 
 	@ReactMethod
 	public void postEvent(String event, ReadableMap attributes) {
-		PushwooshInApp.getInstance().postEvent(event, ConversionUtil.convertToTagsBundle(attributes));
+		InAppManager.getInstance().postEvent(event, ConversionUtil.convertToTagsBundle(attributes));
 	}
 
 	@ReactMethod
@@ -498,67 +497,28 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		PushwooshInbox.performAction(id);
 	}
 
-	@ReactMethod
-	public void showGDPRConsentUI(){
-		GDPRManager.getInstance().showGDPRConsentUI();
-	}
-
-	@ReactMethod
-	public void showGDPRDeletionUI(){
-		GDPRManager.getInstance().showGDPRDeletionUI();
-	}
-
-	@ReactMethod
-	public void isDeviceDataRemoved(final Callback success){
-		success.invoke(GDPRManager.getInstance().isDeviceDataRemoved());
-	}
-
 	@ReactMethod
 	public void isCommunicationEnabled(final Callback success){
-		success.invoke(GDPRManager.getInstance().isCommunicationEnabled());
-	}
-
-	@ReactMethod
-	public void isAvailableGDPR(final Callback success){
-		success.invoke(GDPRManager.getInstance().isAvailable());
+		success.invoke(Pushwoosh.getInstance().isServerCommunicationAllowed());
 	}
 
 	@ReactMethod
 	public void setCommunicationEnabled(boolean enable, final Callback success, final Callback error) {
-		GDPRManager.getInstance().setCommunicationEnabled(enable, new com.pushwoosh.function.Callback<Void, PushwooshException>() {
-			@Override
-			public void process(Result<Void, PushwooshException> result) {
-				if (result.isSuccess()) {
-					if (success != null) {
-						success.invoke(result.getData());
-					}
-				} else if (result.getException() != null) {
-					if (error != null) {
-						error.invoke(result.getException().getLocalizedMessage());
-					}
-				}
+		try {
+			if (enable) {
+				Pushwoosh.getInstance().startServerCommunication();
+			} else {
+				Pushwoosh.getInstance().stopServerCommunication();
 			}
-		});
-	}
-
-	@ReactMethod
-	public void removeAllDeviceData(final Callback success, final Callback error) {
-		GDPRManager.getInstance().removeAllDeviceData(new com.pushwoosh.function.Callback<Void, PushwooshException>() {
-			@Override
-			public void process(Result<Void, PushwooshException> result) {
-				if (result.isSuccess()) {
-					if (success != null) {
-						success.invoke(result.getData());
-					}
-				} else if (result.getException() != null) {
-					if (error != null) {
-						error.invoke(result.getException().getLocalizedMessage());
-					}
-				}
+			success.invoke();
+		} catch (Exception e) {
+			if (error != null) {
+				error.invoke(e.getMessage());
 			}
-		});
+		}
 	}
 
+
 	@ReactMethod
 	public void setLanguage(String language){
 		Pushwoosh.getInstance().setLanguage(language);

package/src/ios/PushwooshPlugin/Pushwoosh.h

@@ -14,14 +14,12 @@
 #import <PushwooshFramework/PushNotificationManager.h>
 #import <PushwooshFramework/PWInAppManager.h>
 #import <PushwooshInboxUI/PushwooshInboxUI.h>
-#import <PushwooshFramework/PWGDPRManager.h>
 #import <PushwooshFramework/PWInlineInAppView.h>
 #import <PushwooshFramework/PWInbox.h>
 #else
 #import "PushNotificationManager.h"
 #import "PWInAppManager.h"
 #import "PushwooshInboxUI.h"
-#import "PWGDPRManager.h"
 #import "PWInlineInAppView.h"
 #import "PWInbox.h"
 #endif

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -19,6 +19,10 @@
 
 #define kPushwooshPluginImplementationInfoPlistKey @"Pushwoosh_PLUGIN_NOTIFICATION_HANDLER"
 
+#define PW_COMMUNICATION_ENABLED_KEY @"PushwooshCommunicationEnabled"
+#define PW_COMMUNICATION_ENABLED_PLIST_KEY @"Pushwoosh_ALLOW_SERVER_COMMUNICATION"
+
+
 static id objectOrNull(id object) {
     if (object) {
         return object;
@@ -773,54 +777,46 @@ API_AVAILABLE(ios(10.0)) {
     return controller;
 }
 
-RCT_EXPORT_METHOD(showGDPRConsentUI) {
-    [[PWGDPRManager sharedManager] showGDPRConsentUI];
-}
-
-RCT_EXPORT_METHOD(showGDPRDeletionUI) {
-    [[PWGDPRManager sharedManager] showGDPRDeletionUI];
-}
-
-RCT_EXPORT_METHOD(isDeviceDataRemoved:(RCTResponseSenderBlock)callback) {
-    callback(@[@([PWGDPRManager sharedManager].isDeviceDataRemoved)]);
-}
-
 RCT_EXPORT_METHOD(isCommunicationEnabled:(RCTResponseSenderBlock)callback) {
-    callback(@[@([PWGDPRManager sharedManager].isCommunicationEnabled)]);
-}
+    BOOL isCommunicationEnabled = [self getCommunicationEnabledState];
 
-RCT_EXPORT_METHOD(isAvailableGDPR:(RCTResponseSenderBlock)callback) {
-    callback(@[@([PWGDPRManager sharedManager].isAvailable)]);
+    callback(@[@(isCommunicationEnabled)]);
 }
 
 RCT_EXPORT_METHOD(setCommunicationEnabled:(BOOL)enabled success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-    [[PWGDPRManager sharedManager] setCommunicationEnabled:enabled completion:^(NSError *error) {
-        if (error) {
-            if (errorCallback) {
-                errorCallback(@[error.localizedDescription]);
-            }
-        } else {
-            if (successCallback) {
-                successCallback(@[]);
-            }
-        }
-    }];
+    [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:PW_COMMUNICATION_ENABLED_KEY];
+        
+    if (enabled) {
+        [[Pushwoosh sharedInstance] startServerCommunication];
+    } else {
+        [[Pushwoosh sharedInstance] stopServerCommunication];
+    }
+
+    
+    successCallback(@[]);
 }
 
-RCT_EXPORT_METHOD(removeAllDeviceData:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-    [[PWGDPRManager sharedManager] removeAllDeviceDataWithCompletion:^(NSError *error) {
-        if (error) {
-            if (errorCallback) {
-                errorCallback(@[error.localizedDescription]);
-            }
-        } else {
-            if (successCallback) {
-                successCallback(@[]);
-            }
+- (BOOL)getCommunicationEnabledState {
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSObject *plistValue = [bundle objectForInfoDictionaryKey:PW_COMMUNICATION_ENABLED_PLIST_KEY];
+    
+    if (plistValue != nil) {
+        if ([plistValue isKindOfClass:[NSNumber class]]) {
+            return [(NSNumber *)plistValue boolValue];
+        } else if ([plistValue isKindOfClass:[NSString class]]) {
+            NSString *stringValue = [(NSString *)plistValue lowercaseString];
+            return [stringValue isEqualToString:@"true"] || [stringValue isEqualToString:@"yes"] || [stringValue isEqualToString:@"1"];
         }
-    }];
+    }
+
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:PW_COMMUNICATION_ENABLED_KEY] != nil) {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:PW_COMMUNICATION_ENABLED_KEY];
+    }
+    
+    return YES;
 }
 
+
 RCT_EXPORT_METHOD(createLocalNotification:(NSDictionary *)params){
     NSString *body = params[@"msg"];
     NSUInteger delay = [params[@"seconds"] unsignedIntegerValue];