react-native-notifyvisitors 4.0.7 → 4.1.1

package/README.md

@@ -34,14 +34,6 @@
       compile project(':react-native-notifyvisitors')
   	```
 
-#### Windows
-[Read it! :D](https://github.com/ReactWindows/react-native)
-
-1. In Visual Studio add the `RNNotifyvisitors.sln` in `node_modules/react-native-notifyvisitors/windows/RNNotifyvisitors.sln` folder to their solution, reference from their app.
-2. Open up your `MainPage.cs` app
-  - Add `using Notifyvisitors.RNNotifyvisitors;` to the usings at the top of the file
-  - Add `new RNNotifyvisitorsPackage()` to the `List<IReactPackage>` returned by the `Packages` method
-
 
 ## Usage
 ```javascript

package/android/build.gradle

@@ -27,16 +27,13 @@ android {
 
 repositories {
     mavenCentral()
-    maven {
-       url  "https://dl.bintray.com/notifyvisitors/notifyvisitors"
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.facebook.react:react-native:+'
     
-    implementation 'com.notifyvisitors.notifyvisitors:notifyvisitors:5.1.4'
+    implementation 'com.notifyvisitors.notifyvisitors:notifyvisitors:v28-5.1.7'
     implementation 'com.android.installreferrer:installreferrer:2.1'
 
     implementation 'com.android.support:design:28.0.0'

package/android/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
         android:allowBackup="false"
         android:label="@string/app_name"
         android:usesCleartextTraffic="true"
+        android:largeHeap="true"
         android:supportsRtl="true">
 
         <service android:name="com.notifyvisitors.notifyvisitors.NVFirebaseMessagingService">

package/android/src/main/java/com/rn_notifyvisitors/RNNotifyvisitorsModule.java

@@ -14,17 +14,20 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.notifyvisitors.notifyvisitors.NotifyVisitorsApi;
 import com.notifyvisitors.notifyvisitors.NotifyVisitorsApplication;
 import com.notifyvisitors.notifyvisitors.interfaces.NotificationCountInterface;
 import com.notifyvisitors.notifyvisitors.interfaces.NotificationListDetailsCallback;
+import com.notifyvisitors.notifyvisitors.interfaces.OnEventTrackListener;
 import com.notifyvisitors.notifyvisitors.interfaces.OnNotifyBotClickListener;
 import com.notifyvisitors.notifyvisitors.push.NVNotificationChannels;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -32,11 +35,22 @@ import java.util.Set;
 public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implements ActivityEventListener {
 
     private final ReactApplicationContext reactContext;
-    private static final String TAG = "NotifyVisitors";
+    private static final String TAG = "RN-NotifyVisitors";
+    private static final String PLUGIN_VERSION = "4.1.1";
 
     private String PUSH_BANNER_CLICK_EVENT = "nv_push_banner_click";
     private String CHAT_BOT_BUTTON_CLICK = "nv_chat_bot_button_click";
 
+    private String SHOW_CALLBACK = "nv_show_callback";
+    private String EVENT_CALLBACK = "nv_event_callback";
+    private String COMMON_SHOW_EVENT_CALLBACK = "nv_common_show_event_callback";
+
+    String finalData;
+
+    Callback showCallback;
+    Callback eventCallback;
+    Callback commonCallback;
+
 
     public RNNotifyvisitorsModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -63,6 +77,9 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     public void getLinkInfo() {
         try {
             Log.i(TAG, "GET LINK INFO !!");
+            if(finalData != null){
+                sendEvent(PUSH_BANNER_CLICK_EVENT, finalData);
+            }
         } catch (Exception e) {
             Log.i(TAG, "GET LINK INFO ERROR : " + e);
         }
@@ -114,43 +131,54 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     }
 
     @ReactMethod
-    public void show(String tokens, String customObjects, String fragmentName) {
+    public void show(ReadableMap tokens, ReadableMap customObjects, String fragmentName, Callback callback) {
         try {
             Log.i(TAG, "SHOW !!");
-            JSONObject jTokens;
-            JSONObject jcustomObjects;
-            if (tokens != null) {
-                jTokens = new JSONObject(tokens);
-            } else {
-                jTokens = null;
+            showCallback = callback;
+
+            JSONObject mTokens = null;
+            try {
+                if (tokens != null) {
+                    HashMap<String, Object> temp = tokens.toHashMap();
+                    mTokens = new JSONObject(temp);
+                }
+            } catch (Exception e) {
+                Log.i(TAG, "TOKENS PARSE ERROR : " + e);
             }
 
-            if (customObjects != null) {
-                jcustomObjects = new JSONObject(customObjects);
-            } else {
-                jcustomObjects = null;
+            JSONObject mCustomObjects = null;
+            try {
+                if (customObjects != null) {
+                    HashMap<String, Object> temp = customObjects.toHashMap();
+                    mCustomObjects = new JSONObject(temp);
+                }
+            } catch (Exception e) {
+                Log.i(TAG, "CUSTOM-OBJECT PARSE ERROR : " + e);
             }
 
-            // Activity activity = (Activity) reactContext;
-            // final Activity activity = reactContext.getCurrentActivity();
             Activity activity = reactContext.getCurrentActivity();
-            NotifyVisitorsApi.getInstance(activity).show(jTokens, jcustomObjects, fragmentName);
+            NotifyVisitorsApi.getInstance(activity).show(mTokens, mCustomObjects, fragmentName);
         } catch (Exception e) {
             Log.i(TAG, "SHOW ERROR : " + e);
         }
     }
 
     @ReactMethod
-    public void event(String eventName, String attributes, String ltv, String scope) {
+    public void event(String eventName, ReadableMap attributes, String ltv, String scope, Callback callback) {
         try {
             Log.i(TAG, "EVENT !!");
-            JSONObject jAttributes;
-            if (attributes != null) {
-                jAttributes = new JSONObject(attributes);
-            } else {
-                jAttributes = null;
+            eventCallback = callback;
+
+            JSONObject mAttributes = null;
+            try {
+                if (attributes != null) {
+                    HashMap<String, Object> temp = attributes.toHashMap();
+                    mAttributes = new JSONObject(temp);
+                }
+            } catch (Exception e) {
+                Log.i(TAG, "ATTRIBUTES PARSE ERROR : " + e);
             }
-            NotifyVisitorsApi.getInstance(reactContext).event(eventName, jAttributes, ltv, scope);
+            NotifyVisitorsApi.getInstance(reactContext).event(eventName, mAttributes, ltv, scope);
         } catch (Exception e) {
             Log.i(TAG, "EVENT ERROR : " + e);
         }
@@ -202,17 +230,17 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     }
 
     @ReactMethod
-    public void userIdentifier(String userID, String sJsonObject) {
+    public void userIdentifier(String userID, ReadableMap attributes) {
         try {
             Log.i(TAG, "userIdentifier !!");
-            JSONObject nJsonObject;
-            if (sJsonObject != null) {
-                nJsonObject = new JSONObject(sJsonObject);
-            } else {
-                nJsonObject = null;
+            JSONObject mAttributes = null;
+
+            if (attributes != null) {
+                HashMap<String, Object> temp = attributes.toHashMap();
+                mAttributes = new JSONObject(temp);
             }
 
-            NotifyVisitorsApi.getInstance(reactContext).userIdentifier(userID, nJsonObject);
+            NotifyVisitorsApi.getInstance(reactContext).userIdentifier(userID, mAttributes);
         } catch (Exception e) {
             Log.i(TAG, "USER IDENTIFIER ERROR : " + e);
         }
@@ -377,10 +405,20 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         }
     }
 
+    @ReactMethod
+    public void getEventSurveyInfo(Callback callback) {
+        try {
+            Log.i(TAG, "GET EVENT SURVEY INFO !!");
+            commonCallback = callback;
+        } catch (Exception e) {
+            Log.i(TAG, "GET EVENT SURVEY INFO ERROR : " + e);
+        }
+    }
+
 
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-        this.onActivityResult(activity, requestCode, resultCode, data);
+        //this.onActivityResult(activity, requestCode, resultCode, data);
         Log.i(TAG, "ON ACTIVITY RESULT !!");
     }
 
@@ -390,6 +428,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         super.initialize();
         try {
             Log.i(TAG, "INITIALIZE");
+            Log.i(TAG, "RN-NV PLUGIN VERSION : " + PLUGIN_VERSION);
             Activity currentActivity = getCurrentActivity();
             if (currentActivity != null) {
                 Intent intent = currentActivity.getIntent();
@@ -400,6 +439,12 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         } catch (Exception e) {
             Log.i(TAG, "INITIALIZE ERROR : " + e);
         }
+
+        try {
+            fetchEventSurvey(reactContext);
+        } catch (Exception e) {
+            Log.i(TAG, "FETCHING EVENT SURVEY DATA : " + e);
+        }
     }
 
     @Override
@@ -419,7 +464,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         Log.i(TAG, "INSIDE HANDLE INTENT !!!!");
 
         JSONObject dataInfo, finalDataInfo;
-        String finalData;
+
 
         String action = intent.getAction();
         Uri url = intent.getData();
@@ -436,10 +481,10 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                         for (String key : bundle.keySet()) {
                             try {
                                 dataInfo.put(key, JSONObject.wrap(bundle.get(key)));
-                                if(key.equals("nv_type")){
-                                    try{
+                                if (key.equals("nv_type")) {
+                                    try {
                                         nv_type = bundle.get(key).toString();
-                                    }catch (Exception e){
+                                    } catch (Exception e) {
                                         //e.printStackTrace();
                                     }
                                 }
@@ -448,7 +493,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                                 //e.printStackTrace();
                             }
                         }
-                        dataInfo.put("type",nv_type);
+                        dataInfo.put("type", nv_type);
                         finalDataInfo.put("parameters", dataInfo);
                         finalData = finalDataInfo.toString();
                         sendEvent(PUSH_BANNER_CLICK_EVENT, finalData);
@@ -506,4 +551,55 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     public ReactApplicationContext getReactContext() {
         return reactContext;
     }
+
+    private void fetchEventSurvey(Context context) {
+        try {
+            NotifyVisitorsApi.getInstance(context).getEventResponse(new OnEventTrackListener() {
+                @Override
+                public void onResponse(JSONObject jsonObject) {
+                    sendResponse(jsonObject);
+                }
+            });
+        } catch (Exception e) {
+            Log.i(TAG, "FETCH EVENT SURVEY ERROR : " + e);
+        }
+
+    }
+
+    private void sendResponse(JSONObject response) {
+        try {
+            if (response != null) {
+                String eventName = response.getString("eventName");
+
+                // check clicked is banner or survey
+                if (eventName.equalsIgnoreCase("Survey Submit") ||
+                        eventName.equalsIgnoreCase("Survey Attempt") ||
+                        eventName.equalsIgnoreCase("Banner Clicked")) {
+                    if (showCallback != null) {
+                        sendEvent(SHOW_CALLBACK, response.toString());
+                    } else {
+                        Log.i(TAG, "SHOW CALLBACK CONTEXT IS NULL !!");
+                    }
+                } else {
+                    if (eventCallback != null) {
+                        sendEvent(EVENT_CALLBACK, response.toString());
+                    } else {
+                        Log.i(TAG, "EVENT CALLBACK CONTEXT IS NULL !!");
+                    }
+                }
+
+                // send commom callback
+                if (commonCallback != null) {
+                    sendEvent(COMMON_SHOW_EVENT_CALLBACK, response.toString());
+                }
+            } else {
+                Log.i(TAG, "RESPONSE IS NULL !!");
+            }
+
+        } catch (Exception e) {
+            Log.i(TAG, "SURVEY SEND RESPONSE ERROR : " + e);
+        }
+    }
+
+
 }

package/index.js

@@ -7,6 +7,12 @@ const nvEventEmitter = new NativeEventEmitter(RNNotifyvisitors);
 
 const NV_PUSH_BANNER_CLICK_EVENT = 'nv_push_banner_click';
 const NV_CHAT_BOT_BUTTON_CLICK = 'nv_chat_bot_button_click';
+
+const NV_SHOW_CALLBACK = 'nv_show_callback';
+const NV_EVENT_CALLBACK = 'nv_event_callback';
+const NV_EVENT_SURVEY_CALLBACK = 'nv_common_show_event_callback';
+
+
 const pushCallbackFunction = {};
 
 const registerPushListener = function(){
@@ -41,15 +47,80 @@ const chatBotButtonClickListener = function(){
 	}
 };
 
+
+const nvShowCallbackListener = function(){
+	if (RNNotifyvisitors != null) {
+		nvEventEmitter.addListener(NV_SHOW_CALLBACK, (data)=>{ 
+			try{
+				if(data != null && typeof pushCallbackFunction[NV_SHOW_CALLBACK] == "function"){
+					if(Platform.OS == "ios"){
+						pushCallbackFunction[NV_SHOW_CALLBACK](data.data);
+					} else{
+						pushCallbackFunction[NV_SHOW_CALLBACK](data);
+					}
+				
+				}
+			}catch(e){
+				console.log(e);
+			}	
+		});	
+	}
+};
+
+
+const nvEventCallbackListener = function(){
+	if (RNNotifyvisitors != null) {
+		nvEventEmitter.addListener(NV_EVENT_CALLBACK, (data)=>{ 
+			try{
+				if(data != null && typeof pushCallbackFunction[NV_EVENT_CALLBACK] == "function"){
+					if(Platform.OS == "ios"){
+						pushCallbackFunction[NV_EVENT_CALLBACK](data.data);
+					} else{
+						pushCallbackFunction[NV_EVENT_CALLBACK](data);
+					}
+					
+				}
+			}catch(e){
+				console.log(e);
+			}	
+		});	
+	}
+};
+
+const nvEventSurveyCallback = function(){
+	if (RNNotifyvisitors != null) {
+		nvEventEmitter.addListener(NV_EVENT_SURVEY_CALLBACK, (data)=>{ 
+			try{
+				if(data != null && typeof pushCallbackFunction[NV_EVENT_SURVEY_CALLBACK] == "function"){
+					if(Platform.OS == "ios"){
+						pushCallbackFunction[NV_EVENT_SURVEY_CALLBACK](data.data);
+					}else{
+						pushCallbackFunction[NV_EVENT_SURVEY_CALLBACK](data);
+					}
+					
+				}
+			}catch(e){
+				console.log(e);
+			}	
+		});	
+	}
+};
+
 registerPushListener();
 chatBotButtonClickListener();
+nvShowCallbackListener();
+nvEventCallbackListener();
+nvEventSurveyCallback();
 
 export default class Notifyvisitors{
 
-	static show(tokens, customObjects, fragmentName){
+	static show(tokens, customObjects, fragmentName, nvCallback){
 			try{
-				RNNotifyvisitors.show(tokens, customObjects, fragmentName);
-			}catch(e){}
+				pushCallbackFunction[NV_SHOW_CALLBACK]  = nvCallback;
+				RNNotifyvisitors.show(tokens, customObjects, fragmentName, nvCallback);
+			}catch(e){
+				console.log(e);
+			}
 	}
 
 	static showNotifications(dismissValue){
@@ -60,28 +131,37 @@ export default class Notifyvisitors{
 				dismissValue = parseInt(dismissValue);
 			}
 			RNNotifyvisitors.showNotifications(dismissValue);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 	
-	static event(eventName, attributes, ltv, scope){
+	static event(eventName, attributes, ltv, scope, nvCallback){
 		try{
-			RNNotifyvisitors.event(eventName, attributes, ltv, scope);
-		}catch(e){}
+			pushCallbackFunction[NV_EVENT_CALLBACK] = nvCallback;
+			RNNotifyvisitors.event(eventName, attributes, ltv, scope, nvCallback);
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 	
 	static stopNotifications(){
 		try{
 			RNNotifyvisitors.stopNotifications();
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 
 	static stopPushNotifications(bValue){
 		try{
 			RNNotifyvisitors.stopPushNotifications(bValue);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 	
@@ -91,35 +171,45 @@ export default class Notifyvisitors{
 			RNNotifyvisitors.getNotificationDataListener("fetchEvent");
 			}
 			RNNotifyvisitors.getNotificationDataListener(callback);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		 
 	} 
 
     static getNotificationCount(callback){
 		try{
 			RNNotifyvisitors.getNotificationCount(callback);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 
 	static scheduleNotification(nid, tag, time, title, message, url, icon){
 		try{
 			RNNotifyvisitors.scheduleNotification(nid, tag, time, title, message, url, icon);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 
 	static userIdentifier(userID, sJsonObject){
 		try{
 			RNNotifyvisitors.userIdentifier(userID, sJsonObject);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 
     static stopGeofencePushforDateTime(dateTime, additionalHours){
 		try{
 			RNNotifyvisitors.stopGeofencePushforDateTime(dateTime, additionalHours);
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 		
 	}
 
@@ -136,7 +226,9 @@ export default class Notifyvisitors{
 	static scrollViewDidScroll_iOS_only(){
 		try{
 			RNNotifyvisitors.scrollViewDidScroll_iOS_only();
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 	}
 
 	static promptForPushNotificationsWithUserResponse(callback) {
@@ -156,7 +248,9 @@ export default class Notifyvisitors{
 			} else {
 				RNNotifyvisitors.setAutoStartPermission();
 			}
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 	}
 
 
@@ -173,7 +267,7 @@ export default class Notifyvisitors{
 		try{
 			RNNotifyvisitors.getNvUID(callback);
 		}catch(e){
-
+			console.log(e);
 		}
 	}
 
@@ -184,7 +278,9 @@ export default class Notifyvisitors{
 			} else {
 				RNNotifyvisitors.createNotificationChannel(chId, chName, chDescription, chImportance, enableLights, shouldVibrate, lightColor, soundFileName);
 			}
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 	}
 
 	static deleteNotificationChannel(channelId){
@@ -194,7 +290,9 @@ export default class Notifyvisitors{
 			} else {
 				RNNotifyvisitors.deleteNotificationChannel(channelId);
 			}
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 	}
 
 	static createNotificationChannelGroup(groupId, groupName){
@@ -204,7 +302,9 @@ export default class Notifyvisitors{
 			} else {
 				RNNotifyvisitors.createNotificationChannelGroup(groupId, groupName);
 			}
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
 	}
 
 	static deleteNotificationChannelGroup(groupId){
@@ -214,7 +314,20 @@ export default class Notifyvisitors{
 			} else {
 				RNNotifyvisitors.deleteNotificationChannelGroup(groupId);
 			}
-		}catch(e){}
+		}catch(e){
+			console.log(e);
+		}
+	}
+
+
+	static getEventSurveyInfo(nvCallback){
+		try{
+			pushCallbackFunction[NV_EVENT_SURVEY_CALLBACK] = nvCallback;
+			RNNotifyvisitors.getEventSurveyInfo(nvCallback);
+		}catch(e){
+			console.log(e)
+		}
+
 	}
 
 }

package/ios/Assets/nvResourceValues.plist

@@ -155,6 +155,10 @@
 		<integer>0</integer>
 		<key>nvDefaultSessionTimeOutInMinute</key>
 		<integer>20</integer>
+		<key>nvModalSurveyResizingAnimationDurationInSeconds</key>
+		<integer>0</integer>
+		<key>nvModalSurveyResizingBottomPadding</key>
+		<integer>0</integer>
 	</dict>
 </dict>
 </plist>

package/ios/RNNotifyvisitors/{RCTEventEmitterDemo.h → RCTNVEventEmitter.h}

@@ -13,6 +13,12 @@
 #import "RCTUtils.h"
 #endif
 
+#if __has_include(<notifyvisitors/notifyvisitors.h>)
+#import <notifyvisitors/notifyvisitors.h>
+#else
+#import "../notifyvisitors.h"
+#endif
+
 
 typedef NS_ENUM(NSInteger, OSNotificationEventTypes) {
     NotificationReceived,
@@ -22,7 +28,7 @@ typedef NS_ENUM(NSInteger, OSNotificationEventTypes) {
 //#define OSNotificationEventTypesArray @[@"Notifyvisitors-notificationReceived",@"Notifyvisitors-notificationOpened"]
 //#define OSEventString(enum) [OSNotificationEventTypesArray objectAtIndex:enum]
 
-@interface RCTEventEmitterDemo : RCTEventEmitter <RCTBridgeModule>
+@interface RCTEventEmitterDemo : RCTEventEmitter <RCTBridgeModule, notifyvisitorsDelegate>
 
 + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body;
 + (BOOL)hasSetBridge;