From ef27ffaa02847282c811342d0937c36cd74097f1 Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 7 Mar 2019 06:28:46 -0800 Subject: [PATCH] send an int code rather than a name --- xwords4/android/app/build.gradle | 4 ++++ .../java/org/eehouse/android/xw4/UpdateCheckReceiver.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index d64864291..31f93933b 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -83,6 +83,7 @@ android { buildConfigField "boolean", "WIDIR_ENABLED", "false" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false" buildConfigField "String", "VARIANT_NAME", "\"Google Play Store\"" + buildConfigField "int", "VARIANT_CODE", "1" buildConfigField "boolean", "SMS_BANNED", "true" } @@ -95,6 +96,7 @@ android { buildConfigField "boolean", "WIDIR_ENABLED", "false" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false" buildConfigField "String", "VARIANT_NAME", "\"F-Droid\"" + buildConfigField "int", "VARIANT_CODE", "2" buildConfigField "boolean", "SMS_BANNED", "false" } xw4d { @@ -106,6 +108,7 @@ android { buildConfigField "boolean", "WIDIR_ENABLED", "true" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true" buildConfigField "String", "VARIANT_NAME", "\"Dev/Debug\"" + buildConfigField "int", "VARIANT_CODE", "3" buildConfigField "boolean", "REPORT_LOCKS", "true" buildConfigField "boolean", "SMS_BANNED", "false" } @@ -119,6 +122,7 @@ android { buildConfigField "boolean", "WIDIR_ENABLED", "true" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true" buildConfigField "String", "VARIANT_NAME", "\"Dev/Debug sans SMS\"" + buildConfigField "int", "VARIANT_CODE", "4" buildConfigField "boolean", "SMS_BANNED", "true" } 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 485cc7c42..a351a5858 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 @@ -127,7 +127,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver { try { JSONObject appParams = new JSONObject(); - appParams.put( k_VARIANT, BuildConfig.VARIANT_NAME ); + appParams.put( k_VARIANT, BuildConfig.VARIANT_CODE ); appParams.put( k_AVERS, versionCode ); // Look at whether server needs these duplicates. PENDING.... appParams.put( k_GVERS, BuildConfig.GIT_REV );