diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java index a3a04411e..b22963f29 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java @@ -74,7 +74,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver { private static final String k_PARAMS = "params"; private static final String k_DEVID = "did"; private static final String k_XLATEINFO = "xlatinfo"; - private static final String k_APPGITREV = "apprev"; + private static final String k_STRINGSHASH = "strings"; @Override public void onReceive( Context context, Intent intent ) @@ -181,7 +181,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver { if ( 0 < params.length() ) { try { - params.put( k_APPGITREV, BuildConstants.GIT_HASH ); + params.put( k_STRINGSHASH, BuildConstants.STRINGS_HASH ); params.put( k_NAME, packageName ); params.put( k_AVERS, versionCode ); DbgUtils.logf( "current update: %s", params.toString() ); diff --git a/xwords4/android/scripts/genvers.sh b/xwords4/android/scripts/genvers.sh index c6d33cf04..bb1a452b2 100755 --- a/xwords4/android/scripts/genvers.sh +++ b/xwords4/android/scripts/genvers.sh @@ -19,11 +19,7 @@ cd $(dirname $0) cd ../ GITVERSION=$(../scripts/gitversion.sh) -if git rev-parse $GITVERSION 2>/dev/null 1>/dev/null; then - GIT_HASH=$(git rev-parse $GITVERSION) -else - GIT_HASH=unknown -fi +STRINGS_HASH=$(git log -- ${BUILD_DIR}/archive/R.java | grep '^commit ' | head -n 1 | awk '{print $2}') # TODO: deal with case where there's no hash available -- exported # code maybe? Better: gitversion.sh does that. @@ -42,11 +38,11 @@ EOF SHORTVERS="$(git describe --always $GITVERSION 2>/dev/null || echo unknown)" cat < ${BUILD_DIR}/src/org/eehouse/android/${VARIANT}/BuildConstants.java -// auto-generated; do not edit +// auto-generated (by $(basename $0)); do not edit package org.eehouse.android.${VARIANT}; class BuildConstants { public static final String GIT_REV = "$SHORTVERS"; - public static final String GIT_HASH = "$GIT_HASH"; + public static final String STRINGS_HASH = "$STRINGS_HASH"; public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY; public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED; public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED;