react-native-gleapsdk 6.4.3 → 6.4.6

package/android/build.gradle

@@ -56,6 +56,5 @@ 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.8'
-
+    implementation group: 'io.gleap', name: 'gleap-android-sdk', version: '6.4.12'
 }

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

@@ -1,6 +1,5 @@
 package com.reactnativegleapsdk;
 
-
 import android.app.Activity;
 import android.os.Build;
 import android.os.Handler;
@@ -9,8 +8,10 @@ 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;
@@ -27,6 +28,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Base64;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -34,7 +36,9 @@ 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;
@@ -46,10 +50,18 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   private boolean isSilentBugReport = false;
   private boolean invalidated = false;
 
-  public GleapsdkModule(ReactApplicationContext reactContext) {
-    super(reactContext);
+  public GleapsdkModule(ReactApplicationContext context) {
+    super(context);
+    Gleap.getInstance().setGetActivityCallback(new GetActivityCallback() {
+      @Override
+      public Activity getActivity() {
+        return context.getCurrentActivity();
+      }
+    });
+
   }
 
+
   @Override
   @NonNull
   public String getName() {
@@ -63,70 +75,91 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    */
   @ReactMethod
   public void initialize(String sdkKey) {
-    getCurrentActivity().runOnUiThread(
-      new Runnable() {
-        @Override
-        public void run() {
-          try {
-            Activity activity = getReactApplicationContext()
-              .getCurrentActivity();
-            if (activity != null && !invalidated) {
-              Gleap.getInstance().setApplicationType(APPLICATIONTYPE.REACTNATIVE);
-              Gleap.getInstance().setFeedbackWillBeSentCallback(new FeedbackWillBeSentCallback() {
-                @Override
-                public void flowInvoced() {
-                  if (!invalidated) {
-                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("feedbackWillBeSent", null);
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            try {
+              Activity activity = getReactApplicationContext()
+                .getCurrentActivity();
+              if (activity != null && !invalidated) {
+                Gleap.getInstance().setApplicationType(APPLICATIONTYPE.REACTNATIVE);
+                Gleap.getInstance().setFeedbackWillBeSentCallback(new FeedbackWillBeSentCallback() {
+                  @Override
+                  public void flowInvoced() {
+                    if (!invalidated) {
+                      getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit("feedbackWillBeSent", null);
+                    }
                   }
-                }
-              });
-
-              Gleap.initialize(sdkKey, activity.getApplication());
-              Gleap.getInstance().setConfigLoadedCallback(new ConfigLoadedCallback() {
-                @Override
-                public void configLoaded(JSONObject jsonObject) {
-                  if (!invalidated) {
-                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("configLoaded", jsonObject.toString());
+                });
+
+                Gleap.initialize(sdkKey, activity.getApplication());
+                Gleap.getInstance().setConfigLoadedCallback(new ConfigLoadedCallback() {
+                  @Override
+                  public void configLoaded(JSONObject jsonObject) {
+                    if (!invalidated) {
+                      getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit("configLoaded", jsonObject.toString());
+                    }
                   }
-                }
-              });
-
-              Gleap.getInstance().registerCustomAction(new CustomActionCallback() {
-                @Override
-                public void invoke(String message) {
-                  JSONObject obj = new JSONObject();
-                  try {
-                    obj.put("name", message);
-                  } catch (JSONException e) {
-                    e.printStackTrace();
+                });
+
+                Gleap.getInstance().registerCustomAction(new CustomActionCallback() {
+                  @Override
+                  public void invoke(String message) {
+                    JSONObject obj = new JSONObject();
+                    try {
+                      obj.put("name", message);
+                    } catch (JSONException e) {
+                      e.printStackTrace();
+                    }
+                    if (!invalidated) {
+                      getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit("customActionTriggered", obj.toString());
+                    }
                   }
-                  if (!invalidated) {
-                    getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("customActionTriggered", obj.toString());
+                });
+
+                Gleap.getInstance().setFeedbackSentWithDataCallback(new FeedbackSentWithDataCallback() {
+                  @Override
+                  public void close(JSONObject jsonObject) {
+                    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
-                  );
-                }
-              });
+                });
+
+                Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
+                  @Override
+                  public void close() {
+                    new java.util.Timer().schedule(
+                      new java.util.TimerTask() {
+                        @Override
+                        public void run() {
+                          showDevMenu();
+                        }
+                      },
+                      500);
+                  }
+                });
+              }
+            } catch (Exception ex) {
+              System.out.println(ex);
             }
-          } catch (Exception ex) {
-            System.out.println(ex);
           }
-        }
-      }
-    );
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @ReactMethod
@@ -144,71 +177,77 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    */
   @ReactMethod
   public void open() {
-    getCurrentActivity().runOnUiThread(
-      new Runnable() {
-        @Override
-        public void run() {
-          try {
-            Gleap.getInstance().startFeedbackFlow();
-            Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
-              @Override
-              public void close() {
-                new java.util.Timer().schedule(
-                  new java.util.TimerTask() {
-                    @Override
-                    public void run() {
-                      if (!isSilentBugReport) {
-                        showDevMenu();
-                      } else {
-                        isSilentBugReport = false;
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            try {
+              Gleap.getInstance().startFeedbackFlow();
+              Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
+                @Override
+                public void close() {
+                  new java.util.Timer().schedule(
+                    new java.util.TimerTask() {
+                      @Override
+                      public void run() {
+                        if (!isSilentBugReport) {
+                          showDevMenu();
+                        } else {
+                          isSilentBugReport = false;
+                        }
                       }
-                    }
-                  },
-                  500
-                );
-              }
-            });
-          } catch (Exception e) {
-            System.out.println(e);
+                    },
+                    500);
+                }
+              });
+            } catch (Exception e) {
+              System.out.println(e);
+            }
           }
-        }
-      });
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   /**
    * Start bug report manually by calling this function.
    */
   @ReactMethod
-  public void startFeedbackFlow(String feedbackFlow) {
-    getCurrentActivity().runOnUiThread(
-      new Runnable() {
-        @Override
-        public void run() {
-          try {
-            Gleap.getInstance().startFeedbackFlow(feedbackFlow);
-            Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
-              @Override
-              public void close() {
-                new java.util.Timer().schedule(
-                  new java.util.TimerTask() {
-                    @Override
-                    public void run() {
-                      if (!isSilentBugReport) {
-                        showDevMenu();
-                      } else {
-                        isSilentBugReport = false;
+  public void startFeedbackFlow(String feedbackFlow){
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            try {
+              Gleap.getInstance().startFeedbackFlow(feedbackFlow);
+              Gleap.getInstance().setFeedbackSentCallback(new FeedbackSentCallback() {
+                @Override
+                public void close() {
+                  new java.util.Timer().schedule(
+                    new java.util.TimerTask() {
+                      @Override
+                      public void run() {
+                        if (!isSilentBugReport) {
+                          showDevMenu();
+                        } else {
+                          isSilentBugReport = false;
+                        }
                       }
-                    }
-                  },
-                  500
-                );
-              }
-            });
-          } catch (Exception e) {
-            System.out.println(e);
+                    },
+                    500);
+                }
+              });
+            } catch (Exception e) {
+              System.out.println(e);
+            }
           }
-        }
-      });
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   /**
@@ -217,23 +256,55 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   @ReactMethod
   public void sendSilentBugReport(
     String description,
-    String priority
-  ) {
-    getCurrentActivity().runOnUiThread(
-      new Runnable() {
-        @Override
-        public void run() {
-          isSilentBugReport = true;
-          Gleap.SEVERITY severity = Gleap.SEVERITY.LOW;
-          if (priority == "MEDIUM") {
-            severity = Gleap.SEVERITY.MEDIUM;
+    String priority) {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            isSilentBugReport = true;
+            Gleap.SEVERITY severity = Gleap.SEVERITY.LOW;
+            if (priority == "MEDIUM") {
+              severity = Gleap.SEVERITY.MEDIUM;
+            }
+            if (priority == "HIGH") {
+              severity = Gleap.SEVERITY.HIGH;
+            }
+            Gleap.getInstance().sendSilentBugReport(description, severity);
           }
-          if (priority == "HIGH") {
-            severity = Gleap.SEVERITY.HIGH;
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+  /**
+   * Manually start a silent bug reporting workflow.
+   */
+  @ReactMethod
+  public void sendSilentBugReportWithType(
+    String description,
+    String priority,
+    String type) {
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            isSilentBugReport = true;
+            Gleap.SEVERITY severity = Gleap.SEVERITY.LOW;
+            if (priority == "MEDIUM") {
+              severity = Gleap.SEVERITY.MEDIUM;
+            }
+            if (priority == "HIGH") {
+              severity = Gleap.SEVERITY.HIGH;
+            }
+            Gleap.getInstance().sendSilentBugReport(description, severity, type);
           }
-          Gleap.getInstance().sendSilentBugReport(description, severity);
-        }
-      });
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @ReactMethod
@@ -242,32 +313,40 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   }
 
   @ReactMethod
-  public void enableDebugConsoleLog() {}
+  public void enableDebugConsoleLog() {
+  }
 
   @ReactMethod
   public void identify(String userid, ReadableMap data) {
-    getCurrentActivity().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");
+    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();
             }
-            if (jsonObject.has("email")) {
-              email = jsonObject.getString("email");
+            GleapUserProperties gleapUserSession = new GleapUserProperties(name, email);
+            if(Gleap.getInstance() == null) {
+              return;
             }
-          } catch (JSONException e) {
-            e.printStackTrace();
+            Gleap.getInstance().identifyUser(userid, gleapUserSession);
           }
-          GleapUserProperties gleapUserSession = new GleapUserProperties(name, email);
-          Gleap.getInstance().identifyUser(userid, gleapUserSession);
-        }
-      });
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @ReactMethod
@@ -276,7 +355,8 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   }
 
   /**
-   * Attaches custom data, which can be viewed in the BugBattle dashboard. New data will be merged with existing custom data.
+   * Attaches custom data, which can be viewed in the BugBattle dashboard. New
+   * data will be merged with existing custom data.
    *
    * @param customData The data to attach to a bug report.
    * @author BugBattle
@@ -285,6 +365,9 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   public void attachCustomData(ReadableMap customData) {
     try {
       JSONObject jsonObject = GleapUtil.convertMapToJson(customData);
+      if(Gleap.getInstance() == null) {
+        return;
+      }
       Gleap.getInstance().appendCustomData(jsonObject);
     } catch (Exception e) {
       System.out.println(e);
@@ -321,7 +404,8 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   }
 
   /**
-   * Attaches custom data, which can be viewed in the Gleap dashboard. New data will be merged with existing custom data.
+   * 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
@@ -348,7 +432,6 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     Gleap.getInstance().setCustomData(key, value);
   }
 
-
   /**
    * Removes one key from existing custom data.
    *
@@ -360,7 +443,6 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     Gleap.getInstance().removeCustomDataForKey(key);
   }
 
-
   /**
    * Sets an array of activation methods.
    *
@@ -378,10 +460,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
         internalActivationMethods.add(GleapActivationMethod.SCREENSHOT);
       }
     }
-    Gleap.getInstance().setActivationMethods(internalActivationMethods.toArray(new GleapActivationMethod[internalActivationMethods.size()]));
+    Gleap.getInstance().setActivationMethods(
+      internalActivationMethods.toArray(new GleapActivationMethod[internalActivationMethods.size()]));
   }
 
-
   /**
    * Clears all custom data.
    */
@@ -406,7 +488,9 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
         if (currentRequest.has("request")) {
           request = (JSONObject) currentRequest.get("request");
         }
-        Gleap.getInstance().logNetwork(currentRequest.getString("url"), RequestType.valueOf(currentRequest.getString("type")), response.getInt("status"), currentRequest.getInt("duration"), request, response);
+        Gleap.getInstance().logNetwork(currentRequest.getString("url"),
+          RequestType.valueOf(currentRequest.getString("type")), response.getInt("status"),
+          currentRequest.getInt("duration"), request, response);
       }
 
     } catch (Exception ex) {
@@ -443,7 +527,6 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     }
   }
 
-
   @RequiresApi(api = Build.VERSION_CODES.O)
   @ReactMethod
   /**
@@ -518,7 +601,6 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   @ReactMethod
   public void registerConfigLoadedAction(ConfigLoadedCallback configLoadedCallback) {
     Gleap.getInstance().setConfigLoadedCallback(configLoadedCallback);
-
   }
 
   ;
@@ -543,41 +625,48 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    * Show dev menu after shaking the phone.
    */
   private void showDevMenu() {
-    getCurrentActivity().runOnUiThread(
-      new Runnable() {
-        @Override
-        public void run() {
-          final ReactApplication application = (ReactApplication) getReactApplicationContext()
-            .getCurrentActivity()
-            .getApplication();
-          Handler mainHandler = new Handler(GleapsdkModule.this.getReactApplicationContext().getMainLooper());
-          Runnable myRunnable = new Runnable() {
-            @Override
-            public void run() {
-              try {
-                application
-                  .getReactNativeHost()
-                  .getReactInstanceManager()
-                  .getDevSupportManager()
-                  .showDevOptionsDialog();
-              } catch (Exception e) {
-                e.printStackTrace();
+    try {
+      getActivitySafe().runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            final ReactApplication application = (ReactApplication) getReactApplicationContext()
+              .getCurrentActivity()
+              .getApplication();
+            Handler mainHandler = new Handler(GleapsdkModule.this.getReactApplicationContext().getMainLooper());
+            Runnable myRunnable = new Runnable() {
+              @Override
+              public void run() {
+                try {
+                  application
+                    .getReactNativeHost()
+                    .getReactInstanceManager()
+                    .getDevSupportManager()
+                    .showDevOptionsDialog();
+                } catch (Exception e) {
+                  e.printStackTrace();
+                }
               }
-            }
-          };
-          mainHandler.post(myRunnable);
-        }
-      });
+            };
+            mainHandler.post(myRunnable);
+          }
+        });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @Override
-  public void onHostResume() {}
+  public void onHostResume() {
+  }
 
   @Override
-  public void onHostPause() {}
+  public void onHostPause() {
+  }
 
   @Override
-  public void onHostDestroy() {}
+  public void onHostDestroy() {
+  }
 
   @Override
   public void onCatalystInstanceDestroy() {
@@ -590,4 +679,12 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     invalidated = true;
     super.invalidate();
   }
+
+  private Activity getActivitySafe() throws NoUiThreadException {
+    Activity activity = getCurrentActivity();
+    if(activity == null) {
+      throw new NoUiThreadException();
+    }
+    return activity;
+  }
 }

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

@@ -0,0 +1,7 @@
+package com.reactnativegleapsdk;
+
+public class NoUiThreadException extends Exception{
+  public NoUiThreadException() {
+    super("No ui thread found. Please be careful when initialising the sdk.");
+  }
+}