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

Merge tag 'android_beta_99' into android_branch

Browse source 
ready for fix-marshmallow-bt release
This commit is contained in:
Eric House 2015-12-30 06:41:39 -08:00
commit 9ddee9790d
6 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -13,10 +13,10 @@
</style> </style>
</head> </head>
<body> <body>
<h2>Crosswords 4.4 beta 98 release</h2> <h2>Crosswords 4.4 beta 99 release</h2>
<p>This release is mostly to get the new Dutch translation out <p>This is a quick-fix release for Bluetooth on Android
there, and to catch up Catalan and French.</p> Marshmallow.</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
@ -26,23 +26,10 @@
<h3>New with this release</h3> <h3>New with this release</h3>
<ul> <ul>
<li>Complete and up-to-date translations into Dutch, French and <li>Work around "security" change that broke Bluetooth
Catalan. What language is next?</li> invitations and gameplay on the latest Android release
("Marshmallow").</li>
<li>Allow copying invitation URL to clipboard so you can paste <li>Fix crash choosing menu at the wrong time</li>
it into any messaging app you like</li>
<li>Improvements to in-game chat experience (but more are coming)</li>
<li>Show a "toast" when hint button can't find any moves</li>
<li>Add SMS to the list of ways you can invite somebody</li>
<li>When displaying Bluetooth-connected devices to invite, skip
stuff like headphones</li>
<li>Turn off email invite attachments. They didn't seem to work anyway,
and aren't needed on modern Android.</li>
<li>Fix very old memory leak</li>
</ul> </ul>
<p>(The full changelog <p>(The full changelog
@ -51,8 +38,9 @@
<h3>Next up</h3> <h3>Next up</h3>
<ul> <ul>
<li>Offer &quot;Rematch&quot; when game&apos;s over (Easy via <li>Offer &quot;Rematch&quot; when game&apos;s over (Easy via
SMS and Bluetooth; harder via the internet/relay)</li> SMS and Bluetooth; harder via the internet/relay)</li>
<li>Look into supporting play via peer-to-peer wifi</li> <li>Take advantage of Marshmallow's new permissions model (where
the app only asks for them when it needs them.)
</ul> </ul>
<p>Please let me know <p>Please let me know

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_version">4.4 beta 98</string> <string name="app_version">4.4 beta 99</string>
</resources> </resources>

14
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -291,6 +291,7 @@ public class BTService extends XWService {
public static void inviteRemote( Context context, String btAddr, public static void inviteRemote( Context context, String btAddr,
NetLaunchInfo nli ) NetLaunchInfo nli )
{ {
Assert.assertTrue( null != btAddr && 0 < btAddr.length() );
Intent intent = getIntentTo( context, BTAction.INVITE ); Intent intent = getIntentTo( context, BTAction.INVITE );
String nliData = nli.toString(); String nliData = nli.toString();
intent.putExtra( GAMEDATA_KEY, nliData ); intent.putExtra( GAMEDATA_KEY, nliData );
@ -316,16 +317,20 @@ public class BTService extends XWService {
CommsAddrRec targetAddr, int gameID ) CommsAddrRec targetAddr, int gameID )
{ {
int nSent = -1; int nSent = -1;
if ( null != targetAddr ) { Assert.assertNotNull( targetAddr );
String btAddr = getSafeAddr( targetAddr ); String btAddr = getSafeAddr( targetAddr );
if ( null != btAddr && 0 < btAddr.length() ) {
Intent intent = getIntentTo( context, BTAction.SEND ); Intent intent = getIntentTo( context, BTAction.SEND );
intent.putExtra( MSG_KEY, buf ); intent.putExtra( MSG_KEY, buf );
intent.putExtra( ADDR_KEY, btAddr ); intent.putExtra( ADDR_KEY, btAddr );
intent.putExtra( GAMEID_KEY, gameID ); intent.putExtra( GAMEID_KEY, gameID );
context.startService( intent ); context.startService( intent );
nSent = buf.length; nSent = buf.length;
} else { }
DbgUtils.logf( "BTService.enqueueFor(): targetAddr is null" );
if ( -1 == nSent ) {
DbgUtils.logf( "BTService.enqueueFor(): can't send to %s",
targetAddr.bt_hostName );
} }
return nSent; return nSent;
} }
@ -687,7 +692,6 @@ public class BTService extends XWService {
} }
btAddr = s_namesToAddrs.get( btName ); btAddr = s_namesToAddrs.get( btName );
DbgUtils.logf( "lookupAddr(%s) => %s", btName, btAddr );
} }
return btAddr; return btAddr;
} }

17
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -1090,8 +1090,8 @@ public class GameUtils {
{ {
if ( null != bmr ) { if ( null != bmr ) {
Intent intent = GamesListDelegate.makeRowidIntent( context, rowid ); Intent intent = GamesListDelegate.makeRowidIntent( context, rowid );
String msg; String msg = null;
int titleID; int titleID = 0;
if ( null != bmr.m_chat ) { if ( null != bmr.m_chat ) {
titleID = R.string.notify_chat_title_fmt; titleID = R.string.notify_chat_title_fmt;
if ( null != bmr.m_chatFrom ) { if ( null != bmr.m_chatFrom ) {
@ -1101,13 +1101,16 @@ public class GameUtils {
} else { } else {
msg = bmr.m_chat; msg = bmr.m_chat;
} }
} else { } else if ( null != bmr.m_lmi ) {
titleID = R.string.notify_title_fmt; titleID = R.string.notify_title_fmt;
msg = bmr.m_lmi.format( context ); msg = bmr.m_lmi.format( context ); // NPE
}
if ( 0 != titleID ) {
String title = LocUtils.getString( context, titleID,
getName( context, rowid ) );
Utils.postNotification( context, intent, title, msg, (int)rowid );
} }
String title = LocUtils.getString( context, titleID,
getName( context, rowid ) );
Utils.postNotification( context, intent, title, msg, (int)rowid );
} else { } else {
DbgUtils.logdf( "postMoveNotification(): posting nothing for lack" DbgUtils.logdf( "postMoveNotification(): posting nothing for lack"
+ " of brm" ); + " of brm" );