react-native-gleapsdk 6.4.8 → 7.0.2

package/android/build.gradle

@@ -3,7 +3,6 @@ buildscript {
         repositories {
             google()
             mavenCentral()
-            jcenter()
         }
 
         dependencies {
@@ -19,10 +18,10 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('Gleapsdk_compileSdkVersion', 29)
+    compileSdkVersion safeExtGet('Gleapsdk_compileSdkVersion', 31)
     defaultConfig {
         minSdkVersion safeExtGet('Gleapsdk_minSdkVersion', 16)
-        targetSdkVersion safeExtGet('Gleapsdk_targetSdkVersion', 29)
+        targetSdkVersion safeExtGet('Gleapsdk_targetSdkVersion', 31)
         versionCode 1
         versionName "1.0"
 
@@ -54,7 +53,7 @@ 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.19'
+    implementation 'com.google.android.material:material:1.6.1'
 }

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,21 @@ 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.GleapLogLevel;
 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 +88,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) {
@@ -103,6 +113,23 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
                       getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                         .emit("configLoaded", jsonObject.toString());
                     }
+
+                  }
+                });
+
+                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);
                   }
                 });
 
@@ -122,33 +149,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 +188,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 +216,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 +291,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 +307,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 +319,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 +342,28 @@ 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) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+  @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) {
@@ -307,6 +371,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     }
   }
 
+
   @ReactMethod
   public void setLanguage(String language) {
     Gleap.getInstance().setLanguage(language);
@@ -314,6 +379,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
 
   @ReactMethod
   public void enableDebugConsoleLog() {
+
   }
 
   @ReactMethod
@@ -338,7 +404,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 +415,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 +478,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 +503,15 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   }
 
   /**
-   * Used for dedicated server. Set the url, where the widget is loaded from.
-   *
-   * @param widgetUrl Url to the dedicated server.
-   */
-  @ReactMethod
-  public void setWidgetUrl(String widgetUrl) {
-    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.
+   * Frame url
+   * 330,.
    *
-   * @param customData The data to attach to a bug report.
-   * @author Gleap
+   * @param frameUrl Url to the dedicated server.
    */
   @ReactMethod
-  public void appendCustomData(ReadableMap customData) {
+  public void setFrameUrl(String frameUrl) {
     try {
-      JSONObject jsonObject = GleapUtil.convertMapToJson(customData);
-      Gleap.getInstance().appendCustomData(jsonObject);
+      Gleap.getInstance().setFrameUrl(frameUrl);
     } catch (Exception e) {
       System.out.println(e);
     }
@@ -460,8 +557,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()]));
+    }
   }
 
   /**
@@ -603,7 +702,32 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     Gleap.getInstance().setConfigLoadedCallback(configLoadedCallback);
   }
 
-  ;
+  @ReactMethod
+  public void disableConsoleLog() {
+    Gleap.getInstance().disableConsoleLog();
+  }
+
+
+    @ReactMethod
+  public void log(String msg) {
+    Gleap.getInstance().log(msg);
+  }
+
+  @ReactMethod
+  public void logWithLogLevel(String msg, String logLevel) {
+    GleapLogLevel ll;
+    switch (logLevel) {
+      case "WARNING":
+        ll = GleapLogLevel.WARNING;
+        break;
+      case "ERROR":
+        ll = GleapLogLevel.ERROR;
+        break;
+      default:
+        ll = GleapLogLevel.INFO;
+    }
+    Gleap.getInstance().log(msg, ll);
+  }
 
   private boolean checkAllowedEndings(String fileName) {
     String[] fileType = fileName.split("\\.");
@@ -680,9 +804,11 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
     super.invalidate();
   }
 
+
+
   private Activity getActivitySafe() throws NoUiThreadException {
     Activity activity = getCurrentActivity();
-    if(activity == null) {
+    if (activity == null) {
       throw new NoUiThreadException();
     }
     return activity;