Skip to content

No longer firing willShowInForegroundHandler for restoring notifications #1403

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.

Sign up for GitHub

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

Merged
emawby merged 1 commit into from
Aug 5, 2021
Merged

No longer firing willShowInForegroundHandler for restoring notifications #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private static int processJobForDisplay(OSNotificationController notificationCon

if (doDisplay) {
androidNotificationId = notificationJob.getAndroidId();
if (fromBackgroundLogic && OneSignal.shouldFireForegroundHandlers()) {
if (fromBackgroundLogic && OneSignal.shouldFireForegroundHandlers(notificationJob)) {
notificationController.setFromBackgroundLogic(false);
OneSignal.fireForegroundHandlers(notificationController);
// Notification will be processed by foreground user complete or timer complete
Expand Down
8 changes: 7 additions & 1 deletion OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@ static void handleNotificationReceived(OSNotificationGenerationJob notificationJ
* <br/><br/>
* @see OSNotificationWillShowInForegroundHandler
*/
static boolean shouldFireForegroundHandlers() {
static boolean shouldFireForegroundHandlers(OSNotificationGenerationJob notificationJob) {
if (!isInForeground()) {
OneSignal.onesignalLog(LOG_LEVEL.INFO, "App is in background, show notification");
return false;
Expand All @@ -2310,6 +2310,12 @@ static boolean shouldFireForegroundHandlers() {
return false;
}

// Notification is restored. Don't fire for restored notifications.
if (notificationJob.isRestoring()) {
OneSignal.onesignalLog(LOG_LEVEL.INFO, "Not firing notificationWillShowInForegroundHandler for restored notifications");
return false;
}

return true;
}

Expand Down