v4.8.5

Author: fractalwrench

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode11.6
+osx_image: xcode11.3
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -33,12 +33,12 @@ before_install:
 - mkdir -p $TRAVIS_BUILD_DIR/build_artifacts
 
 install:
-- brew cask uninstall java > /dev/null
-- brew cask install adoptopenjdk8 > /dev/null
+- brew uninstall --cask java > /dev/null
+- brew install --cask adoptopenjdk8 > /dev/null
 - brew install ninja > /dev/null
-- brew cask install https://raw.githubusercontent.com/caskroom/homebrew-cask/59a4123d2dc252d17db3fc9169889c96b23cda15/Casks/mono-mdk.rb > /dev/null
-- brew cask install android-sdk > /dev/null
-- brew cask install bugsnag/unity/$UNITY_VERSION > /dev/null
+- brew install --cask mono-mdk > /dev/null
+- brew install --cask android-sdk > /dev/null
+- brew install --cask bugsnag/unity/$UNITY_VERSION > /dev/null
 - export PATH="$PATH:/Library/Frameworks/Mono.framework/Versions/Current/Commands"
 - sdkmanager --list
 - yes | sdkmanager "platforms;android-27" > /dev/null
@@ -57,7 +57,6 @@ script:
 jobs:
   include:
   - stage: test
-    osx_image: xcode11.3
     env:
     - UNITY_VERSION=unity-5-6-7f1
   - stage: test

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 4.8.5 (2021-03-03)
+
+### Bug fixes
+
+* Avoid JNI crash in leaveBreadcrumb by pushing local frame
+  [#214](https://github.com/bugsnag/bugsnag-unity/pull/214)
+
+* Respect autoNotify flag on Android
+  [#207](https://github.com/bugsnag/bugsnag-unity/pull/207)
+
 ## 4.8.4 (2020-10-05)
 
 ### Enhancements

bugsnag-android-unity/build.gradle

@@ -27,7 +27,7 @@ android {
             if (project.hasProperty("ABI_FILTERS")) {
                 abiFilters project.ABI_FILTERS.split(",")
             } else {
-                abiFilters 'arm64-v8a', 'armeabi-v7a', 'armeabi', 'x86', 'x86_64'
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
             }
         }
     }

build.cake

@@ -5,7 +5,7 @@ var target = Argument("target", "Default");
 var solution = File("./BugsnagUnity.sln");
 var configuration = Argument("configuration", "Release");
 var project = File("./src/BugsnagUnity/BugsnagUnity.csproj");
-var version = "4.8.4";
+var version = "4.8.5";
 
 Task("Restore-NuGet-Packages")
     .Does(() => NuGetRestore(solution));

src/BugsnagUnity/Configuration.cs

@@ -12,12 +12,12 @@ public abstract class AbstractConfiguration : IConfiguration
 
     public AbstractConfiguration() {}
 
-    protected virtual void SetupDefaults(string apiKey)
+    protected virtual void SetupDefaults(string apiKey, bool autoNotify)
     {
       ApiKey = apiKey;
       AppVersion = Application.version;
       AutoCaptureSessions = true;
-      AutoNotify = true;
+      AutoNotify = autoNotify;
     }
 
     public virtual bool ReportUncaughtExceptionsAsHandled { get; set; } = true;

src/BugsnagUnity/Native/Android/Configuration.cs

@@ -27,13 +27,13 @@ internal Configuration(string apiKey, bool autoNotify) : base()
       JavaObject.Call("setReleaseStage", "production");
       JavaObject.Call("setAppVersion", Application.version);
       NativeInterface = new NativeInterface(JavaObject);
-      SetupDefaults(apiKey);
       _autoNotify = autoNotify;
+      SetupDefaults(apiKey, _autoNotify);
     }
 
-    protected override void SetupDefaults(string apiKey)
+    protected override void SetupDefaults(string apiKey, bool autoNotify)
     {
-      base.SetupDefaults(apiKey);
+      base.SetupDefaults(apiKey, autoNotify);
       ReleaseStage = "production";
       Endpoint = new Uri(DefaultEndpoint);
       SessionEndpoint = new Uri(DefaultSessionEndpoint);

src/BugsnagUnity/Native/Android/NativeInterface.cs

@@ -140,6 +140,31 @@ public NativeInterface(AndroidJavaObject config)
       }
     }
 
+    /**
+     * Pushes a local JNI frame with 128 capacity. This avoids the reference table
+     * being exceeded, which can happen on some lower-end Android devices in extreme conditions
+     * (e.g. Nexus 7 running Android 6). This is likely due to AndroidJavaObject
+     * not deleting local references immediately.
+     *
+     * If this call is unsuccessful it indicates the device is low on memory so the caller should no-op.
+     * https://docs.unity3d.com/ScriptReference/AndroidJNI.PopLocalFrame.html
+     */
+    private bool PushLocalFrame() {
+      if (AndroidJNI.PushLocalFrame(128) != 0) {
+        AndroidJNI.ExceptionClear(); // clear pending OutOfMemoryError.
+        return false;
+      }
+      return true;
+    }
+
+    /**
+     * Pops the local JNI frame, freeing any references in the table.
+     * https://docs.unity3d.com/ScriptReference/AndroidJNI.PopLocalFrame.html
+     */
+    private void PopLocalFrame() {
+      AndroidJNI.PopLocalFrame(System.IntPtr.Zero);
+    }
+
     public string GetAppVersion() {
       return CallNativeStringMethod("getAppVersion", "()Ljava/lang/String;", new object[]{});
     }
@@ -287,10 +312,13 @@ public void LeaveBreadcrumb(string name, string type, IDictionary<string, string
       if (!isAttached) {
         AndroidJNI.AttachCurrentThread();
       }
-      using (AndroidJavaObject map = BuildJavaMapDisposable(metadata))
-      {
-        CallNativeVoidMethod("leaveBreadcrumb", "(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V",
-            new object[]{name, type, map});
+      if (PushLocalFrame()) {
+        using (AndroidJavaObject map = BuildJavaMapDisposable(metadata))
+        {
+          CallNativeVoidMethod("leaveBreadcrumb", "(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V",
+              new object[]{name, type, map});
+        }
+        PopLocalFrame();
       }
       if (!isAttached) {
         AndroidJNI.DetachCurrentThread();

src/BugsnagUnity/Native/Cocoa/Configuration.cs

@@ -17,14 +17,14 @@ class Configuration : AbstractConfiguration
     internal Configuration(string apiKey, bool autoNotify) : base()
     {
       NativeConfiguration = NativeCode.bugsnag_createConfiguration(apiKey);
-      SetupDefaults(apiKey);
-      NativeCode.bugsnag_setAutoNotify(NativeConfiguration, autoNotify);
       _autoNotify = autoNotify;
+      SetupDefaults(apiKey, autoNotify);
+      NativeCode.bugsnag_setAutoNotify(NativeConfiguration, autoNotify);
     }
 
-    protected override void SetupDefaults(string apiKey)
+    protected override void SetupDefaults(string apiKey, bool autoNotify)
     {
-      base.SetupDefaults(apiKey);
+      base.SetupDefaults(apiKey, autoNotify);
       ReleaseStage = "production";
       Endpoint = new Uri(DefaultEndpoint);
     }

src/BugsnagUnity/Native/Fallback/Configuration.cs

@@ -7,8 +7,7 @@ namespace BugsnagUnity
   class Configuration : AbstractConfiguration
   {
     internal Configuration(string apiKey, bool autoNotify) : base() {
-      SetupDefaults(apiKey);
-      AutoNotify = autoNotify;
+      SetupDefaults(apiKey, autoNotify);
     }
   }
 }

tests/BugsnagUnity.Tests/ConfigurationTests.cs

@@ -8,7 +8,7 @@ namespace BugsnagUnity.Payload.Tests
   class TestConfig : AbstractConfiguration
   {
     internal TestConfig(string apiKey) : base() {
-      SetupDefaults(apiKey);
+      SetupDefaults(apiKey, true);
     }
   }