react-native-gleapsdk 6.4.5-beta.1 → 7.0.0

package/LICENSE

@@ -1,21 +1,3 @@
-MIT License
+Copyright (C) 2020 by Gleap GmbH. Permission is hereby granted to use this framework as is, modification are not allowed. All rights reserved.
 
-Copyright (c) 2021 gleap
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. FURTHER RESELLING OF THE SDK OR IT'S CODE IS ONLY GRANTED WITH A WRITTEN PERMISSION BY GLEAP GMBH.

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.11-hotfix'
+    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

@@ -26,20 +26,25 @@ 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;
 
 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 {
@@ -47,16 +52,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 reactContext.getCurrentActivity();
+        return context.getCurrentActivity();
       }
     });
+
   }
 
+
   @Override
   @NonNull
   public String getName() {
@@ -70,36 +77,60 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    */
   @ReactMethod
   public void initialize(String sdkKey) {
-    getCurrentActivity().runOnUiThread(
+    try {
+      getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
             try {
               Activity activity = getReactApplicationContext()
-                  .getCurrentActivity();
+                .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) {
                     if (!invalidated) {
                       getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                          .emit("configLoaded", jsonObject.toString());
+                        .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);
+                  }
+                });
+
                 Gleap.getInstance().registerCustomAction(new CustomActionCallback() {
                   @Override
                   public void invoke(String message) {
@@ -111,38 +142,16 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
                     }
                     if (!invalidated) {
                       getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                          .emit("customActionTriggered", obj.toString());
+                        .emit("customActionTriggered", obj.toString());
                     }
                   }
                 });
 
-                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);
                   }
                 });
               }
@@ -151,6 +160,9 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             }
           }
         });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @ReactMethod
@@ -168,27 +180,28 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    */
   @ReactMethod
   public void open() {
-    getCurrentActivity().runOnUiThread(
+    try {
+      getActivitySafe().runOnUiThread(
         new Runnable() {
           @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
-                        public void run() {
-                          if (!isSilentBugReport) {
-                            showDevMenu();
-                          } else {
-                            isSilentBugReport = false;
-                          }
+                    new java.util.TimerTask() {
+                      @Override
+                      public void run() {
+                        if (!isSilentBugReport) {
+                          showDevMenu();
+                        } else {
+                          isSilentBugReport = false;
                         }
-                      },
-                      500);
+                      }
+                    },
+                    500);
                 }
               });
             } catch (Exception e) {
@@ -196,34 +209,70 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             }
           }
         });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+  @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) {
-    getCurrentActivity().runOnUiThread(
+  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
-                        public void run() {
-                          if (!isSilentBugReport) {
-                            showDevMenu();
-                          } else {
-                            isSilentBugReport = false;
-                          }
+                    new java.util.TimerTask() {
+                      @Override
+                      public void run() {
+                        if (!isSilentBugReport) {
+                          showDevMenu();
+                        } else {
+                          isSilentBugReport = false;
                         }
-                      },
-                      500);
+                      }
+                    },
+                    500);
                 }
               });
             } catch (Exception e) {
@@ -231,16 +280,20 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             }
           }
         });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   /**
    * Manually start a silent bug reporting workflow.
    */
   @ReactMethod
-  public void sendSilentBugReport(
-      String description,
-      String priority) {
-    getCurrentActivity().runOnUiThread(
+  public void sendSilentCrashReport(
+    String description,
+    String priority) {
+    try {
+      getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
@@ -252,23 +305,33 @@ 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) {
+      System.err.println(e.getMessage());
+    }
   }
 
   /**
    * Manually start a silent bug reporting workflow.
    */
   @ReactMethod
-  public void sendSilentBugReportWithType(
-      String description,
-      String priority,
-      String type) {
-    getCurrentActivity().runOnUiThread(
+  public void sendSilentCrashReportWithExcludeData(
+    String description,
+    String priority,
+    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") {
@@ -277,11 +340,36 @@ 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) {
+      System.err.println(e.getMessage());
+    }
   }
 
+
   @ReactMethod
   public void setLanguage(String language) {
     Gleap.getInstance().setLanguage(language);
@@ -289,11 +377,13 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
 
   @ReactMethod
   public void enableDebugConsoleLog() {
+
   }
 
   @ReactMethod
   public void identify(String userid, ReadableMap data) {
-    getCurrentActivity().runOnUiThread(
+    try {
+      getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
@@ -312,14 +402,67 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
               e.printStackTrace();
             }
             GleapUserProperties gleapUserSession = new GleapUserProperties(name, email);
+            if (Gleap.getInstance() == null) {
+              return;
+            }
             Gleap.getInstance().identifyUser(userid, gleapUserSession);
           }
         });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
+  }
+
+  @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());
+    }
   }
 
   /**
@@ -333,7 +476,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
   public void attachCustomData(ReadableMap customData) {
     try {
       JSONObject jsonObject = GleapUtil.convertMapToJson(customData);
-      Gleap.getInstance().appendCustomData(jsonObject);
+      if (Gleap.getInstance() == null) {
+        return;
+      }
+      Gleap.getInstance().attachCustomData(jsonObject);
     } catch (Exception e) {
       System.out.println(e);
     }
@@ -355,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);
     }
@@ -425,8 +555,10 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
         internalActivationMethods.add(GleapActivationMethod.SCREENSHOT);
       }
     }
-    Gleap.getInstance().setActivationMethods(
+    if(Gleap.getInstance() != null) {
+      Gleap.getInstance().setActivationMethods(
         internalActivationMethods.toArray(new GleapActivationMethod[internalActivationMethods.size()]));
+    }
   }
 
   /**
@@ -454,8 +586,8 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
           request = (JSONObject) currentRequest.get("request");
         }
         Gleap.getInstance().logNetwork(currentRequest.getString("url"),
-            RequestType.valueOf(currentRequest.getString("type")), response.getInt("status"),
-            currentRequest.getInt("duration"), request, response);
+          RequestType.valueOf(currentRequest.getString("type")), response.getInt("status"),
+          currentRequest.getInt("duration"), request, response);
       }
 
     } catch (Exception ex) {
@@ -572,7 +704,7 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
 
   private boolean checkAllowedEndings(String fileName) {
     String[] fileType = fileName.split("\\.");
-    String[] allowedTypes = { "jpeg", "svg", "png", "mp4", "webp", "xml", "plain", "xml", "json" };
+    String[] allowedTypes = {"jpeg", "svg", "png", "mp4", "webp", "xml", "plain", "xml", "json"};
     if (fileType.length <= 1) {
       return false;
     }
@@ -590,23 +722,24 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
    * Show dev menu after shaking the phone.
    */
   private void showDevMenu() {
-    getCurrentActivity().runOnUiThread(
+    try {
+      getActivitySafe().runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
             final ReactApplication application = (ReactApplication) getReactApplicationContext()
-                .getCurrentActivity()
-                .getApplication();
+              .getCurrentActivity()
+              .getApplication();
             Handler mainHandler = new Handler(GleapsdkModule.this.getReactApplicationContext().getMainLooper());
             Runnable myRunnable = new Runnable() {
               @Override
               public void run() {
                 try {
                   application
-                      .getReactNativeHost()
-                      .getReactInstanceManager()
-                      .getDevSupportManager()
-                      .showDevOptionsDialog();
+                    .getReactNativeHost()
+                    .getReactInstanceManager()
+                    .getDevSupportManager()
+                    .showDevOptionsDialog();
                 } catch (Exception e) {
                   e.printStackTrace();
                 }
@@ -615,6 +748,9 @@ public class GleapsdkModule extends ReactContextBaseJavaModule implements Lifecy
             mainHandler.post(myRunnable);
           }
         });
+    } catch (NoUiThreadException e) {
+      System.err.println(e.getMessage());
+    }
   }
 
   @Override
@@ -640,4 +776,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.");
+  }
+}