Skip to content

Android 12 Compatibility - Add pending intent flag immutable #1411

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
jkasten2 merged 2 commits into from
Aug 13, 2021
Merged

Android 12 Compatibility - Add pending intent flag immutable #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285def4
Add PendingIntent.FLAG_IMMUTABLE to notifications
jkasten2 Aug 13, 2021
0192817
Add PendingIntent.FLAG_IMMUTABLE to sync service
jkasten2 Aug 13, 2021
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/GenerateNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private static CharSequence getTitle(JSONObject fcmJson) {
}

private static PendingIntent getNewDismissActionPendingIntent(int requestCode, Intent intent) {
return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}

private static Intent getNewBaseDismissIntent(int notificationId) {
Expand Down
5 changes: 3 additions & 2 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class GenerateNotificationOpenIntent(
requestCode: Int,
oneSignalIntent: Intent,
): PendingIntent? {
val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
val launchIntent = getIntentVisible()
?:
// Even though the default app open action is disabled we still need to attach OneSignal's
Expand All @@ -71,7 +72,7 @@ class GenerateNotificationOpenIntent(
context,
requestCode,
oneSignalIntent,
PendingIntent.FLAG_UPDATE_CURRENT
flags
)


Expand All @@ -84,7 +85,7 @@ class GenerateNotificationOpenIntent(
context,
requestCode,
arrayOf(launchIntent, oneSignalIntent),
PendingIntent.FLAG_UPDATE_CURRENT
flags
)
}

Expand Down
2 changes: 1 addition & 1 deletion OneSignalSDK/onesignal/src/main/java/com/onesignal/OSBackgroundSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private PendingIntent syncServicePendingIntent(Context context) {
context,
getSyncTaskId(),
new Intent(context, getSyncServicePendingIntentClass()),
PendingIntent.FLAG_UPDATE_CURRENT
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
);
}

Expand Down