@bugfender/rn-bugfender 1.1.4 → 2.0.0

package/android/build.gradle

@@ -1,103 +1,61 @@
 buildscript {
-  repositories {
-    jcenter()
-    maven { url 'https://maven.google.com' }
-  }
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+            jcenter()
+        }
 
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
-  }
+        dependencies {
+            classpath 'com.android.tools.build:gradle:3.5.3'
+        }
+    }
 }
 
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+    compileSdkVersion safeExtGet('RnBugfender_compileSdkVersion', 29)
+    defaultConfig {
+        minSdkVersion safeExtGet('RnBugfender_minSdkVersion', 16)
+        targetSdkVersion safeExtGet('RnBugfender_targetSdkVersion', 29)
+        versionCode 1
+        versionName "1.0"
 
-  defaultConfig {
-    minSdkVersion 16
-    targetSdkVersion 28
-    versionCode 1
-    versionName "1.0"
-  }
+    }
 
-  lintOptions {
-    abortOnError false
-  }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
-  jcenter()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-        projectDir,
-        '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
+    mavenLocal()
     maven {
-      url defaultDir.toString()
-      name androidSourcesName
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url("$rootDir/../node_modules/react-native/android")
     }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-          parentDir,
-          'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-          parentDir,
-          'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-        "${project.name}: unable to locate React Native android sources. " +
-            "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
+    google()
+    mavenCentral()
+    jcenter()
 }
 
 dependencies {
-  implementation 'com.facebook.react:react-native:+'
-  implementation 'com.bugfender.sdk:android:3.+'
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    //noinspection GradleDynamicVersion
+    implementation 'com.bugfender.sdk:android:3.+'
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jul 14 10:32:57 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

package/android/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -56,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

package/android/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,4 @@
-<manifest 
-  xmlns:android="http://schemas.android.com/apk/res/android" 
-  package="com.bugfender.react" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.bugfender.react">
+
+</manifest>

package/android/src/main/java/com/bugfender/react/{RNBugfenderModule.java → RnBugfenderModule.java}

@@ -1,5 +1,7 @@
 package com.bugfender.react;
 
+import androidx.annotation.NonNull;
+
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
@@ -11,23 +13,27 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.net.URL;
 
-public class RNBugfenderModule extends ReactContextBaseJavaModule implements ActivityEventListener {
-
-  private Promise pendingPromise; // Promise that is waiting information that will be available in onActivityResult
+@ReactModule(name = RnBugfenderModule.NAME)
+public class RnBugfenderModule extends ReactContextBaseJavaModule implements ActivityEventListener {
+  public static final String NAME = "RnBugfender";
 
-  public RNBugfenderModule(ReactApplicationContext rc) {
-    super(rc);
+  public RnBugfenderModule(ReactApplicationContext reactContext) {
+    super(reactContext);
     this.getReactApplicationContext().addActivityEventListener(this);
   }
 
   @Override
+  @NonNull
   public String getName() {
-    return "RNBugfender";
+    return NAME;
   }
 
+  private Promise pendingPromise; // Promise that is waiting information that will be available in onActivityResult
+
   @ReactMethod
   public void overrideDeviceName(String deviceName) {
     Bugfender.overrideDeviceName(deviceName);
@@ -98,6 +104,21 @@ public class RNBugfenderModule extends ReactContextBaseJavaModule implements Act
     Bugfender.setDeviceFloat(key, value);
   }
 
+  @ReactMethod
+  public void info(String tag, String text) {
+    Bugfender.i(tag, text);
+  }
+
+  @ReactMethod
+  public void trace(String tag, String text) {
+    Bugfender.t(tag, text);
+  }
+
+  @ReactMethod
+  public void fatal(String tag, String text) {
+    Bugfender.f(tag, text);
+  }
+
   @ReactMethod
   public void debug(String tag, String text) {
     Bugfender.d(tag, text);
@@ -114,7 +135,7 @@ public class RNBugfenderModule extends ReactContextBaseJavaModule implements Act
   }
 
   @ReactMethod
-  public void log(int lineNumber, String method, String file, String rawLogLevel, String tag, String message) {
+  public void log(int lineNumber, String method, String file, int rawLogLevel, String tag, String message) {
     final LogLevel logLevel = parseLogLevel(rawLogLevel);
     Bugfender.log(lineNumber, method, file, logLevel, tag, message);
   }
@@ -158,9 +179,9 @@ public class RNBugfenderModule extends ReactContextBaseJavaModule implements Act
 
   @ReactMethod
   public void showUserFeedback(String title, String hint, String subjectHint, String messageHint, String sendButtonText, String cancelButtonText,
-      Promise promise) {
+                               Promise promise) {
     getCurrentActivity().startActivityForResult(
-        Bugfender.getUserFeedbackActivityIntent(getApplication(), title, hint, subjectHint, messageHint, sendButtonText), SHOW_USER_FEEDBACK_REQUEST_CODE
+      Bugfender.getUserFeedbackActivityIntent(getApplication(), title, hint, subjectHint, messageHint, sendButtonText), SHOW_USER_FEEDBACK_REQUEST_CODE
     );
     pendingPromise = promise;
   }
@@ -169,20 +190,27 @@ public class RNBugfenderModule extends ReactContextBaseJavaModule implements Act
     return (Application) getReactApplicationContext().getApplicationContext();
   }
 
-  private static LogLevel parseLogLevel(String loglevel) {
+  private static LogLevel parseLogLevel(int loglevel) {
     switch (loglevel) {
-      case "Debug":
+      case 3:
+        return LogLevel.Trace;
+      case 4:
+        return LogLevel.Info;
+      case 5:
+        return LogLevel.Fatal;
+      case 0:
         return LogLevel.Debug;
-      case "Warning":
+      case 1:
         return LogLevel.Warning;
-      case "Error":
+      case 2:
         return LogLevel.Error;
       default:
         return null;
     }
   }
 
-  @Override public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+  @Override
+  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
     if (requestCode == SHOW_USER_FEEDBACK_REQUEST_CODE && pendingPromise != null) {
       if (resultCode == Activity.RESULT_OK) {
         pendingPromise.resolve(data.getStringExtra(FeedbackActivity.RESULT_FEEDBACK_URL));
@@ -193,7 +221,8 @@ public class RNBugfenderModule extends ReactContextBaseJavaModule implements Act
     }
   }
 
-  @Override public void onNewIntent(Intent intent) {
+  @Override
+  public void onNewIntent(Intent intent) {
     // Nothing to do
   }
 }

package/android/src/main/java/com/bugfender/react/RnBugfenderPackage.java

@@ -0,0 +1,28 @@
+package com.bugfender.react;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class RnBugfenderPackage implements ReactPackage {
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new RnBugfenderModule(reactContext));
+        return modules;
+    }
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

package/ios/RnBugfender.h

@@ -0,0 +1,5 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RnBugfender : NSObject <RCTBridgeModule>
+
+@end

package/ios/{RNBugfender.m → RnBugfender.m}

@@ -1,10 +1,10 @@
-#import "RNBugfender.h"
+#import "RnBugfender.h"
 #import <BugfenderSDK/BugfenderSDK.h>
 #import <React/RCTUtils.h>
 
-@implementation RNBugfender
+@implementation RnBugfender
 
-RCT_EXPORT_MODULE(RNBugfender);
+RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(activateLogger:(NSString *)key)
 {
@@ -92,6 +92,21 @@ RCT_EXPORT_METHOD(setDeviceFloat:(NSString *)deviceKey floatValue:(float)floatVa
     [Bugfender setDeviceDouble:floatValue forKey:deviceKey];
 }
 
+RCT_EXPORT_METHOD(info:(NSString *)tag text:(NSString *)text)
+{
+    BFLog2(BFLogLevelInfo, tag, @"%@", text);
+}
+
+RCT_EXPORT_METHOD(trace:(NSString *)tag text:(NSString *)text)
+{
+    BFLog2(BFLogLevelTrace, tag, @"%@", text);
+}
+
+RCT_EXPORT_METHOD(fatal:(NSString *)tag text:(NSString *)text)
+{
+    BFLog2(BFLogLevelFatal, tag, @"%@", text);
+}
+
 RCT_EXPORT_METHOD(debug:(NSString *)tag text:(NSString *)text)
 {
     BFLog2(BFLogLevelDefault, tag, @"%@", text);
@@ -107,14 +122,20 @@ RCT_EXPORT_METHOD(error:(NSString *)tag text:(NSString *)text)
     BFLog2(BFLogLevelError, tag, @"%@", text);
 }
 
-RCT_EXPORT_METHOD(log:(int)lineNumber method:(NSString *)method file:(NSString *)file logLevel:(NSString *)rawLogLevel tag:(NSString *)tag  message:(NSString *)message)
+RCT_EXPORT_METHOD(log:(int)lineNumber method:(NSString *)method file:(NSString *)file logLevel:(int)rawLogLevel tag:(NSString *)tag  message:(NSString *)message)
 {
     BFLogLevel logLevel = BFLogLevelDefault;
-    if ([rawLogLevel isEqualToString:@"Error"])
-        logLevel = BFLogLevelError;
-    else if ([rawLogLevel isEqualToString:@"Warning"])
+    if (rawLogLevel == 1)
         logLevel = BFLogLevelWarning;
-    
+    else if (rawLogLevel == 2)
+        logLevel = BFLogLevelError;
+    else if (rawLogLevel == 3)
+        logLevel = BFLogLevelTrace;
+    else if (rawLogLevel == 4)
+        logLevel = BFLogLevelInfo;
+    else if (rawLogLevel == 5)
+        logLevel = BFLogLevelFatal;
+
     [Bugfender logWithLineNumber:lineNumber method:method file:file level:logLevel tag:tag message:message];
 }
 
@@ -153,7 +174,7 @@ RCT_EXPORT_METHOD(showUserFeedback:(NSString *)title hint:(NSString *)hint subje
             reject(0, @"Feedback not sent", nil);
         }
     }];
-    
+
     UIViewController* vc = RCTPresentedViewController();
     [vc presentViewController:controller animated:YES completion:nil];