Skip to content

make PendingIntents compatible with Android 12 #1400

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

Closed
AndreasBoehm wants to merge 1 commit into from
Closed

make PendingIntents compatible with Android 12 #1400

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
22 changes: 20 additions & 2 deletions 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 @@ -133,11 +133,29 @@ private static CharSequence getTitle(JSONObject fcmJson) {
* on weird UI interaction
*/
private static PendingIntent getNewActionPendingIntent(int requestCode, Intent intent) {
return PendingIntent.getActivity(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
final int flags;

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;

} else {
flags = PendingIntent.FLAG_UPDATE_CURRENT;
}

return PendingIntent.getActivity(currentContext, requestCode, intent, flags);
}

private static PendingIntent getNewDismissActionPendingIntent(int requestCode, Intent intent) {
return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
final int flags;

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;

} else {
flags = PendingIntent.FLAG_UPDATE_CURRENT;
}

return PendingIntent.getBroadcast(currentContext, requestCode, intent, flags);
}

private static Intent getNewBaseIntent(int notificationId) {
Expand Down
12 changes: 11 additions & 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 @@ -174,11 +174,21 @@ private PendingIntent syncServicePendingIntent(Context context) {
// KEEP - PendingIntent.FLAG_UPDATE_CURRENT
// Some Samsung devices will throw the below exception otherwise.
// "java.lang.SecurityException: !@Too many alarms (500) registered"

final int flags;

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;

} else {
flags = PendingIntent.FLAG_UPDATE_CURRENT;
}

return PendingIntent.getService(
context,
getSyncTaskId(),
new Intent(context, getSyncServicePendingIntentClass()),
PendingIntent.FLAG_UPDATE_CURRENT
flags
);
}

Expand Down