diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index 5333aa58f..dcb43f94e 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -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.+' } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java index a9caab875..979d60d93 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java @@ -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 ) {