Fix - onReportSubmitHandler freeze on iOS (#489)

* Fix iOS freeze

* undo indentation

* refactor

* adjust tests

* update changelog

Co-authored-by: Ali Abdelfattah <[email protected]>

Author: alyezz

CHANGELOG.md

@@ -1,3 +1,7 @@
+## master
+
+* Fixes an issue with `onReportSubmitHandler` on iOS
+
 ## v9.1.7 (2020-08-10)
 
 * Fixes missing typescript definitions

__tests__/index.spec.js

@@ -63,7 +63,6 @@ describe('Instabug Module', () => {
   const hideView = sinon.spy(NativeModules.Instabug, 'hideView');
   const show = sinon.spy(NativeModules.Instabug, 'show');
   const setPreSendingHandler = sinon.spy(NativeModules.Instabug, 'setPreSendingHandler');
-  const submitReport = sinon.spy(NativeModules.Instabug, 'submitReport');
   const callPrivateApi = sinon.spy(NativeModules.Instabug, 'callPrivateApi');
   const sendHandledJSCrash = sinon.spy(NativeModules.Instabug, 'sendHandledJSCrash');
   const sendJSCrash = sinon.spy(NativeModules.Instabug, 'sendJSCrash');
@@ -81,10 +80,9 @@ describe('Instabug Module', () => {
     isRunningLive.resetHistory();
     setFileAttachment.resetHistory();
     hideView.resetHistory();
-    submitReport.resetHistory();
     setPreSendingHandler.resetHistory();
     IBGEventEmitter.removeAllListeners();
-    
+
   });
 
   it('componentDidAppearListener should call the native method reportScreenChange', () => {
@@ -583,9 +581,9 @@ describe('Instabug Module', () => {
     Instabug.onReportSubmitHandler(jest.fn());
     InstabugUtils.isOnReportHandlerSet.mockImplementation(() => true);
     const isReportHandlerSet = InstabugUtils.isOnReportHandlerSet();
-    
+
     expect(isReportHandlerSet).toBe(true);
-    
+
   });
 
   it('should call the native method setPreSendingHandler with a function', () => {
@@ -619,7 +617,6 @@ describe('Instabug Module', () => {
     IBGEventEmitter.emit(IBGConstants.PRESENDING_HANDLER, report);
 
     expect(IBGEventEmitter.getListeners(IBGConstants.PRESENDING_HANDLER).length).toEqual(1);
-    expect(submitReport.calledOnce).toBe(true);
 
   });
 
@@ -634,7 +631,7 @@ describe('Instabug Module', () => {
       fileAttachments: ['path']
     };
     NativeModules.Instabug.getReport.mockResolvedValue(report);
-    const jsonObject = {stack: 'error'};
+    const jsonObject = { stack: 'error' };
     const callback = (rep) => {
       expect(rep).toBeInstanceOf(Report);
       expect(rep.tags).toBe(report.tags);
@@ -658,7 +655,7 @@ describe('Instabug Module', () => {
     Instabug.onReportSubmitHandler(jest.fn());
     IBGEventEmitter.emit(IBGConstants.SEND_HANDLED_CRASH, {});
     expect(IBGEventEmitter.getListeners(IBGConstants.SEND_HANDLED_CRASH).length).toEqual(0);
-  
+
   });
 
   it('should invoke callback on emitting the event IBGSendUnhandledJSCrash', async (done) => {
@@ -672,7 +669,7 @@ describe('Instabug Module', () => {
       fileAttachments: ['path']
     };
     NativeModules.Instabug.getReport.mockResolvedValue(report);
-    const jsonObject = {stack: 'error'};
+    const jsonObject = { stack: 'error' };
     const callback = (rep) => {
       expect(rep).toBeInstanceOf(Report);
       expect(rep.tags).toBe(report.tags);
@@ -696,7 +693,7 @@ describe('Instabug Module', () => {
     Instabug.onReportSubmitHandler(jest.fn());
     IBGEventEmitter.emit(IBGConstants.SEND_UNHANDLED_CRASH, {});
     expect(IBGEventEmitter.getListeners(IBGConstants.SEND_UNHANDLED_CRASH).length).toEqual(0);
-  
+
   });
 
   it('should invoke the native method callPrivateApi', () => {

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -1368,7 +1368,7 @@ public void setPreSendingHandler(final Callback preSendingHandler) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                Report.OnReportCreatedListener listener = new Report.OnReportCreatedListener() {
+                Instabug.onReportSubmitHandler(new Report.OnReportCreatedListener() {
                     @Override
                     public void onReportCreated(Report report) {
                         WritableMap reportParam = Arguments.createMap();
@@ -1380,18 +1380,7 @@ public void onReportCreated(Report report) {
                         sendEvent(getReactApplicationContext(), "IBGpreSendingHandler", reportParam);
                         currentReport = report;
                     }
-                };
-
-                Method method = getMethod(Instabug.class, "onReportSubmitHandler_Private", Report.OnReportCreatedListener.class);
-                if (method != null) {
-                    try {
-                        method.invoke(null, listener);
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    } catch (InvocationTargetException e) {
-                        e.printStackTrace();
-                    }
-                }
+                });
             }
         });
 
@@ -1468,21 +1457,7 @@ public void addFileAttachmentWithDataToReport(String data, String fileName) {
         }
     }
 
-    @ReactMethod
-    public void submitReport() {
-        Method method = getMethod(Instabug.class, "setReport", Report.class);
-        if (method != null) {
-            try {
-                method.invoke(null, currentReport);
-                currentReport = null;
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
+    
     @ReactMethod
     public void getReport(Promise promise) {
         try {

index.js

@@ -751,7 +751,6 @@ const InstabugModule = {
       const { tags, consoleLogs, instabugLogs, userAttributes, fileAttachments } = report;
       const reportObj = new Report(tags, consoleLogs, instabugLogs, userAttributes, fileAttachments);
       preSendingHandler(reportObj);
-      Instabug.submitReport();
 
     });
 

ios/RNInstabug/InstabugReactBridge.m

@@ -117,21 +117,21 @@ - (dispatch_queue_t)methodQueue {
     }
 }
 
-void (^globalReportCompletionHandler)(IBGReport *);
 IBGReport *currentReport = nil;
 RCT_EXPORT_METHOD(setPreSendingHandler:(RCTResponseSenderBlock)callBack) {
     if (callBack != nil) {
-        [Instabug setWillSendReportHandler_private:^(IBGReport *report, void (^reportCompletionHandler)(IBGReport *)) {
+        Instabug.willSendReportHandler = ^IBGReport * _Nonnull(IBGReport * _Nonnull report) {
             NSArray *tagsArray = report.tags;
             NSArray *instabugLogs= report.instabugLogs;
             NSArray *consoleLogs= report.consoleLogs;
             NSDictionary *userAttributes= report.userAttributes;
             NSArray *fileAttachments= report.fileLocations;
             NSDictionary *dict = @{ @"tagsArray" : tagsArray, @"instabugLogs" : instabugLogs, @"consoleLogs" : consoleLogs,       @"userAttributes" : userAttributes, @"fileAttachments" : fileAttachments};
             [self sendEventWithName:@"IBGpreSendingHandler" body:dict];
+
             currentReport = report;
-            globalReportCompletionHandler = reportCompletionHandler;
-        }];
+            return report;
+        };
     } else {
         Instabug.willSendReportHandler = nil;
     }
@@ -199,11 +199,6 @@ - (dispatch_queue_t)methodQueue {
     }
 }
 
-RCT_EXPORT_METHOD(submitReport) {
-    globalReportCompletionHandler(currentReport);
-    currentReport = nil;
-}
-
 RCT_EXPORT_METHOD(setSdkDebugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel) {
     [Instabug setSdkDebugLogsLevel:sdkDebugLogsLevel];
 }

jest/mockInstabug.js

@@ -45,7 +45,6 @@ jest.mock('NativeModules', () => {
             setPreSendingHandler: jest.fn(),
             callPrivateApi: jest.fn(),
             addListener: jest.fn(),
-            submitReport: jest.fn(),
             getReport: jest.fn(),
             sendHandledJSCrash: jest.fn(),
             sendJSCrash: jest.fn(),