From 1d6ca3abe17502a86108e9767e842579f799a52c Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 1 Mar 2024 13:21:59 +0100 Subject: [PATCH 1/5] bump --- modules/sentry-java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sentry-java b/modules/sentry-java index 7dd1e8e68..01eb25db4 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 7dd1e8e682ca379fdc87ea85bff6bd33b4a9a7b6 +Subproject commit 01eb25db4a987ad2abf0b3dc33d218fb420266d2 From 68d311fb282466bef32c43e5ba5b1449674e8d13 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 1 Mar 2024 14:10:06 +0100 Subject: [PATCH 2/5] disable scope persistence --- .../Android/AndroidManifestConfiguration.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs b/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs index e53843f4e..b80c98b03 100644 --- a/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs +++ b/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs @@ -164,6 +164,7 @@ internal void ModifyManifest(string basePath) androidManifest.SetAutoSessionTracking(false); androidManifest.SetAutoAppLifecycleBreadcrumbs(false); androidManifest.SetAnr(false); + androidManifest.SetPersistentScopeObserver(false); // TODO: All SentryOptions and create specific Android options @@ -415,6 +416,9 @@ public void SetAutoAppLifecycleBreadcrumbs(bool enableAutoAppLifeCycleBreadcrumb internal void SetAnr(bool enableAnr) => SetMetaData($"{SentryPrefix}.anr.enable", enableAnr.ToString()); + internal void SetPersistentScopeObserver(bool enableScopePersistence) + => SetMetaData($"{SentryPrefix}.enable-scope-persistence", enableScopePersistence.ToString()); + internal void SetNdkEnabled(bool enableNdk) => SetMetaData($"{SentryPrefix}.ndk.enable", enableNdk.ToString()); From ca73addf014ab5d61416764e5ff4772d772c9df7 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 1 Mar 2024 14:14:23 +0100 Subject: [PATCH 3/5] Updated CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a30de563..bf8999373 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixes + +- Fixed potential crashes on Android devices by removing the use of the persistent scope observer ([#1555](https://github.com/getsentry/sentry-unity/pull/1555)) + ### Dependencies - Bump Java SDK from v7.3.0 to v7.4.0 ([#1569](https://github.com/getsentry/sentry-unity/pull/1569)) From 0f35b60d6d56f313d7210cbaad50377b00c77f2b Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 1 Mar 2024 14:17:50 +0100 Subject: [PATCH 4/5] bump to 7.5.0 --- modules/sentry-java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sentry-java b/modules/sentry-java index 01eb25db4..c2b79e4ef 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 01eb25db4a987ad2abf0b3dc33d218fb420266d2 +Subproject commit c2b79e4ef6bc7a32dc5fd83c980a547b87e5498b From 23b0e09b243428e87eea59e624ec7db66ef5248b Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 1 Mar 2024 14:18:35 +0100 Subject: [PATCH 5/5] Updated CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf8999373..34772054e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,9 @@ ### Dependencies -- Bump Java SDK from v7.3.0 to v7.4.0 ([#1569](https://github.com/getsentry/sentry-unity/pull/1569)) - - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#740) - - [diff](https://github.com/getsentry/sentry-java/compare/7.3.0...7.4.0) +- Bump Java SDK from v7.3.0 to v7.5.0 ([#1569](https://github.com/getsentry/sentry-unity/pull/1569), [#1555](https://github.com/getsentry/sentry-unity/pull/1555)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#750) + - [diff](https://github.com/getsentry/sentry-java/compare/7.3.0...7.5.0) ## 2.0.0