react-native-notifyvisitors 4.3.1 → 4.3.3

package/android/build.gradle

@@ -34,8 +34,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.facebook.react:react-native:+'
-    //implementation 'com.notifyvisitors.notifyvisitors:notifyvisitors:v5.4.7'
-    implementation 'com.notifyvisitors.notifyvisitors:notifyvisitors:v5.4.7.1
+    implementation 'com.notifyvisitors.notifyvisitors:notifyvisitors:v5.4.7.1'
     
     implementation platform('com.google.firebase:firebase-bom:30.3.1') 
     implementation ('com.google.firebase:firebase-messaging')

package/android/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <application>
         <service
             android:name="com.notifyvisitors.notifyvisitors.NVFirebaseMessagingService"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

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

@@ -25,7 +25,6 @@ import com.notifyvisitors.notifyvisitors.interfaces.NotificationListDetailsCallb
 import com.notifyvisitors.notifyvisitors.interfaces.OnCenterCountListener;
 import com.notifyvisitors.notifyvisitors.interfaces.OnCenterDataListener;
 import com.notifyvisitors.notifyvisitors.interfaces.OnEventTrackListener;
-import com.notifyvisitors.notifyvisitors.interfaces.OnNotifyBotClickListener;
 import com.notifyvisitors.notifyvisitors.interfaces.OnPushRuntimePermission;
 import com.notifyvisitors.notifyvisitors.permission.NVPopupDesign;
 import com.notifyvisitors.notifyvisitors.push.NVNotificationChannels;
@@ -44,7 +43,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
 
     private final ReactApplicationContext reactContext;
     private static final String TAG = "RN-NotifyVisitors";
-    private static final String PLUGIN_VERSION = "4.3.1";
+    private static final String PLUGIN_VERSION = "4.3.3";
 
     private String PUSH_BANNER_CLICK_EVENT = "nv_push_banner_click";
     private String CHAT_BOT_BUTTON_CLICK = "nv_chat_bot_button_click";
@@ -69,8 +68,10 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     JSONObject mTokens;
     JSONObject mCustomObjects;
     NVCenterStyleConfig config;
-
     private final int NV_TIME_OUT = 5000;
+    private final int NV_BANNER_TIME_OUT = 1200;
+
+    boolean nvInAppFound = false;
 
 
     /* constructor */
@@ -177,18 +178,41 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                     @Override
                     public void run() {
                         NotifyVisitorsApi.getInstance(mActivity).show(mTokens, mCustomObjects, fragmentName);
+                        checkForBannerNotFound();
                     }
                 });
             } else {
                 Log.e(TAG, "Getting Null Activity !!");
             }
-
-
         } catch (Exception e) {
             Log.i(TAG, "SHOW ERROR : " + e);
         }
     }
 
+    private void checkForBannerNotFound() {
+        try {
+            new Timer().schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    if (!nvInAppFound && showCallback != null) {
+                        Log.i(TAG, "Banner Not Found to be true !!!!");
+                        try {
+                            JSONObject nv_response = new JSONObject();
+                            nv_response.put("status", "fail");
+                            nv_response.put("eventName", "Banner InActive");
+                            nv_response.put("callbackType", "banner");
+                            sendEvent(SHOW_CALLBACK, nv_response.toString());
+                        } catch (Exception e) {
+                            Log.i(TAG, "Banner Not Found Checker ERROR 1: " + e);
+                        }
+                    }
+                }
+            }, NV_BANNER_TIME_OUT);
+        } catch (Exception e) {
+            Log.i(TAG, "Banner Not Found Checker ERROR 2: " + e);
+        }
+    }
+
     /* 2 - Notification Center */
     @ReactMethod
     public void showNotifications(ReadableMap mAppInboxInfo, final int dismissValue) {
@@ -432,13 +456,13 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                     mActivity.runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            NotifyVisitorsApi.getInstance(mActivity).startChatBot(screenName, new OnNotifyBotClickListener() {
-                                @Override
-                                public void onInAppRedirection(JSONObject data) {
-                                    String strI = data.toString();
-                                    sendEvent(CHAT_BOT_BUTTON_CLICK, strI);
-                                }
-                            });
+                            // NotifyVisitorsApi.getInstance(mActivity).startChatBot(screenName, new OnNotifyBotClickListener() {
+                            //     @Override
+                            //     public void onInAppRedirection(JSONObject data) {
+                            //         String strI = data.toString();
+                            //         sendEvent(CHAT_BOT_BUTTON_CLICK, strI);
+                            //     }
+                            // });
                         }
                     });
                 } else {
@@ -453,9 +477,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
 
     /* 6 - Push Notification Channel */
     @ReactMethod
-    public void createNotificationChannel(String chId, String chName, String chDescription,
-                                          String chImportance, String enableLights, String shouldVibrate,
-                                          String lightColor, String soundFileName) {
+    public void createNotificationChannel(String chId, String chName, String chDescription, String chImportance, String enableLights, String shouldVibrate, String lightColor, String soundFileName) {
         try {
             Log.i(TAG, "CREATE NOTIFICATION CHANNEL !!");
 
@@ -784,7 +806,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                         }, 0);
                     }
                 });
-            } else  {
+            } else {
                 Log.e(TAG, "Getting Null Activity !!");
             }
         } catch (Exception e) {
@@ -818,7 +840,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
             Log.i(TAG, "GET NOTIFICATION DATA LISTENER ERROR : " + e);
         }
     }
-    
+
 
     /* 17 - Auto Start Library Android  */
     @ReactMethod
@@ -883,9 +905,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
 
     /* 20 - Trigger Push Notification on Panel */
     @ReactMethod
-    public void scheduleNotification(String nid, String tag, String time,
-                                     String title, String message, String url,
-                                     String icon) {
+    public void scheduleNotification(String nid, String tag, String time, String title, String message, String url, String icon) {
         try {
             Log.i(TAG, "SCHEDULE NOTIFICATION !!");
             NotifyVisitorsApi.getInstance(reactContext).scheduleNotification(nid, tag, time, title, message, url, icon);
@@ -987,7 +1007,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         }
     }
 
-     @ReactMethod
+    @ReactMethod
     public void clearPushData() {
         try {
             Log.i(TAG, "CLEAR PUSH DATA !!");
@@ -997,7 +1017,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
         }
     }
 
-     private void intentDataClear() {
+    private void intentDataClear() {
         try {
             new Timer().schedule(new TimerTask() {
                 @Override
@@ -1014,7 +1034,6 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     }
 
 
-
     /* On Activity Result */
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
@@ -1073,6 +1092,22 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                         finalDataInfo.put("parameters", dataInfo);
                         finalData = finalDataInfo.toString();
                         sendEvent(PUSH_BANNER_CLICK_EVENT, finalData);
+
+                        // try to send callback in show function
+                        try {
+                            if (nv_type.equalsIgnoreCase("banner")) {
+                                JSONObject bannerData = new JSONObject();
+                                bannerData.put("status", "success");
+                                bannerData.put("eventName", "Banner Clicked");
+                                bannerData.put("callbackType", "banner");
+                                bannerData.put("parameters", dataInfo);
+                                sendResponse(bannerData);
+                                nvInAppFound = true;
+                            }
+                        } catch (Exception e) {
+                            Log.i(TAG, "SEND DATA IN SHOW METHOD ERROR : " + e);
+                        }
+
                     }
                 } catch (Exception e) {
                     Log.i(TAG, "HANDLE INTENT PARSE DATA ERROR : " + e);
@@ -1115,9 +1150,7 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
     /* Send Event Callback to React Native Page */
     private void sendEvent(String eventName, String params) {
         try {
-            reactContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    .emit(eventName, params);
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, params);
         } catch (Exception e) {
             Log.i(TAG, "SEND EVENT ERROR :" + e);
         }
@@ -1131,10 +1164,8 @@ public class RNNotifyvisitorsModule extends ReactContextBaseJavaModule implement
                 String eventName = response.getString("eventName");
 
                 // check clicked is banner or survey
-                if (eventName.equalsIgnoreCase("Survey Submit") ||
-                        eventName.equalsIgnoreCase("Survey Attempt") ||
-                        eventName.equalsIgnoreCase("Banner Impression") ||
-                        eventName.equalsIgnoreCase("Banner Clicked")) {
+                if (eventName.equalsIgnoreCase("Survey Submit") || eventName.equalsIgnoreCase("Survey Attempt") || eventName.equalsIgnoreCase("Banner Impression") || eventName.equalsIgnoreCase("Banner Clicked")) {
+                    nvInAppFound = true;
                     if (showCallback != null) {
                         sendEvent(SHOW_CALLBACK, response.toString());
                     } else {

package/ios/RNNotifyvisitors/RCTNVEventEmitter.m

@@ -9,6 +9,8 @@ RCTResponseSenderBlock showCallback;
 RCTResponseSenderBlock eventCallback;
 RCTResponseSenderBlock commonCallback;
 
+BOOL nvInAppFound = false;
+
 @implementation RCTEventEmitterDemo{
     BOOL hasListeners;
 }
@@ -106,6 +108,7 @@ RCT_EXPORT_METHOD(show:(NSDictionary*_Nullable)nvUserToken  customRules:(NSDicti
         //NSLog(@"Dictionary token 2: %@", [mCustomRule description]);
         dispatch_async(dispatch_get_main_queue(), ^{
             [notifyvisitors Show:mUserToken CustomRule:mCustomRule];
+            [self checkForBannerNotFound];
         });
     }
     @catch(NSException *exception){
@@ -113,44 +116,27 @@ RCT_EXPORT_METHOD(show:(NSDictionary*_Nullable)nvUserToken  customRules:(NSDicti
     }
 }
 
-
-/* 2 - Open Notification Center */
-//RCT_EXPORT_METHOD(showNotifications:(NSMutableDictionary *)appInboxInfo dismiss:(NSString*_Nullable)dismissValue) {
-//    @try{
-//        NSLog(@"RN-NotifyVisitors : SHOW NOTIFICATIONS !!");
-//        [notifyvisitors NotifyVisitorsNotificationCentre];
-//
-//        NSString *nvResourcePlistPath = [[NSBundle mainBundle] pathForResource: @"nvResourceValues" ofType: @"plist"];
-//        if ([[NSFileManager defaultManager] fileExistsAtPath: nvResourcePlistPath]) {
-//            NSDictionary *nvResourceData = [NSDictionary dictionaryWithContentsOfFile: nvResourcePlistPath];
-//            if ([nvResourceData count] > 0) {
-//                NSDictionary *nvResourceBooleans = [nvResourceData objectForKey: @"nvBooleans"];
-//
-//                if ([nvResourceBooleans count] > 0) {
-//                    if (nvResourceBooleans [@"DismissNotificationCenterOnAction"]) {
-//                        nvDismissNCenterOnAction = [nvResourceBooleans [@"DismissNotificationCenterOnAction"] boolValue];
-//                    } else {
-//                        nvDismissNCenterOnAction = YES;
-//                    }
-//                    NSLog(@"NV DISMISS NOTIFICATION CENTER ON ACTION = %@", nvDismissNCenterOnAction ? @"YES" : @"NO");
-//
-//                } else {
-//                    NSLog(@"NV RESOURCE BOOLEANS NOT FOUND !!");
-//                }
-//
-//            } else {
-//                NSLog(@"NV RESOURCE DATA NOT FOUND !!");
-//            }
-//
-//        } else {
-//            NSLog(@"NV RESOURCE VALUES PLIST NOT FOUND !!");
-//        }
-//
-//    }
-//    @catch(NSException *exception){
-//        NSLog(@"RN-NotifyVisitors ERROR : %@", exception.reason);
-//    }
-//}
+- (void)checkForBannerNotFound{
+    @try{
+        NSLog(@"RN-NotifyVisitors : checkForBannerNotFound !!");
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1.2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            if (!nvInAppFound && showCallback != nil) {
+                NSDictionary * bannerData = @{
+                    @"status":@"fail",
+                    @"eventName":@"Banner InActive",
+                    @"callbackType":@"banner"
+                };
+                NSError *nvError = nil;
+                NSData *nvJsonData = [NSJSONSerialization dataWithJSONObject: bannerData options: NSJSONWritingPrettyPrinted error: &nvError];
+                NSString *nvJsonString = [[NSString alloc] initWithData: nvJsonData encoding: NSUTF8StringEncoding];
+                [self sendEventWithName:@"nv_show_callback" body:@{@"data":nvJsonString}];
+            }
+        });
+    }
+    @catch(NSException *exception){
+        NSLog(@"RN-NotifyVisitors Banner Not Found : %@", exception.reason);
+    }
+}
 
 
 RCT_EXPORT_METHOD(showNotifications:(NSDictionary*_Nullable)temp dismiss:(NSString*_Nullable)dismissValue) {
@@ -626,8 +612,8 @@ RCT_EXPORT_METHOD(getNotificationCenterData:(RCTResponseSenderBlock)callback) {
         NSLog(@"RN-NotifyVisitors ERROR : %@", exception.reason);
         NSError *nvExcError = nil;
         NSDictionary *nvExcErrorDataResponse = @{@"message" : @"no notification(s)", @"notifications": @[], @"errorDescription" : exception.description};
-       NSData *nvExcJsonData = [NSJSONSerialization dataWithJSONObject: nvExcErrorDataResponse options:NSJSONWritingPrettyPrinted error: &nvExcError];
-       NSString *nvExcJsonString = [[NSString alloc] initWithData: nvExcJsonData encoding: NSUTF8StringEncoding];
+        NSData *nvExcJsonData = [NSJSONSerialization dataWithJSONObject: nvExcErrorDataResponse options:NSJSONWritingPrettyPrinted error: &nvExcError];
+        NSString *nvExcJsonString = [[NSString alloc] initWithData: nvExcJsonData encoding: NSUTF8StringEncoding];
         callback(@[nvExcJsonString, [NSNull null]]);
     }
 }
@@ -741,6 +727,7 @@ RCT_EXPORT_METHOD(scrollViewDidScroll_iOS_only) {
             NSString * eventName = callback[@"eventName"];
             // clicked is event or survey
             if([eventName isEqualToString:@"Survey Submit"] || [eventName isEqualToString:@"Survey Attempt"] || [eventName isEqualToString:@"Banner Impression"] || [eventName isEqualToString:@"Banner Clicked"] ){
+                nvInAppFound = true;
                 if(showCallback != NULL){
                     [self sendEventWithName:@"nv_show_callback" body:@{@"data":nvJsonString}];
                 }
@@ -861,3 +848,41 @@ RCT_EXPORT_METHOD(scrollViewDidScroll_iOS_only) {
 //}
 
 //callback(@[exception.reason, [NSNull null]]);
+
+/* 2 - Open Notification Center */
+//RCT_EXPORT_METHOD(showNotifications:(NSMutableDictionary *)appInboxInfo dismiss:(NSString*_Nullable)dismissValue) {
+//    @try{
+//        NSLog(@"RN-NotifyVisitors : SHOW NOTIFICATIONS !!");
+//        [notifyvisitors NotifyVisitorsNotificationCentre];
+//
+//        NSString *nvResourcePlistPath = [[NSBundle mainBundle] pathForResource: @"nvResourceValues" ofType: @"plist"];
+//        if ([[NSFileManager defaultManager] fileExistsAtPath: nvResourcePlistPath]) {
+//            NSDictionary *nvResourceData = [NSDictionary dictionaryWithContentsOfFile: nvResourcePlistPath];
+//            if ([nvResourceData count] > 0) {
+//                NSDictionary *nvResourceBooleans = [nvResourceData objectForKey: @"nvBooleans"];
+//
+//                if ([nvResourceBooleans count] > 0) {
+//                    if (nvResourceBooleans [@"DismissNotificationCenterOnAction"]) {
+//                        nvDismissNCenterOnAction = [nvResourceBooleans [@"DismissNotificationCenterOnAction"] boolValue];
+//                    } else {
+//                        nvDismissNCenterOnAction = YES;
+//                    }
+//                    NSLog(@"NV DISMISS NOTIFICATION CENTER ON ACTION = %@", nvDismissNCenterOnAction ? @"YES" : @"NO");
+//
+//                } else {
+//                    NSLog(@"NV RESOURCE BOOLEANS NOT FOUND !!");
+//                }
+//
+//            } else {
+//                NSLog(@"NV RESOURCE DATA NOT FOUND !!");
+//            }
+//
+//        } else {
+//            NSLog(@"NV RESOURCE VALUES PLIST NOT FOUND !!");
+//        }
+//
+//    }
+//    @catch(NSException *exception){
+//        NSLog(@"RN-NotifyVisitors ERROR : %@", exception.reason);
+//    }
+//}

package/ios/RNNotifyvisitors/RNNotifyvisitors.m

@@ -32,7 +32,7 @@ int nvCheckPushClickTimeCounter = 0;
 
 +(void)Initialize{
     NSLog(@"RN-NotifyVisitors : INITIALIZE !!");
-    NSLog(@"RN-NotifyVisitors PLUGIN VERSION : 4.3.1 !!");
+    NSLog(@"RN-NotifyVisitors PLUGIN VERSION : 4.3.3 !!");
         NSString *nvMode = nil;
     #if DEBUG
         nvMode = @"debug";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notifyvisitors",
-  "version": "4.3.1",
+  "version": "4.3.3",
   "description": "React Native Notifyvisitors SDK for push notifications and surveys",
   "main": "index",
   "scripts": {