Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'sf/android_branch' into android_multi2

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-03-04 07:32:43 -08:00
commit fa6c043433
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,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="87"
android:versionCode="88"
android:versionName="@string/app_version"
>

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

@ -13,12 +13,9 @@
</style>
</head>
<body>
<h2>Crosswords 4.4 beta 94 release</h2>
<h2>Crosswords 4.4 beta 95 release</h2>
<p>This is an interim release making low-level network changes that
need to be out there before the next, more ambitious set of changes
can go out. Once this version&apos;s been adopted I can release the
next without breaking networked games that are in progress.</p>
<p>This is a quick bug fix release.</p>
<div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@ -28,12 +25,7 @@
<h3>New with this release</h3>
<ul>
<li>Change &quot;protocol&quot; of messages passed between games
to include more information</li>
<li>Replace "Do not show again" button in new-player hint
dialogs with a checkbox</li>
<li>Resend pending messages every time game is opened</li>
<li>Fix crash downloading wordlists</li>
<li>Don&apos;t crash copying games</li>
</ul>
<p>(The full changelog

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 beta 94</string>
<string name="app_version">4.4 beta 95</string>
</resources>

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/GameSummary.java
View file

@ -71,7 +71,7 @@ public class GameSummary {
public DeviceRole serverRole;
public int nPacketsPending;
private int m_giFlags;
private Integer m_giFlags;
private String m_playersSummary;
private CurGameInfo m_gi;
private Context m_context;
@ -287,7 +287,7 @@ public class GameSummary {
public void setGiFlags( int flags )
{
m_giFlags = flags;
m_giFlags = new Integer( flags );
}
public String summarizePlayer( int indx )
@ -343,7 +343,7 @@ public class GameSummary {
boolean result = false;
if ( !gameOver && 0 <= turn ) {
// HACK!!! Need to fix so we ensure m_giFlags is set here
Assert.assertNotNull( m_gi );
Assert.assertTrue( null != m_gi || null != m_giFlags );
result = localTurnNextImpl( giflags(), turn );
}
return result;