Merge branch 'hotfix/1.5.1'

MilindWebEngage · MilindWebEngage · commit 266e91ca96d9 · 2024-04-24T14:53:57.000+05:30
diff --git a/SampleApp/App.tsx b/SampleApp/App.tsx
@@ -4,12 +4,37 @@ import {
   enableDevMode,
   initWENotificationInbox,
 } from 'react-native-webengage-inbox';
-import {initWebEngage} from './src/WebEngageHandler/WebEngageManager';
+import {
+  disableWebEngagePush,
+  enableWebEngagePush,
+  initWebEngage,
+} from './src/WebEngageHandler/WebEngageManager';
+import {PermissionsAndroid, Platform} from 'react-native';
 
 function App(): React.JSX.Element {
   enableDevMode();
   initWebEngage();
   initWENotificationInbox();
+  // Rquesting permission for Android
+  const requestAndroidPermissions = async () => {
+    try {
+      const granted = await PermissionsAndroid.request(
+        PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS,
+      );
+      if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+        enableWebEngagePush();
+        console.log('Android permissions granted');
+      } else {
+        disableWebEngagePush();
+        console.log('Android permissions denied');
+      }
+    } catch (err) {
+      console.warn(err);
+    }
+  };
+  if (Platform.OS === 'android' && Platform.Version >= 31) {
+    requestAndroidPermissions();
+  }
 
   return <AppNavigator />;
 }
diff --git a/SampleApp/index.js b/SampleApp/index.js
@@ -1,6 +1,5 @@
 import {AppRegistry} from 'react-native';
 import App from './App';
-// TODO change source to exact App
 import {name as appName} from './app.json';
 
 AppRegistry.registerComponent(appName, () => App);
diff --git a/SampleApp/package.json b/SampleApp/package.json
@@ -11,10 +11,8 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.21.0",
-    "react-native-webengage": "^1.5.0",
-    "react-native-webengage-inbox": "1.0.0",
     "@react-native-picker/picker": "^2.6.1",
-    "@react-navigation/native": "^6.1.9",
+    "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.17",
     "@react-navigation/stack": "^6.3.20",
     "react": "18.2.0",
@@ -23,8 +21,11 @@
     "react-native-gesture-handler": "^2.14.1",
     "react-native-loading-spinner-overlay": "^3.0.1",
     "react-native-modal": "^13.0.1",
-    "react-native-safe-area-context": "^4.8.2",
-    "react-native-we-personalization": "^1.0.0"
+    "react-native-safe-area-context": "^4.9.0",
+    "react-native-screens": "^3.30.1",
+    "react-native-we-personalization": "^1.0.0",
+    "react-native-webengage": "^1.5.0",
+    "react-native-webengage-inbox": "1.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
diff --git a/SampleApp/src/Navigation/AppNavigator.tsx b/SampleApp/src/Navigation/AppNavigator.tsx
@@ -9,7 +9,7 @@ import HomeScreen from '../screens/HomeScreen';
 import InlineScreen from '../screens/InlineScreen';
 import {StyleSheet} from 'react-native';
 import COLORS from '../Styles/Colors';
-import CONSTANTS from '../Utils/Constants';
+import CONSTANTS from '../utils/Constants';
 import ScreenComponent from '../screens/ScreenComponent';
 import ScreenList from '../screens/Inline/ScreenList';
 import ScreenDetails from '../screens/Inline/ScreenDetails';
diff --git a/SampleApp/src/WebEngageHandler/WebEngageManager.ts b/SampleApp/src/WebEngageHandler/WebEngageManager.ts
@@ -1,6 +1,6 @@
 import {Alert} from 'react-native';
 import WebEngage from 'react-native-webengage';
-import CONSTANTS from '../Utils/Constants';
+import CONSTANTS from '../utils/Constants';
 
 const webEngageManager = new WebEngage();
 
@@ -11,6 +11,7 @@ export const initWebEngage = () => {
   webEngageManager.notification.onPrepare(function (notificationData) {
     console.log(
       CONSTANTS.WEBENGAGE_INAPP + 'App: in-app notification prepared',
+      +JSON.stringify(notificationData),
     );
   });
 
@@ -45,10 +46,18 @@ export const initWebEngage = () => {
 
   webEngageManager.push.onClick(function (notificationData) {
     console.log(
-      CONSTANTS.WEBENGAGE_INAPP +
+      CONSTANTS.WEBENGAGE_PUSH +
         ' push-notification clicked with payload: ' +
         JSON.stringify(notificationData.userData),
     );
     Alert.alert('It is a Simple Alert ' + JSON.stringify(notificationData));
   });
 };
+
+export const enableWebEngagePush = () => {
+  webEngageManager.user.setDevicePushOptIn(true);
+};
+
+export const disableWebEngagePush = () => {
+  webEngageManager.user.setDevicePushOptIn(false);
+};
diff --git a/SampleApp/src/screens/EventComponent/EventsScreen.tsx b/SampleApp/src/screens/EventComponent/EventsScreen.tsx
@@ -8,7 +8,7 @@ import WEUserModal from '../../CommonComponents/WEUserModal';
 import WEButton from '../../CommonComponents/WEButton';
 import ShoppingEventsScreen from './ShoppingEventScreen';
 import webEngageManager from '../../WebEngageHandler/WebEngageManager';
-import CONSTANTS from '../../Utils/Constants';
+import CONSTANTS from '../../utils/Constants';
 
 const EventsScreen = () => {
   const [eventName, setEventName] = useState<string>('');
diff --git a/SampleApp/src/screens/EventComponent/ShoppingEventScreen.tsx b/SampleApp/src/screens/EventComponent/ShoppingEventScreen.tsx
@@ -3,7 +3,7 @@ import {View, ScrollView, Text, StyleSheet} from 'react-native';
 import BouncyCheckbox from 'react-native-bouncy-checkbox';
 import WEButton from '../../CommonComponents/WEButton';
 import webEngageManager from '../../WebEngageHandler/WebEngageManager';
-import CONSTANTS from '../../Utils/Constants';
+import CONSTANTS from '../../utils/Constants';
 
 const ShoppingEventsScreen: React.FC = () => {
   const [tvCheckbox, setTvCheckbox] = useState(true);
diff --git a/SampleApp/src/screens/HomeScreen.tsx b/SampleApp/src/screens/HomeScreen.tsx
@@ -9,16 +9,16 @@ import {
 } from 'react-native';
 import {navigate} from '../Navigation/NavigationService';
 import WEButton from '../CommonComponents/WEButton';
-import WEModal from '../Utils/WEModal';
+import WEModal from '../utils/WEModal';
 import COLORS from '../Styles/Colors';
 import webEngageManager from '../WebEngageHandler/WebEngageManager';
-import AsyncStorageUtil from '../Utils/AsyncStorageUtils';
+import AsyncStorageUtil from '../utils/AsyncStorageUtils';
 import {useIsFocused} from '@react-navigation/native';
 import {
   getNotificationCount,
   resetNotificationCount,
 } from 'react-native-webengage-inbox';
-import CONSTANTS from '../Utils/Constants';
+import CONSTANTS from '../utils/Constants';
 
 // TODO Add Navigation Type
 const HomeScreen = ({navigation}) => {
diff --git a/SampleApp/src/screens/Inline/DynamicScreen.tsx b/SampleApp/src/screens/Inline/DynamicScreen.tsx
@@ -23,8 +23,8 @@ import webEngageManager from '../../WebEngageHandler/WebEngageManager';
 import NavigationModal from '../../Navigation/NavigationModal';
 import WETextInput from '../../CommonComponents/WETextInput';
 import WEButton from '../../CommonComponents/WEButton';
-import AsyncStorageUtil from '../../Utils/AsyncStorageUtils';
-import CONSTANTS from '../../Utils/Constants';
+import AsyncStorageUtil from '../../utils/AsyncStorageUtils';
+import CONSTANTS from '../../utils/Constants';
 import COLORS from '../../Styles/Colors';
 
 interface DynamicScreenProps {
diff --git a/SampleApp/src/screens/Inline/ScreenDetails.tsx b/SampleApp/src/screens/Inline/ScreenDetails.tsx
@@ -5,7 +5,7 @@ import BouncyCheckbox from 'react-native-bouncy-checkbox';
 import InlineViewModal from '../../CommonComponents/InlineViewModal';
 import WEButton from '../../CommonComponents/WEButton';
 import WETextInput from '../../CommonComponents/WETextInput';
-import AsyncStorageUtil from '../../Utils/AsyncStorageUtils';
+import AsyncStorageUtil from '../../utils/AsyncStorageUtils';
 import COLORS from '../../Styles/Colors';
 
 interface ScreenDetailsProps {
diff --git a/SampleApp/src/screens/Inline/ScreenList.tsx b/SampleApp/src/screens/Inline/ScreenList.tsx
@@ -5,8 +5,8 @@ import {navigate} from '../../Navigation/NavigationService';
 import webEngageManager from '../../WebEngageHandler/WebEngageManager';
 import WEButton from '../../CommonComponents/WEButton';
 import COLORS from '../../Styles/Colors';
-import AsyncStorageUtil from '../../Utils/AsyncStorageUtils';
-import CONSTANTS from '../../Utils/Constants';
+import AsyncStorageUtil from '../../utils/AsyncStorageUtils';
+import CONSTANTS from '../../utils/Constants';
 
 interface ScreenItem {
   size: number;
diff --git a/SampleApp/src/screens/NotificationInbox/NotificationInbox.tsx b/SampleApp/src/screens/NotificationInbox/NotificationInbox.tsx
@@ -24,7 +24,7 @@ import {
   trackClick,
   trackView,
 } from 'react-native-webengage-inbox';
-import CONSTANTS from '../../Utils/Constants';
+import CONSTANTS from '../../utils/Constants';
 
 interface Notification {
   status: string;
diff --git a/SampleApp/src/screens/ProfileScreen.tsx b/SampleApp/src/screens/ProfileScreen.tsx
@@ -12,7 +12,7 @@ import WETextInput from '../CommonComponents/WETextInput';
 import webEngageManager from '../WebEngageHandler/WebEngageManager';
 import WEButton from '../CommonComponents/WEButton';
 import WEUserModal from '../CommonComponents/WEUserModal';
-import CONSTANTS from '../Utils/Constants';
+import CONSTANTS from '../utils/Constants';
 
 const ProfileScreen: React.FC = () => {
   const [firstName, setFirstName] = useState<string>('');
diff --git a/SampleApp/src/screens/ScreenComponent.tsx b/SampleApp/src/screens/ScreenComponent.tsx
@@ -6,7 +6,7 @@ import WETextInput from '../CommonComponents/WETextInput';
 import WEUserModal from '../CommonComponents/WEUserModal';
 import WEButton from '../CommonComponents/WEButton';
 import webEngageManager from '../WebEngageHandler/WebEngageManager';
-import CONSTANTS from '../Utils/Constants';
+import CONSTANTS from '../utils/Constants';
 
 const ScreenComponent = () => {
   const [screenName, setScreenName] = useState<string>('');
diff --git a/lib/android/src/main/java/com/webengage/WebengageBridge.java b/lib/android/src/main/java/com/webengage/WebengageBridge.java
@@ -4,8 +4,11 @@
  * Created by uzma on 10/25/17.
  */
 
-import android.net.Uri;
-import android.content.Context;
+ import android.app.ActivityManager;
+ import android.content.Intent;
+ import android.net.Uri;
+ import android.content.Context;
+ import android.os.Bundle;
 import android.util.Log;
 
 import com.webengage.sdk.android.Logger;
@@ -263,6 +266,23 @@ public void setDevicePushOptIn(Boolean state) {
         WebEngage.get().user().setDevicePushOptIn(state);
     }
 
+    @ReactMethod
+    public void sendFcmToken(String fcmToken) {
+        WebEngage.get().setRegistrationID(fcmToken);
+    }
+
+    @ReactMethod
+    public void onMessageReceived(ReadableMap readableMap) {
+        Map<String, Object> hashMap = recursivelyDeconstructReadableMap(readableMap);
+        Logger.d(TAG, "onMessageReceived " + hashMap);
+        Map<String, String> data = (Map<String, String>) hashMap.get("data");
+         if(data != null) {
+             if(data.containsKey("source") && "webengage".equals(data.get("source"))) {
+                WebEngage.get().receive(data);
+             }
+         }
+    }
+
     @ReactMethod
     public void setOptIn(String channel, boolean status) {
         if ("push".equalsIgnoreCase(channel)) {
@@ -518,7 +538,6 @@ public PushNotificationData onPushNotificationReceived(Context context, PushNoti
         WritableMap map = Arguments.fromBundle(pushNotificationData.getCustomData());
         map.putMap("userData", convertJsonObjectToWriteable(pushNotificationData.getPushPayloadJSON()));
         map.putString("deeplink", pushNotificationData.getPrimeCallToAction().getAction());
-        sendEvent(reactApplicationContext, "pushNotificationReceived", map);
         return pushNotificationData;
     }
 
@@ -621,5 +640,4 @@ public void onSecurityException(Map<String, Object> map) {
         Logger.d("WebEngage", "onSecurity Exception!!!");
         sendEvent(reactApplicationContext, "tokenInvalidated", convertMapToWritableMap(map));
     }
-
 }
diff --git a/lib/android/version.properties b/lib/android/version.properties
@@ -1,3 +1,3 @@
 major=1
 minor=5
-patch=0
+patch=1
diff --git a/lib/index.js b/lib/index.js
@@ -7,7 +7,8 @@ import {
 	Text,
 	View,
 	NativeModules,
-	NativeEventEmitter
+	NativeEventEmitter,
+	AppRegistry
 } from 'react-native';
 
 const WebEngage = NativeModules.webengageBridge;
@@ -165,20 +166,27 @@ function WebEngagePushChannel () {
 WebEngagePushChannel.prototype.options = function (key, value) {
 	this._options[key] = value;
 };
+// Supported only for Android
+WebEngagePushChannel.prototype.sendFcmToken = function (token) {
+  WebEngage.sendFcmToken(token);
+};
+
+// Supported only for Android
+WebEngagePushChannel.prototype.onMessageReceived = function (remoteMessage) {
+  WebEngage.onMessageReceived(remoteMessage);
+};
 
 WebEngagePushChannel.prototype.onClick = function (callback) {
 	WebEngage.updateListenerCount()
 	this.clickCallback = callback;
 	return this.pushClickListener;
-	
 };
 
 WebEngagePushChannel.prototype.onCallbackReceived = function(type, uri, customData) {
 	if (type) {
 		switch(type) {
 			case 'shown':
 				break;
-
 			case 'click':
 				this.clickCallback(uri, customData);
 				break;
diff --git a/lib/ios/WEGWebEngageBridge.h b/lib/ios/WEGWebEngageBridge.h
@@ -16,5 +16,7 @@
 
 @property WEGWebEngageBridge* wegBridge;
 @property NSMutableDictionary *pendingEventsDict;
+@property dispatch_queue_t serialQueue;
+
 - (void) sendUniversalLinkLocation:(NSString *)location;
 @end
diff --git a/lib/ios/WEGWebEngageBridge.m b/lib/ios/WEGWebEngageBridge.m
@@ -14,13 +14,14 @@
 NSString * const DATE_FORMAT = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 int const DATE_FORMAT_LENGTH = 24;
 bool weHasListeners = NO;
-NSString *WEGPluginVersion = @"1.5.0";
+NSString *WEGPluginVersion = @"1.5.1";
 
 @implementation WEGWebEngageBridge
 
 RCT_EXPORT_MODULE(webengageBridge);
 
 - (instancetype)init {
+    self.serialQueue = dispatch_queue_create("com.reactNativeWebEngage.serialqueue", DISPATCH_QUEUE_SERIAL);
     [self initialiseWEGVersion];
     return self;
 }
@@ -117,7 +118,7 @@ - (NSArray *)setDatesInArray:(NSMutableArray *)mutableArr {
             }
         };
         if(weHasListeners) {
-            [self sendEventWithName:@"tokenInvalidated" body:data];  
+            [self sendEventWithName:@"tokenInvalidated" body:data];
         } else {
             if (self.pendingEventsDict == nil) {
             self.pendingEventsDict = [NSMutableDictionary dictionary];
@@ -238,7 +239,16 @@ - (NSArray *)setDatesInArray:(NSMutableArray *)mutableArr {
     [[WebEngage sharedInstance].user setCompany:company];
 }
 
+RCT_EXPORT_METHOD(sendFcmToken:(NSString*)fcmToken){
+    // This is only available for Android
+}
+
+RCT_EXPORT_METHOD(onMessageReceived:(NSDictionary *)readableMap){
+    // This is only available for Android
+}
+
 RCT_EXPORT_METHOD(updateListenerCount){
+    // This is only available for Android
 }
 
 RCT_EXPORT_METHOD(setOptIn:(NSString*)channel status:(BOOL)status) {
@@ -371,7 +381,7 @@ - (void)sendUniversalLinkLocation:(NSString *)location{
 - (void) startObserving {
     weHasListeners = YES;
     if (self.pendingEventsDict != nil) {
-        for (id key in self.pendingEventsDict) {
+        for (id key in [self getObserversNonMutable]) {
             [self sendEventWithName:key body:self.pendingEventsDict[key]];
             [self.pendingEventsDict removeObjectForKey: key];
         }
@@ -381,4 +391,14 @@ - (void) startObserving {
 - (void)stopObserving {
     weHasListeners = NO;
 }
+
+#pragma mark: - Helper for serialization access for observers
+
+- (NSDictionary *)getObserversNonMutable {
+    __block NSDictionary *object;
+    dispatch_sync(self.serialQueue, ^{
+        object = [self.pendingEventsDict copy];
+    });
+    return object;
+}
 @end
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-webengage",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "WebEngage React Native library.",
   "license": "MIT",
   "author": "WebEngage",
diff --git a/lib/types/index.d.ts b/lib/types/index.d.ts
