Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-fdroid-193' into android_branch

Browse source
This commit is contained in:
Eric House 2022-11-11 13:11:16 -08:00
commit 3b71ba9aca
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/android/app/build.gradle
View file

@ -19,8 +19,8 @@
*/
def INITIAL_CLIENT_VERS = 10
def VERSION_CODE_BASE = 189
def VERSION_NAME = '4.4.192'
def VERSION_CODE_BASE = 190
def VERSION_NAME = '4.4.193'
def BUILD_INFO_NAME = "build-info.txt"
def LAST_COMMIT_FILE = "last-commit.txt"
@ -80,7 +80,6 @@ android {
} else {
minSdkVersion 14
}
targetSdkVersion 31 // must match ../build.gradle
versionCode VERSION_CODE_BASE
versionName VERSION_NAME
}
@ -152,6 +151,9 @@ android {
xw4fdroid {
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"
@ -168,6 +170,9 @@ android {
xw4d {
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"
@ -206,6 +211,9 @@ android {
xw4Foss {
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"

6
xwords4/android/app/src/main/assets/changes.html
View file

@ -13,9 +13,11 @@
</style>
</head>
<body>
<h2>CrossWords 4.4.192 release</h2>
<h2>CrossWords 4.4.193 release</h2>
<p>This release fixes invitations for Android 12</p>
<p>This release fixes invitations for Android 12 (and replaces
4.4.192 which crashes on Android 12 and should never have been
released) </p>
<div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DupeModeTimer.java
View file

@ -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()

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/NBSProto.java
View file

@ -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 )

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/TimerReceiver.java
View file

@ -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 );

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
View file

@ -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;

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
View file

@ -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;
}

10
xwords4/android/build.gradle
View file

@ -27,13 +27,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
android {
compileSdkVersion 31 // must match app/build.gradle
}
}
}
}