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

Merge remote-tracking branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2012-09-24 07:26:57 -07:00
commit 9a3e43428a
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/XWords4-sms/res/raw/changes
View file

@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<b>CrossW-SMS 4.4 beta 51 release</b> <b>CrossW-SMS 4.4 beta 52 release</b>
<p>This is first release of this variant of Crosswords featuring the <p>This is first release of this variant of Crosswords featuring the
ability to play via SMS</p> ability to play via SMS</p>
@ -21,7 +21,6 @@ ability to play via SMS</p>
<li>New word lookup URLs for Catalan language lists</li> <li>New word lookup URLs for Catalan language lists</li>
<li>Display wordlist comment if present</li> <li>Display wordlist comment if present</li>
</ul> </ul>
<p>Please remember that this is beta software. Please let me know (at <p>Please remember that this is beta software. Please let me know (at

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -1146,6 +1146,14 @@ public class DBUtils {
} }
} }
public static boolean gameDBExists( Context context )
{
String name = DBHelper.getDBName();
File sdcardDB = new File( Environment.getExternalStorageDirectory(),
name );
return sdcardDB.exists();
}
private static void copyGameDB( Context context, boolean toSDCard ) private static void copyGameDB( Context context, boolean toSDCard )
{ {
String name = DBHelper.getDBName(); String name = DBHelper.getDBName();

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

@ -887,11 +887,13 @@ public class GameUtils {
private static void tellRelayDied( Context context, GameSummary summary, private static void tellRelayDied( Context context, GameSummary summary,
boolean informNow ) boolean informNow )
{ {
if ( null != summary.relayID ) {
DBUtils.addDeceased( context, summary.relayID, summary.seed ); DBUtils.addDeceased( context, summary.relayID, summary.seed );
if ( informNow ) { if ( informNow ) {
NetUtils.informOfDeaths( context ); NetUtils.informOfDeaths( context );
} }
} }
}
} }

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

@ -545,6 +545,12 @@ public class GamesList extends XWListActivity
MenuItem item = menu.findItem( id ); MenuItem item = menu.findItem( id );
item.setVisible( visible ); item.setVisible( visible );
} }
if ( visible && !DBUtils.gameDBExists( this ) ) {
MenuItem item = menu.findItem( R.id.gamel_menu_loaddb );
item.setVisible( false );
}
return super.onPrepareOptionsMenu( menu ); return super.onPrepareOptionsMenu( menu );
} }