From 98dd2148ce2b5eb302846c53f2624d0a5b3c74d2 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Fri, 11 Nov 2022 12:16:39 -0800
Subject: [PATCH] use constant for flag that must change with sdk version

---
 xwords4/android/app/build.gradle                               | 3 +++
 .../src/main/java/org/eehouse/android/xw4/DupeModeTimer.java   | 2 +-
 .../app/src/main/java/org/eehouse/android/xw4/NBSProto.java    | 2 +-
 .../src/main/java/org/eehouse/android/xw4/TimerReceiver.java   | 2 +-
 .../main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java | 2 +-
 .../app/src/main/java/org/eehouse/android/xw4/Utils.java       | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 59cacb99b..edf9ea2f1 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -153,6 +153,7 @@ android {
             dimension "variant"
             targetSdkVersion 30
             compileSdkVersion 30
+            buildConfigField "int", "FLAG_IMMUTABLE", "0"
             applicationId "org.eehouse.android.xw4"
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossWords"
@@ -171,6 +172,7 @@ android {
             dimension "variant"
             targetSdkVersion 30
             compileSdkVersion 30
+            buildConfigField "int", "FLAG_IMMUTABLE", "0"
             buildConfigField "String", "DB_NAME", "\"xwddb\""
             applicationId "org.eehouse.android.xw4dbg"
             resValue "string", "app_name", "CrossDbg"
@@ -211,6 +213,7 @@ android {
             dimension "variant"
             targetSdkVersion 30
             compileSdkVersion 30
+            buildConfigField "int", "FLAG_IMMUTABLE", "0"
             applicationId "org.eehouse.android.xw4"
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossWords"
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DupeModeTimer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DupeModeTimer.java
index 0da021efa..db5835be2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DupeModeTimer.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DupeModeTimer.java
@@ -173,7 +173,7 @@ public class DupeModeTimer extends BroadcastReceiver {
             sCurTimer = whenSeconds;
             Intent intent = new Intent( context, DupeModeTimer.class );
             PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent,
-                                                           PendingIntent.FLAG_IMMUTABLE );
+                                                           BuildConfig.FLAG_IMMUTABLE );
 
             long now = Utils.getCurSeconds();
             long fire_millis = SystemClock.elapsedRealtime()
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NBSProto.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NBSProto.java
index de29f03ee..a37ed5ae0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NBSProto.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NBSProto.java
@@ -380,7 +380,7 @@ public class NBSProto {
         {
             Intent intent = new Intent( msg );
             return PendingIntent.getBroadcast( context, 0, intent,
-                                               PendingIntent.FLAG_IMMUTABLE );
+                                               BuildConfig.FLAG_IMMUTABLE );
         }
 
         private void cacheForRetry( QueueElem elem )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TimerReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TimerReceiver.java
index f2e5ac20e..fadb11210 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TimerReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TimerReceiver.java
@@ -391,7 +391,7 @@ public class TimerReceiver extends BroadcastReceiver {
                 intent.putExtra( KEY_TIMER_ID, timerID );
                 PendingIntent pi = PendingIntent
                     .getBroadcast( context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT
-                                   | PendingIntent.FLAG_IMMUTABLE );
+                                   | BuildConfig.FLAG_IMMUTABLE );
                 am.set( AlarmManager.RTC_WAKEUP, firstFireTime, pi );
 
                 setJobTimerIf( context, delayMS, timerID );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
index 1ec40039e..16cfb4f6e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
@@ -98,7 +98,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
 
         Intent intent = new Intent( context, UpdateCheckReceiver.class );
         PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent,
-                                                       PendingIntent.FLAG_IMMUTABLE );
+                                                       BuildConfig.FLAG_IMMUTABLE );
         am.cancel( pi );
 
         long interval_millis;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
index 700643708..25174a9e1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
@@ -379,7 +379,7 @@ public class Utils {
     {
         PendingIntent pi = PendingIntent
             .getActivity( context, Utils.nextRandomInt(), intent,
-                          PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE );
+                          PendingIntent.FLAG_ONE_SHOT | BuildConfig.FLAG_IMMUTABLE );
         return pi;
     }