service: PendingIntent vs. Android M

Apparently we now have to specify mutability flags.

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
index 9f1ef5a4457540084f265035cd2ccddb84047268..63037e93d574fe555648bcdb06cb2182b308ab97 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
@@ -57,10 +57,15 @@ class MainServiceNotification {
             nm.createNotificationChannel(nc);
         }
 
+        int pendflags = PendingIntent.FLAG_CANCEL_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendflags |= PendingIntent.FLAG_IMMUTABLE;
+        }
+
         userNoteBuilder = new NotificationCompat.Builder(ms, CTFWS_GAME_CHANNEL_ID)
                 .setOnlyAlertOnce(false)
                 .setSmallIcon(R.drawable.ic_hammer_and_sickle)
-                .setContentIntent(PendingIntent.getActivity(ms, 0, ni, 0));
+                .setContentIntent(PendingIntent.getActivity(ms, 0, ni, pendflags));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             userNoteBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);