Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] ANRs for callbacks and when backgrounding app #602

Merged
merged 2 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions OneSignalExample/Assets/OneSignal/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fixed rare Android ANRs on callbacks firing and also when backgrounding the app.
## [3.0.10]
### Changed
- Updated included Android SDK to [4.8.5](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.8.5)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<repositories>
<repository>https://repo.maven.apache.org/maven2</repository>
</repositories>
<androidPackage spec="com.onesignal:OneSignal:[4.8.5]" />
<androidPackage spec="com.onesignal:OneSignal:[4.8.6]" />
</androidPackages>
</dependencies>
15 changes: 15 additions & 0 deletions com.onesignal.unity.android/Runtime/OneSignalAndroid.cs
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ public override void SetLaunchURLsInApp(bool launchInApp)
=> SDKDebug.Warn("This feature is only available for iOS.");

public override void Initialize(string appId) {
SetOneSignalCallbacksToBackgroundThread();

var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");

Expand All @@ -137,6 +139,19 @@ public override void SetLaunchURLsInApp(bool launchInApp)
_completedInit(appId);
}

// Change all OneSignal callbacks, observers, and events to fire on a background thread.
// This prevents cases where the main thread could hang waiting on Unity to bridge from Java back to C#.
private void SetOneSignalCallbacksToBackgroundThread() {
var callbackThreadManagerStr = SDKPackage + "." + "CallbackThreadManager";
var callbackThreadManagerClass = new AndroidJavaClass(callbackThreadManagerStr);
var callbackThreadManagerCompanionClass = callbackThreadManagerClass.GetStatic<AndroidJavaObject>("Companion");

var useThreadClass = new AndroidJavaClass(callbackThreadManagerStr + "$UseThread");
var useThreadBackgroundEnumValue = useThreadClass.GetStatic<AndroidJavaObject>("Background");

callbackThreadManagerCompanionClass.Call("setPreference", useThreadBackgroundEnumValue);
}

public override async Task<NotificationPermission> PromptForPushNotificationsWithUserResponse() {
var proxy = new PromptForPushNotificationPermissionResponseHandler();
_sdkClass.CallStatic("promptForPushNotifications", true, proxy);
Expand Down
Loading