From 6171d9ce90133d245304354439559dec730411dc Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 28 Nov 2016 20:02:38 -0800 Subject: [PATCH] prep a quick-fix release, with string changes Two crashes reported on the Google Play store in the 112 version have at least easy work-arounds: catching exceptions and doing nothing. In both cases that should be harmless, so assuming the causes are rare it's a good move. --- xwords4/android/XWords4/AndroidManifest.xml | 2 +- xwords4/android/XWords4/assets/changes.html | 7 +++++-- xwords4/android/XWords4/res/values/app_name.xml | 2 +- .../src/org/eehouse/android/xw4/DlgDelegate.java | 9 +++++++-- .../src/org/eehouse/android/xw4/SMSReceiver.java | 10 +++++++--- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml index fc4396cc7..cc21883c4 100644 --- a/xwords4/android/XWords4/AndroidManifest.xml +++ b/xwords4/android/XWords4/AndroidManifest.xml @@ -22,7 +22,7 @@ to come from a domain that you own or have control over. --> diff --git a/xwords4/android/XWords4/assets/changes.html b/xwords4/android/XWords4/assets/changes.html index 7489a5ae3..22cc807d7 100644 --- a/xwords4/android/XWords4/assets/changes.html +++ b/xwords4/android/XWords4/assets/changes.html @@ -13,7 +13,7 @@ -

Crosswords 4.4.113 release

+

Crosswords 4.4.114 release

This release fixes a drawing problem on Android Nougat version only.

@@ -27,7 +27,10 @@

New with this release

(The full changelog diff --git a/xwords4/android/XWords4/res/values/app_name.xml b/xwords4/android/XWords4/res/values/app_name.xml index b3b8cac43..b8ef95b5b 100644 --- a/xwords4/android/XWords4/res/values/app_name.xml +++ b/xwords4/android/XWords4/res/values/app_name.xml @@ -1,5 +1,5 @@ - 4.4.113 + 4.4.114 diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java index fc2e51e9a..bb60dbeea 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java @@ -640,9 +640,14 @@ public class DlgDelegate { private Dialog createLookupDialog() { + Dialog result = null; DlgState state = findForID( DlgID.LOOKUP ); - Bundle bundle = (Bundle)state.m_params[0]; - return LookupAlert.makeDialog( m_activity, bundle ); + // state is null per a play store crash report. + if ( null != state ) { + Bundle bundle = (Bundle)state.m_params[0]; + result = LookupAlert.makeDialog( m_activity, bundle ); + } + return result; } private Dialog createOKDialog( DlgState state, DlgID dlgID ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java index bb258f942..9bb637510 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java @@ -42,9 +42,13 @@ public class SMSReceiver extends BroadcastReceiver { for ( int ii = 0; ii < pdus.length; ++ii ) { SmsMessage sms = SmsMessage.createFromPdu((byte[])pdus[ii]); if ( null != sms ) { - String phone = sms.getOriginatingAddress(); - byte[] body = sms.getUserData(); - SMSService.handleFrom( context, body, phone ); + try { + String phone = sms.getOriginatingAddress(); + byte[] body = sms.getUserData(); + SMSService.handleFrom( context, body, phone ); + } catch ( NullPointerException npe ) { + DbgUtils.loge( npe ); + } } } }