Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Up MQTT client version, and min sdk to 19

Browse source 
I'm getting a lot of crashes deep in the MQTT client. Upgrading may not fix
it, but it does crash on launch for JellyBean and before. So this
release will have the new MQTT client AND not get installed on the six
or so users I have running too-old Android. If the crashes continue
perhaps I don't orphen them. TBD.
This commit is contained in:
Eric House 2022-04-22 10:50:24 -07:00
parent 8118a9d823
commit cc32ff451c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,8 @@ android {
ndkVersion '21.4.7075529'
defaultConfig {
// HostApduService requires 19. But is it a problem?
minSdkVersion 14
// minSdkVersion 14
minSdkVersion 19 // Required for paho client > 3:1.1.+
targetSdkVersion 30 // must match ../build.gradle
versionCode VERSION_CODE_BASE
versionName VERSION_NAME
@ -362,7 +363,11 @@ dependencies {
implementation 'com.github.eehouse:nbsproxy:v0.2.2'
implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.+"
// 3:1.2.+ crashes on API 18 and below (all Jelly Beans) because
// java.nio.charset.StandardCharsets not defined. Does not crash on
// 19 (KitKat).
implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.+"
// implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.+"
implementation 'com.google.zxing:core:3.3.+'
}

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

@ -361,7 +361,7 @@ public class CommsTransport implements TransportProcs,
conType.toString() );
int nSent = -1;
Assert.assertNotNull( addr );
Assert.assertTrue( addr.contains( conType ) );
Assert.assertTrueNR( addr.contains( conType ) ); // fired per google
if ( !BuildConfig.UDP_ENABLED && conType == CommsConnType.COMMS_CONN_RELAY
&& null == m_relayAddr ) {