react-native-gleapsdk 6.4.8 → 7.0.0

package/android/build.gradle

@@ -54,7 +54,6 @@ repositories {
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    // https://mvnrepository.com/artifact/io.gleap/gleap-android-sdk
-    implementation group: 'io.gleap', name: 'gleap-android-sdk', version: '6.4.12'
+    implementation "com.facebook.react:react-native:+"
+    implementation group: 'io.gleap', name: 'gleap-android-sdk', version: '7.0.10'
 }

package/android/src/main/java/com/reactnativegleapsdk/GleapsdkModule.java

@@ -8,10 +8,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
@@ -33,16 +31,20 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import io.gleap.APPLICATIONTYPE;
-import io.gleap.ConfigLoadedCallback;
-import io.gleap.CustomActionCallback;
-import io.gleap.FeedbackSentCallback;
-import io.gleap.FeedbackSentWithDataCallback;
-import io.gleap.FeedbackWillBeSentCallback;
-import io.gleap.GetActivityCallback;
 import io.gleap.Gleap;
 import io.gleap.GleapActivationMethod;
 import io.gleap.GleapUserProperties;
+import io.gleap.PrefillHelper;
 import io.gleap.RequestType;
+import io.gleap.UserSessionController;
+import io.gleap.callbacks.ConfigLoadedCallback;
+import io.gleap.callbacks.CustomActionCallback;
+import io.gleap.callbacks.FeedbackFlowStartedCallback;
+import io.gleap.callbacks.FeedbackSendingFailedCallback;
+import io.gleap.callbacks.FeedbackSentCallback;
+import io.gleap.callbacks.GetActivityCallback;
+import io.gleap.callbacks.WidgetClosedCallback;
+import io.gleap.callbacks.WidgetOpenedCallback;
 
 @ReactModule(name = GleapsdkModule.NAME)
 public class GleapsdkModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
@@ -85,17 +87,24 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
                 .getCurrentActivity();
               if (activity != null && !invalidated) {
                 Gleap.getInstance().setApplicationType(APPLICATIONTYPE.REACTNATIVE);
-                Gleap.getInstance().setFeedbackWillBeSentCallback(new FeedbackWillBeSentCallback() {
+                Gleap.initialize(sdkKey, activity.getApplication());
+
+                Gleap.getInstance().setWidgetOpenedCallback(new WidgetOpenedCallback() {
                   @Override
-                  public void flowInvoced() {
-                    if (!invalidated) {
-                      getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit("feedbackWillBeSent", null);
-                    }
+                  public void invoke() {
+                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                      .emit("widgetOpened", null);
+                  }
+                });
+
+                Gleap.getInstance().setWidgetClosedCallback(new WidgetClosedCallback() {
+                  @Override
+                  public void invoke() {
+                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                      .emit("widgetClosed", null);
                   }
                 });
 
-                Gleap.initialize(sdkKey, activity.getApplication());
                 Gleap.getInstance().setConfigLoadedCallback(new ConfigLoadedCallback() {
                   @Override
                   public void configLoaded(JSONObject jsonObject) {
@@ -106,6 +115,22 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
                   }
                 });
 
+                Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
+                  @Override
+                  public void invoke(String message) {
+                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                      .emit("feedbackSent", message);
+                  }
+                });
+                
+                Gleap.getInstance().setFeedbackSendingFailedCallback(new FeedbackSendingFailedCallback() {
+                  @Override
+                  public void invoke(String message) {
+                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                      .emit("feedbackSendingFailed", message);
+                  }
+                });
+
                 Gleap.getInstance().registerCustomAction(new CustomActionCallback() {
                   @Override
                   public void invoke(String message) {
@@ -122,33 +147,11 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
                   }
                 });
 
-                Gleap.getInstance().setFeedbackSentWithDataCallback(new FeedbackSentWithDataCallback() {
+                Gleap.getInstance().setFeedbackFlowStartedCallback(new FeedbackFlowStartedCallback() {
                   @Override
-                  public void close(JSONObject jsonObject) {
+                  public void invoke(String message) {
                     getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                      .emit("feedbackSent", jsonObject.toString());
-                    new java.util.Timer().schedule(
-                      new java.util.TimerTask() {
-                        @Override
-                        public void run() {
-                          showDevMenu();
-                        }
-                      },
-                      500);
-                  }
-                });
-
-                Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
-                  @Override
-                  public void close() {
-                    new java.util.Timer().schedule(
-                      new java.util.TimerTask() {
-                        @Override
-                        public void run() {
-                          showDevMenu();
-                        }
-                      },
-                      500);
+                      .emit("feedbackFlowStarted", message);
                   }
                 });
               }
@@ -183,10 +186,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
           @Override
           public void run() {
             try {
-              Gleap.getInstance().startFeedbackFlow();
+              Gleap.getInstance().open();
               Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
                 @Override
-                public void close() {
+                public void invoke(String message) {
                   new java.util.Timer().schedule(
                     new java.util.TimerTask() {
                       @Override
@@ -211,21 +214,53 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     }
   }
 
+  @ReactMethod
+  public void close() {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            try {
+              Gleap.getInstance().close();
+            }catch (Exception ex) {}
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+  @ReactMethod
+  public void isOpened() {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            Gleap.getInstance().isOpened();
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
   /**
    * Start bug report manually by calling this function.
    */
   @ReactMethod
-  public void startFeedbackFlow(String feedbackFlow){
+  public void startFeedbackFlow(String feedbackFlow, boolean showBackButton) {
     try {
       getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
             try {
-              Gleap.getInstance().startFeedbackFlow(feedbackFlow);
+              Gleap.getInstance().startFeedbackFlow(feedbackFlow, showBackButton);
               Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
                 @Override
-                public void close() {
+                public void invoke(String message) {
                   new java.util.Timer().schedule(
                     new java.util.TimerTask() {
                       @Override
@@ -254,7 +289,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    * Manually start a silent bug reporting workflow.
    */
   @ReactMethod
-  public void sendSilentBugReport(
+  public void sendSilentCrashReport(
     String description,
     String priority) {
     try {
@@ -270,7 +305,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             if (priority == "HIGH") {
               severity = Gleap.SEVERITY.HIGH;
             }
-            Gleap.getInstance().sendSilentBugReport(description, severity);
+            Gleap.getInstance().sendSilentCrashReport(description, severity);
           }
         });
     } catch (NoUiThreadException e) {
@@ -282,15 +317,21 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    * Manually start a silent bug reporting workflow.
    */
   @ReactMethod
-  public void sendSilentBugReportWithType(
+  public void sendSilentCrashReportWithExcludeData(
     String description,
     String priority,
-    String type) {
+    ReadableMap data) {
     try {
       getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
+            JSONObject jsonObject = new JSONObject();
+            try {
+              jsonObject = GleapUtil.convertMapToJson(data);
+            } catch (Exception ex) {
+            }
+
             isSilentBugReport = true;
             Gleap.SEVERITY severity = Gleap.SEVERITY.LOW;
             if (priority == "MEDIUM") {
@@ -299,7 +340,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             if (priority == "HIGH") {
               severity = Gleap.SEVERITY.HIGH;
             }
-            Gleap.getInstance().sendSilentBugReport(description, severity, type);
+            Gleap.getInstance().sendSilentCrashReport(description, severity, jsonObject);
           }
         });
     } catch (NoUiThreadException e) {
@@ -307,6 +348,28 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     }
   }
 
+  @ReactMethod
+  public void preFillForm(
+    ReadableMap data) {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            JSONObject jsonObject = new JSONObject();
+            try {
+              jsonObject = GleapUtil.convertMapToJson(data);
+            } catch (Exception ex) {
+            }
+            PrefillHelper.getInstancen().setPrefillData(jsonObject);
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+
   @ReactMethod
   public void setLanguage(String language) {
     Gleap.getInstance().setLanguage(language);
@@ -314,6 +377,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
 
   @ReactMethod
   public void enableDebugConsoleLog() {
+
   }
 
   @ReactMethod
@@ -338,7 +402,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
               e.printStackTrace();
             }
             GleapUserProperties gleapUserSession = new GleapUserProperties(name, email);
-            if(Gleap.getInstance() == null) {
+            if (Gleap.getInstance() == null) {
               return;
             }
             Gleap.getInstance().identifyUser(userid, gleapUserSession);
@@ -349,9 +413,56 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     }
   }
 
+  @ReactMethod
+  public void identifyWithUserHash(String userid, ReadableMap data, String hash) {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            JSONObject jsonObject = null;
+            String name = "";
+            String email = "";
+            try {
+              jsonObject = GleapUtil.convertMapToJson(data);
+              if (jsonObject.has("name")) {
+                name = jsonObject.getString("name");
+              }
+              if (jsonObject.has("email")) {
+                email = jsonObject.getString("email");
+              }
+            } catch (JSONException e) {
+              e.printStackTrace();
+            }
+            GleapUserProperties gleapUserSession = new GleapUserProperties(name, email);
+            gleapUserSession.setHash(hash);
+            if (Gleap.getInstance() == null) {
+              return;
+            }
+
+            if (UserSessionController.getInstance() != null) {
+              Gleap.getInstance().identifyUser(userid, gleapUserSession);
+            }
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
   @ReactMethod
   public void clearIdentity() {
-    Gleap.getInstance().clearIdentity();
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            Gleap.getInstance().clearIdentity();
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   /**
@@ -365,10 +476,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   public void attachCustomData(ReadableMap customData) {
     try {
       JSONObject jsonObject = GleapUtil.convertMapToJson(customData);
-      if(Gleap.getInstance() == null) {
+      if (Gleap.getInstance() == null) {
         return;
       }
-      Gleap.getInstance().appendCustomData(jsonObject);
+      Gleap.getInstance().attachCustomData(jsonObject);
     } catch (Exception e) {
       System.out.println(e);
     }
@@ -390,31 +501,15 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   }
 
   /**
-   * Used for dedicated server. Set the url, where the widget is loaded from.
+   * Frame url
+   * 330,.
    *
-   * @param widgetUrl Url to the dedicated server.
+   * @param frameUrl Url to the dedicated server.
    */
   @ReactMethod
-  public void setWidgetUrl(String widgetUrl) {
+  public void setFrameUrl(String frameUrl) {
     try {
-      Gleap.getInstance().setApiUrl(widgetUrl);
-    } catch (Exception e) {
-      System.out.println(e);
-    }
-  }
-
-  /**
-   * Attaches custom data, which can be viewed in the Gleap dashboard. New data
-   * will be merged with existing custom data.
-   *
-   * @param customData The data to attach to a bug report.
-   * @author Gleap
-   */
-  @ReactMethod
-  public void appendCustomData(ReadableMap customData) {
-    try {
-      JSONObject jsonObject = GleapUtil.convertMapToJson(customData);
-      Gleap.getInstance().appendCustomData(jsonObject);
+      Gleap.getInstance().setFrameUrl(frameUrl);
     } catch (Exception e) {
       System.out.println(e);
     }
@@ -460,8 +555,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
         internalActivationMethods.add(GleapActivationMethod.SCREENSHOT);
       }
     }
-    Gleap.getInstance().setActivationMethods(
-      internalActivationMethods.toArray(new GleapActivationMethod[internalActivationMethods.size()]));
+    if(Gleap.getInstance() != null) {
+      Gleap.getInstance().setActivationMethods(
+        internalActivationMethods.toArray(new GleapActivationMethod[internalActivationMethods.size()]));
+    }
   }
 
   /**
@@ -682,7 +779,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
 
   private Activity getActivitySafe() throws NoUiThreadException {
     Activity activity = getCurrentActivity();
-    if(activity == null) {
+    if (activity == null) {
       throw new NoUiThreadException();
     }
     return activity;

package/ios/Gleapsdk.m

@@ -59,12 +59,12 @@ RCT_EXPORT_METHOD(initialize:(NSString *)token)
                                                           object:nil
                                                            queue:mainQueue
                                                       usingBlock:^(NSNotification *note) {
-        if ([[Gleap sharedInstance] isActivationMethodActive: SCREENSHOT]) {
-            [Gleap startFeedbackFlow];
+        if ([Gleap isActivationMethodActive: SCREENSHOT]) {
+            [Gleap open];
         }
     }];
 
-    if ([Gleap sharedInstance].activationMethods.count == 0) {
+    if ([Gleap getActivationMethods].count == 0) {
         NSMutableArray *activationMethods = [[NSMutableArray alloc] init];
         if ([config objectForKey: @"activationMethodShake"] != nil && [[config objectForKey: @"activationMethodShake"] boolValue] == YES) {
             [activationMethods addObject: @(SHAKE)];
@@ -73,7 +73,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)token)
             [activationMethods addObject: @(SCREENSHOT)];
         }
         
-        [[Gleap sharedInstance] setActivationMethods: activationMethods];
+        [Gleap setActivationMethods: activationMethods];
     }
     
     if (_hasListeners) {
@@ -83,20 +83,26 @@ RCT_EXPORT_METHOD(initialize:(NSString *)token)
 
 - (void)motionEnded:(NSNotification *)notification
 {
-    if ([[Gleap sharedInstance] isActivationMethodActive: SHAKE]) {
-        [Gleap startFeedbackFlow];
+    if ([Gleap isActivationMethodActive: SHAKE]) {
+        [Gleap open];
     }
 }
 
-- (void)feedbackWillBeSent {
+- (void)feedbackSendingFailed {
     if (_hasListeners) {
-        [self sendEventWithName:@"feedbackWillBeSent" body:@{}];
+        [self sendEventWithName:@"feedbackSendingFailed" body:@{}];
     }
 }
 
-- (void)feedbackSendingFailed {
+- (void)widgetOpened {
     if (_hasListeners) {
-        [self sendEventWithName:@"feedbackSendingFailed" body:@{}];
+        [self sendEventWithName:@"widgetOpened" body:@{}];
+    }
+}
+
+- (void)widgetClosed {
+    if (_hasListeners) {
+        [self sendEventWithName:@"widgetClosed" body:@{}];
     }
 }
 
@@ -114,6 +120,12 @@ RCT_EXPORT_METHOD(initialize:(NSString *)token)
     }
 }
 
+- (void)feedbackFlowStarted:(NSDictionary *)feedbackAction {
+    if (_hasListeners) {
+        [self sendEventWithName:@"feedbackFlowStarted" body: feedbackAction];
+    }
+}
+
 - (void)startObserving
 {
   _hasListeners = YES;
@@ -125,45 +137,46 @@ RCT_EXPORT_METHOD(initialize:(NSString *)token)
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"feedbackSent", @"feedbackWillBeSent", @"feedbackSendingFailed", @"configLoaded", @"customActionTriggered"];
+    return @[@"feedbackSent", @"feedbackSendingFailed", @"configLoaded", @"customActionTriggered", @"feedbackFlowStarted", @"widgetOpened", @"widgetClosed"];
 }
 
-RCT_EXPORT_METHOD(sendSilentBugReport:(NSString *)description andSeverity:(NSString *)priority)
+RCT_EXPORT_METHOD(sendSilentCrashReport:(NSString *)description andSeverity:(NSString *)severity)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         GleapBugSeverity prio = MEDIUM;
-        if ([priority isEqualToString: @"LOW"]) {
+        if ([severity isEqualToString: @"LOW"]) {
             prio = LOW;
         }
-        if ([priority isEqualToString: @"HIGH"]) {
+        if ([severity isEqualToString: @"HIGH"]) {
             prio = HIGH;
         }
-        [Gleap sendSilentBugReportWith: description andSeverity: prio];
+        
+        [Gleap sendSilentCrashReportWith: description andSeverity: prio andDataExclusion: nil andCompletion:^(bool success) {}];
     });
 }
 
-RCT_EXPORT_METHOD(sendSilentBugReportWithType:(NSString *)description andSeverity:(NSString *)priority andType:(NSString *)type)
+RCT_EXPORT_METHOD(sendSilentCrashReportWithExcludeData:(NSString *)description andSeverity:(NSString *)severity andExcludeData:(NSDictionary *)excludeData)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         GleapBugSeverity prio = MEDIUM;
-        if ([priority isEqualToString: @"LOW"]) {
+        if ([severity isEqualToString: @"LOW"]) {
             prio = LOW;
         }
-        if ([priority isEqualToString: @"HIGH"]) {
+        if ([severity isEqualToString: @"HIGH"]) {
             prio = HIGH;
         }
-        [Gleap sendSilentBugReportWith: description andSeverity: prio andType: type];
+        
+        [Gleap sendSilentCrashReportWith: description andSeverity: prio andDataExclusion: excludeData andCompletion:^(bool success) {}];
     });
 }
 
 RCT_EXPORT_METHOD(attachNetworkLog:(NSArray *)networkLogs)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [Gleap attachData: @{ @"networkLogs": networkLogs }];
+        [Gleap attachExternalData: @{ @"networkLogs": networkLogs }];
     });
 }
 
-
 RCT_EXPORT_METHOD(setActivationMethods:(NSArray *)activationMethods)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -181,10 +194,10 @@ RCT_EXPORT_METHOD(setActivationMethods:(NSArray *)activationMethods)
     });
 }
 
-RCT_EXPORT_METHOD(startFeedbackFlow:(NSString *)feedbackFlow)
+RCT_EXPORT_METHOD(startFeedbackFlow:(NSString *)feedbackFlow andShowBackButton:(BOOL)showBackButton)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [Gleap startFeedbackFlow: feedbackFlow];
+        [Gleap startFeedbackFlow: feedbackFlow showBackButton: showBackButton];
     });
 }
 
@@ -216,6 +229,21 @@ RCT_EXPORT_METHOD(clearIdentity)
     });
 }
 
+RCT_EXPORT_METHOD(identifyWithUserHash:(NSString *)userId withUserProperties: (NSDictionary *)userProperties andUserHash:(NSString *)userHash)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        GleapUserProperty *userProperty = [[GleapUserProperty alloc] init];
+        if (userProperties != nil && [userProperties objectForKey: @"name"] != nil) {
+            userProperty.name = [userProperties objectForKey: @"name"];
+        }
+        if (userProperties != nil && [userProperties objectForKey: @"email"] != nil) {
+            userProperty.email = [userProperties objectForKey: @"email"];
+        }
+        
+        [Gleap identifyUserWith: userId andData: userProperty andUserHash: userHash];
+    });
+}
+
 RCT_EXPORT_METHOD(identify:(NSString *)userId withUserProperties: (NSDictionary *)userProperties)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -231,6 +259,13 @@ RCT_EXPORT_METHOD(identify:(NSString *)userId withUserProperties: (NSDictionary
     });
 }
 
+RCT_EXPORT_METHOD(preFillForm:(NSDictionary *)formData)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [Gleap preFillForm: formData];
+    });
+}
+
 RCT_EXPORT_METHOD(attachCustomData:(NSDictionary *)customData)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -266,10 +301,10 @@ RCT_EXPORT_METHOD(setApiUrl: (NSString *)apiUrl)
     });
 }
 
-RCT_EXPORT_METHOD(setWidgetUrl: (NSString *)apiUrl)
+RCT_EXPORT_METHOD(setFrameUrl: (NSString *)frameUrl)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [Gleap setWidgetUrl: apiUrl];
+        [Gleap setFrameUrl: frameUrl];
     });
 }
 

package/lib/commonjs/index.js

@@ -23,9 +23,26 @@ const GleapSdk = _reactNative.NativeModules.Gleapsdk ? _reactNative.NativeModule
 });
 
 if (GleapSdk && !GleapSdk.touched) {
-  const networkLogger = new _networklogger.default();
+  const networkLogger = new _networklogger.default(); // Push the network log to the native SDK.
 
   GleapSdk.startNetworkLogging = () => {
+    // Set the callback.
+    networkLogger.setUpdatedCallback(() => {
+      if (!networkLogger) {
+        return;
+      }
+
+      const requests = networkLogger.getRequests();
+
+      if (requests && GleapSdk && typeof GleapSdk.attachNetworkLog !== 'undefined') {
+        if (_reactNative.Platform.OS === 'android') {
+          GleapSdk.attachNetworkLog(JSON.stringify(requests));
+        } else {
+          GleapSdk.attachNetworkLog(JSON.parse(JSON.stringify(requests)));
+        }
+      }
+    }); // Start the logger.
+
     networkLogger.start();
   };
 
@@ -69,27 +86,24 @@ if (GleapSdk && !GleapSdk.touched) {
       notifyCallback('configLoaded', configJSON);
     } catch (exp) {}
   });
-  gleapEmitter.addListener('feedbackWillBeSent', () => {
-    // Push the network log to the native SDK.
-    const requests = networkLogger.getRequests();
-
-    if (_reactNative.Platform.OS === 'android') {
-      GleapSdk.attachNetworkLog(JSON.stringify(requests));
-    } else {
-      GleapSdk.attachNetworkLog(JSON.parse(JSON.stringify(requests)));
-    }
-
-    notifyCallback('feedbackWillBeSent');
-  });
   gleapEmitter.addListener('feedbackSent', data => {
     try {
       const dataJSON = data instanceof Object ? data : JSON.parse(data);
       notifyCallback('feedbackSent', dataJSON);
     } catch (exp) {}
   });
+  gleapEmitter.addListener('feedbackFlowStarted', feedbackAction => {
+    notifyCallback('feedbackFlowStarted', feedbackAction);
+  });
   gleapEmitter.addListener('feedbackSendingFailed', () => {
     notifyCallback('feedbackSendingFailed');
   });
+  gleapEmitter.addListener('widgetOpened', () => {
+    notifyCallback('widgetOpened');
+  });
+  gleapEmitter.addListener('widgetClosed', () => {
+    notifyCallback('widgetClosed');
+  });
 
   function isJsonString(str) {
     try {