Merge pull request #569 from Instabug/hotfix/android-push-notifications

Ali Abdelfattah · web-flow · commit 702e03020387 · 2021-04-22T12:33:01.000+02:00
[MOB-5157] Add new API: Replies.showNotificationAndroid
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 ## v10.3.0 (2021-04-22)
 
-* Updates Instabug Android and iOS SDKs.
-* Migrates iOS to XCFramework.
+* Migrates iOS to XCFramework
+* Adds new API: Replies.showNotificationAndroid
 * Deprecates Instabug.setVideoRecordingFloatingButtonPosition in favor of BugReporting.setVideoRecordingFloatingButtonPosition.
+* Updates Instabug Android and iOS SDKs
 
 ## v10.0.0 (2021-02-16)
 
diff --git a/__tests__/replies.spec.js b/__tests__/replies.spec.js
@@ -22,6 +22,7 @@ describe('Replies Module', () => {
   const setEnableInAppNotificationSound = sinon.spy(NativeModules.IBGReplies, 'setInAppNotificationSound');
   const setPushNotificationsEnabled = sinon.spy(NativeModules.IBGReplies, 'setPushNotificationsEnabled');
   const setPushNotificationRegistrationToken = sinon.spy(NativeModules.IBGReplies, 'setPushNotificationRegistrationToken');
+  const showNotification = sinon.spy(NativeModules.IBGReplies, 'showNotification');
   const setNotificationIcon = sinon.spy(NativeModules.IBGReplies, 'setNotificationIcon');
   const setPushNotificationChannelId = sinon.spy(NativeModules.IBGReplies, 'setPushNotificationChannelId');
   const setSystemReplyNotificationSoundEnabled = sinon.spy(NativeModules.IBGReplies, 'setSystemReplyNotificationSoundEnabled');
@@ -32,6 +33,7 @@ describe('Replies Module', () => {
     IBGEventEmitter.removeAllListeners();
     setPushNotificationsEnabled.resetHistory();
     setPushNotificationRegistrationToken.resetHistory();
+    showNotification.resetHistory();
     setNotificationIcon.resetHistory();
     setPushNotificationChannelId.resetHistory();
     setSystemReplyNotificationSoundEnabled.resetHistory();
@@ -140,6 +142,15 @@ describe('Replies Module', () => {
     expect(setPushNotificationRegistrationToken.calledOnceWithExactly('123')).toBe(true);
   });
 
+
+  it('should call the native method showNotification on Android', () => {
+    Platform.OS = 'android';
+    Replies.showNotificationAndroid('test');
+
+    expect(showNotification.calledOnceWithExactly('test')).toBe(true);
+  });
+
+
   it('should not call the native method setPushNotificationRegistrationToken on iOS', () => {
     Platform.OS = 'ios';
     Replies.setPushNotificationRegistrationTokenAndroid(true);
diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugRepliesModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugRepliesModule.java
@@ -7,12 +7,17 @@
 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.bridge.ReadableType;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.instabug.chat.Replies;
 import com.instabug.library.Feature;
 import com.instabug.reactlibrary.utils.InstabugUtil;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 public class RNInstabugRepliesModule extends ReactContextBaseJavaModule {
 
@@ -169,6 +174,41 @@ public void run() {
         });
     }
 
+    /**
+     * Show in-app Messaging's notifications
+     *
+     * @param data the data bundle related to Instabug
+     */
+    @ReactMethod
+    public void showNotification(final ReadableMap data) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Map<String, String> map = new HashMap<>();
+                    ReadableMapKeySetIterator iterator = data.keySetIterator();
+
+                    while (iterator.hasNextKey()) {
+                        String key = iterator.nextKey();
+                        ReadableType type = data.getType(key);
+
+                        switch(type) {
+                            case String:
+                                String value = data.getString(key);
+                                map.put(key, value);
+                                break;
+                        }
+                    }
+                    if (Replies.isInstabugNotification(map)) {
+                        Replies.showNotification(map);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     /**
      * Set the push notification's icon that will be shown with Instabug notifications
      *
diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugRepliesModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugRepliesModuleTest.java
@@ -6,11 +6,14 @@
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.instabug.bug.BugReporting;
 import com.instabug.chat.Replies;
 import com.instabug.library.Feature;
 import com.instabug.reactlibrary.utils.InstabugUtil;
+import com.instabug.reactlibrary.utils.MapUtil;
 import com.instabug.survey.Surveys;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
@@ -27,6 +30,8 @@
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.Map;
+import java.util.HashMap;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
@@ -170,6 +175,40 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
         Replies.setPushNotificationRegistrationToken("123");
     }
 
+    @Test
+    public void givenBoolean$showNotification_whenQuery_thenShouldCallNativeApi() {
+        // given
+        PowerMockito.mockStatic(Replies.class);
+        PowerMockito.mockStatic(SystemClock.class);
+        PowerMockito.mockStatic(Arguments.class);
+
+        // when
+        PowerMockito.when(Arguments.createMap())
+                .thenAnswer(
+                        new Answer<Object>() {
+                            @Override
+                            public Object answer(InvocationOnMock invocation) throws Throwable {
+                                return new JavaOnlyMap();
+                            }
+                        });
+
+        Map<String, String> map = new HashMap<>();
+        PowerMockito.when(Replies.isInstabugNotification(map))
+                .thenAnswer(
+                        new Answer<Object>() {
+                            @Override
+                            public Object answer(InvocationOnMock invocation) throws Throwable {
+                                return true;
+                            }
+                        });
+
+        WritableMap readableMap = MapUtil.toWritableMap(new HashMap<String, Object>());
+        rnModule.showNotification(readableMap);
+
+        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        Replies.showNotification(map);
+    }
+
     @Test
     public void givenBoolean$setNotificationIcon_whenQuery_thenShouldCallNativeApi() {
         // given
diff --git a/index.d.ts b/index.d.ts
@@ -119,7 +119,8 @@ export namespace Replies {
   ): void;
   function setInAppNotificationSound(shouldPlaySound: boolean): void;
   function setPushNotificationRegistrationTokenAndroid(token: string): void;
-  function setNotificationIconAndroid(notificationIcon: int): void;
+  function showNotificationAndroid(data: object): void;
+  function setNotificationIconAndroid(notificationIcon: number): void;
   function setPushNotificationChannelIdAndroid(pushNotificationChannelId: string): void;
   function setSystemReplyNotificationSoundEnabledAndroid(shouldPlaySound: boolean): void;
 }
diff --git a/jest/mockReplies.js b/jest/mockReplies.js
@@ -11,6 +11,7 @@ jest.mock('NativeModules', () => {
             addListener: jest.fn(),
             setPushNotificationsEnabled: jest.fn(),
             setPushNotificationRegistrationToken: jest.fn(),
+            showNotification: jest.fn(),
             setNotificationIcon: jest.fn(),
             setPushNotificationChannelId: jest.fn(),
             setSystemReplyNotificationSoundEnabled: jest.fn(),
diff --git a/modules/Replies.js b/modules/Replies.js
@@ -110,6 +110,17 @@ export default {
     }
   },
 
+  /**
+   * Show in-app Messaging's notifications
+   *
+   * @param data the data bundle related to Instabug
+   */
+   showNotificationAndroid(data) {
+    if (Platform.OS === 'android') {
+      IBGReplies.showNotification(data);
+    }
+  },
+
   /**
    * Set the push notification's icon that will be shown with Instabug notifications
    *
