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

Merge branch 'android_release' into android_branch

Browse source 
This will probably not compile...
This commit is contained in:
Eric House 2016-11-28 20:19:54 -08:00
commit 0237403a26
5 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -6,7 +6,7 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4"
android:versionCode="107"
android:versionCode="109"
android:versionName="@string/app_version"
>

13
xwords4/android/XWords4/assets/changes.html
View file

@ -13,10 +13,10 @@
</style>
</head>
<body>
<h2>Crosswords 4.4.112 release</h2>
<h2>Crosswords 4.4.114 release</h2>
<p>This release fixes a crash introduced by the previous release
that occurred on some devices when creating new games.</p>
<p>This release fixes a drawing problem on Android Nougat version
only.</p>
<div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@ -26,7 +26,11 @@
<h3>New with this release</h3>
<ul>
<li>Fix crash attempting to configure new network games</li>
<li>Fix (or work around) board drawing weirdness introduced with
Nougat. It showed most often when using the hint
feature.</li>
<li>Fix a couple of crashes reported via the Play Store --
thanks!</li>
</ul>
<p>(The full changelog
@ -34,6 +38,7 @@
<h3>Next up</h3>
<ul>
<li>Support WiFi Direct (currently working sporadically)</li>
<li>Take advantage of Marshmallow's new permissions model (where
the app only asks for permission, e.g. to send SMS, when it
needs it.)

2
xwords4/android/XWords4/res/values/app_name.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_version">4.4.112</string>
<string name="app_version">4.4.114</string>
</resources>

9
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -642,9 +642,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 )

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java
View file

@ -43,9 +43,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 );
}
}
}
}