feat: call native & java sentry close() on Android app shutdown (if r…

…eported...)
getsentry · Mar 4, 2022 · 9ed8200 · 9ed8200
1 parent 378f30f
commit 9ed8200
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/Sentry.Unity.Android/SentryJava.cs b/src/Sentry.Unity.Android/SentryJava.cs
@@ -28,5 +28,11 @@ public static class SentryJava
             return jo.CallStatic<AndroidJavaObject>("isCrashedLastRun")
                 ?.Call<bool>("booleanValue");
         }
+
+        public static void Close()
+        {
+            using var jo = new AndroidJavaObject("io.sentry.Sentry");
+            jo.CallStatic<AndroidJavaObject>("close");
+        }
     }
 }
diff --git a/src/Sentry.Unity.Android/SentryNative.cs b/src/Sentry.Unity.Android/SentryNative.cs
@@ -14,6 +14,8 @@ namespace Sentry.Unity.Android
     /// <see href="https://github.com/getsentry/sentry-native"/>
     public static class SentryNative
     {
+        public static void Close() => sentry_close();
+
         /// <summary>
         /// Re-installs the sentry-native backend essentially retaking the signal handlers.
         /// </summary>
@@ -30,6 +32,9 @@ public static class SentryNative
         [DllImport("sentry")]
         private static extern void sentry_reinstall_backend();
 
+        [DllImport("sentry")]
+        private static extern void sentry_close();
+
         // Testing
         internal static Action ReinstallSentryNativeBackendStrategy = sentry_reinstall_backend;
     }

diff --git a/src/Sentry.Unity.Android/SentryNativeAndroid.cs b/src/Sentry.Unity.Android/SentryNativeAndroid.cs
@@ -1,4 +1,5 @@
 using Sentry.Extensibility;
+using Sentry.Unity.Integrations;
 
 namespace Sentry.Unity.Android
 {
@@ -44,6 +45,13 @@ public static void Configure(SentryUnityOptions options, ISentryUnityInfo sentry
                     // So we register our backend once more to make sure user-defined data is available in the crash report.
                     SentryNative.ReinstallBackend();
                 }
+                ApplicationAdapter.Instance.Quitting += () =>
+                {
+                    options.DiagnosticLogger?.LogDebug("Closing the sentry-java SDK");
+                    SentryJava.Close();
+                    options.DiagnosticLogger?.LogDebug("Closing the sentry-native SDK");
+                    SentryNative.Close();
+                };
             }
         }
     }