empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make pending intent flags explicit.

Browse source
This commit is contained in:
Alex Hart 2022-02-08 16:35:33 -04:00
parent 5c03608c8f
commit 601eb967de
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
View file

@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.SystemClock; import android.os.SystemClock;
@ -288,17 +289,25 @@ public class KeyCachingService extends Service {
private PendingIntent buildLockIntent() { private PendingIntent buildLockIntent() {
Intent intent = new Intent(this, KeyCachingService.class); Intent intent = new Intent(this, KeyCachingService.class);
intent.setAction(PASSPHRASE_EXPIRED_EVENT); intent.setAction(PASSPHRASE_EXPIRED_EVENT);
return PendingIntent.getService(getApplicationContext(), 0, intent, 0); return PendingIntent.getService(getApplicationContext(), 0, intent, getPendingIntentFlags());
} }
private PendingIntent buildLaunchIntent() { private PendingIntent buildLaunchIntent() {
// TODO [greyson] Navigation // TODO [greyson] Navigation
return PendingIntent.getActivity(getApplicationContext(), 0, MainActivity.clearTop(this), 0); return PendingIntent.getActivity(getApplicationContext(), 0, MainActivity.clearTop(this), getPendingIntentFlags());
} }
private static PendingIntent buildExpirationPendingIntent(@NonNull Context context) { private static PendingIntent buildExpirationPendingIntent(@NonNull Context context) {
Intent expirationIntent = new Intent(PASSPHRASE_EXPIRED_EVENT, null, context, KeyCachingService.class); Intent expirationIntent = new Intent(PASSPHRASE_EXPIRED_EVENT, null, context, KeyCachingService.class);
return PendingIntent.getService(context, 0, expirationIntent, 0); return PendingIntent.getService(context, 0, expirationIntent, getPendingIntentFlags());
}
private static int getPendingIntentFlags() {
if (Build.VERSION.SDK_INT >= 23) {
return PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT;
} else {
return PendingIntent.FLAG_UPDATE_CURRENT;
}
} }
@Override @Override