Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

send versionCode instead of custom flags

Browse source 
Since ability to grok a wordlist is a function of version, might as well
have the server know about that. Requires upping versionCode
prematurely, with stubbed-out release notes.
This commit is contained in:
Eric House 2021-12-01 08:23:10 -08:00
parent bd6bc71603
commit 565af46789
3 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,8 @@
*/ */
def INITIAL_CLIENT_VERS = 10 def INITIAL_CLIENT_VERS = 10
def VERSION_CODE_BASE = 176 def VERSION_CODE_BASE = 177
def VERSION_NAME = '4.4.180' def VERSION_NAME = '4.4.181'
def BUILD_INFO_NAME = "build-info.txt" def BUILD_INFO_NAME = "build-info.txt"
// Not all variants use the same BT_UUID. Those with the same talk to // Not all variants use the same BT_UUID. Those with the same talk to
@ -115,7 +115,6 @@ android {
buildConfigField "boolean", "FOR_FDROID", "false" buildConfigField "boolean", "FOR_FDROID", "false"
buildConfigField "boolean", "HAVE_PASSWORD", "false" buildConfigField "boolean", "HAVE_PASSWORD", "false"
buildConfigField "boolean", "NO_NEW_RELAY", "true" buildConfigField "boolean", "NO_NEW_RELAY", "true"
buildConfigField "String", "DICT_FLAGS", "null"
} }
xw4GPlay { xw4GPlay {
@ -168,7 +167,6 @@ android {
resValue "string", "nfc_aid", "$NFC_AID_XW4d" resValue "string", "nfc_aid", "$NFC_AID_XW4d"
externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4d'] externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4d']
externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID] externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID]
buildConfigField "String", "DICT_FLAGS", "\"roOK\""
} }
xw4dGPlay { xw4dGPlay {

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

@ -13,9 +13,9 @@
</style> </style>
</head> </head>
<body> <body>
<h2>CrossWords 4.4.180 release</h2> <h2>CrossWords 4.4.181 release</h2>
<p>This release adds "dark mode"</p> <p>This release adds <i>PENDING</i></p>
<div id="survey"> <div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take <p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@ -25,16 +25,7 @@
<h3>New with this release</h3> <h3>New with this release</h3>
<ul> <ul>
<li>Add "Dark" mode, off by default unless "dark theme" is <li><i>PENDING</i></li>
enabled in Android Settings</li>
<li>In App Settings, replace buttons with a popup menu</li>
<li>Add option to share color themes (dark or light) via URLs on
clipboard</li>
<li>Fix bug preventing trading when 8 or 9 tiles left in pool</li>
<li>Fix bug selecting 9th tile in 9-tile tray</li>
<li>Fix bug not reporting deleted games when using SMS Data</li>
<li>New translations in Chinese (Simplified), French,
Indonesian, Portuguese, and Portuguese (Brazil)</li>
</ul> </ul>
<p>(The full changelog <p>(The full changelog

20
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -1259,10 +1259,7 @@ public class DictsDelegate extends ListDelegateBase
// FIXME: this should pass up the language code to retrieve and // FIXME: this should pass up the language code to retrieve and
// parse less data // parse less data
String name = null; String name = null;
String proc = String.format( "listDicts?lc=%s", m_lc ); String proc = listDictsProc( m_lc );
if ( null != BuildConfig.DICT_FLAGS ) {
proc += "&flags=" + BuildConfig.DICT_FLAGS;
}
HttpsURLConnection conn = NetUtils.makeHttpsUpdateConn( m_context, HttpsURLConnection conn = NetUtils.makeHttpsUpdateConn( m_context,
proc ); proc );
if ( null != conn ) { if ( null != conn ) {
@ -1349,10 +1346,7 @@ public class DictsDelegate extends ListDelegateBase
public Boolean doInBackground( Void... unused ) public Boolean doInBackground( Void... unused )
{ {
boolean success = false; boolean success = false;
String proc = "listDicts"; String proc = listDictsProc( null );
if ( null != BuildConfig.DICT_FLAGS ) {
proc += "?flags=" + BuildConfig.DICT_FLAGS;
}
HttpsURLConnection conn = NetUtils.makeHttpsUpdateConn( m_context, HttpsURLConnection conn = NetUtils.makeHttpsUpdateConn( m_context,
proc ); proc );
if ( null != conn ) { if ( null != conn ) {
@ -1525,6 +1519,16 @@ public class DictsDelegate extends ListDelegateBase
} }
} // class FetchListTask } // class FetchListTask
private static String listDictsProc( String lc )
{
String proc = String.format( "listDicts?vc=%d",
BuildConfig.VERSION_CODE );
if ( null != lc ) {
proc += String.format( "&lc=%s", lc );
}
return proc;
}
public static void start( Delegator delegator ) public static void start( Delegator delegator )
{ {
delegator.addFragment( DictsFrag.newInstance( delegator ), null ); delegator.addFragment( DictsFrag.newInstance( delegator ), null );