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.

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

Add immutable flag to pending intents for Android 12 #1040

Closed
wants to merge 1 commit into from
+5 −4
Closed

Add immutable flag to pending intents for Android 12 #1040

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
3 changes: 2 additions & 1 deletion lib/src/main/java/org/altbeacon/beacon/service/BeaconService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import java.util.List;

import static android.app.PendingIntent.FLAG_ONE_SHOT;
import static android.app.PendingIntent.FLAG_IMMUTABLE;
import static android.app.PendingIntent.getBroadcast;

/**
Expand Down Expand Up @@ -358,7 +359,7 @@ public void onTaskRemoved(Intent rootIntent) {

private PendingIntent getRestartIntent() {
Intent restartIntent = new Intent(getApplicationContext(), StartupBroadcastReceiver.class);
return getBroadcast(getApplicationContext(), 1, restartIntent, FLAG_ONE_SHOT);
return getBroadcast(getApplicationContext(), 1, restartIntent, FLAG_ONE_SHOT | FLAG_IMMUTABLE);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/org/altbeacon/beacon/service/ScanHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void stopAndroidOBackgroundScan() {
PendingIntent getScanCallbackIntent() {
Intent intent = new Intent(mContext, StartupBroadcastReceiver.class);
intent.putExtra("o-scan", true);
return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}

private final CycledLeScanCallback mCycledLeScanCallback = new CycledLeScanCallback() {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ protected PendingIntent getWakeUpOperation() {
if (mWakeUpOperation == null) {
Intent wakeupIntent = new Intent(mContext, StartupBroadcastReceiver.class);
wakeupIntent.putExtra("wakeup", true);
mWakeUpOperation = PendingIntent.getBroadcast(mContext, 0, wakeupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
mWakeUpOperation = PendingIntent.getBroadcast(mContext, 0, wakeupIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
return mWakeUpOperation;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/org/altbeacon/bluetooth/BluetoothMedic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ private void sendScreenNotification(String message, String detail) {

PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(
0,
PendingIntent.FLAG_UPDATE_CURRENT
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
);
builder.setContentIntent(resultPendingIntent);
NotificationManager notificationManager =
Expand Down