From 93e98a88a9604063fb55e8a650de8252058d5445 Mon Sep 17 00:00:00 2001
From: DevHossamHassan <hossamhassancs15@gmail.com>
Date: Thu, 22 Jun 2017 14:01:18 +0200
Subject: [PATCH] Enable `setNewMessageHandler` API for android

---
 .../RNInstabugReactnativeModule.java          | 23 ++++++++++++++++++-
 index.js                                      |  5 ++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java
index f747e45..cac5fe4 100644
--- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java
+++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java
@@ -1056,9 +1056,30 @@ public class RNInstabugReactnativeModule extends ReactContextBaseJavaModule {
         } catch (Exception e) {
             e.printStackTrace();
         }
-    },
+    }
 
 
+    /**
+     * Sets a block of code that gets executed when a new message is received.
+     *
+     * @param {onNewMessgaeHandler} onNewMessageHandler - A callback that gets
+     *                              executed when a new message is received.
+     */
+    @ReactMethod
+    public void setOnNewMessageHandler(final Callback onNewMessageHandler) {
+        try {
+            Runnable onNewMessageRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    onNewMessageHandler.invoke();
+                }
+            };
+            mInstabug.setNewMessageHandler(onNewMessageRunnable);
+        } catch (java.lang.Exception exception) {
+            exception.printStackTrace();
+        }
+    }
+
     private InstabugCustomTextPlaceHolder.Key getStringToKeyConstant(String key) {
         String keyInLowerCase = key.toLowerCase();
         switch (keyInLowerCase) {
diff --git a/index.js b/index.js
index 27348dc..613c2c9 100644
--- a/index.js
+++ b/index.js
@@ -400,9 +400,10 @@ module.exports = {
                 'IBGonNewMessageHandler',
                 onNewMessgaeHandler
             );
-
-            Instabug.setOnNewMessageHandler(onNewMessgaeHandler);
         }
+
+        Instabug.setOnNewMessageHandler(onNewMessgaeHandler);
+
     },
 
     /**