From 96e277c7ba7aae0cb216be5d5ec210ba7523b073 Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 20 Sep 2012 07:29:00 -0700 Subject: [PATCH 1/3] don't offer to copy DB from sdcard when there is none. --- .../XWords4/src/org/eehouse/android/xw4/DBUtils.java | 8 ++++++++ .../XWords4/src/org/eehouse/android/xw4/GamesList.java | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java index 477a679ab..a036cc9e4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java @@ -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 ) { String name = DBHelper.getDBName(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java index 2d8f3b2ec..93eca3af1 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java @@ -545,6 +545,12 @@ public class GamesList extends XWListActivity MenuItem item = menu.findItem( id ); item.setVisible( visible ); } + + if ( visible && !DBUtils.gameDBExists( this ) ) { + MenuItem item = menu.findItem( R.id.gamel_menu_loaddb ); + item.setVisible( false ); + } + return super.onPrepareOptionsMenu( menu ); } From c76c5f5868335953c2bdc01507e72b3a53bb468b Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 20 Sep 2012 07:45:04 -0700 Subject: [PATCH 2/3] don't create obits for apps that don't have relayIDs (and presumably never connected.) --- .../XWords4/src/org/eehouse/android/xw4/GameUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java index 25ac8f8bb..15866b626 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java @@ -887,9 +887,11 @@ public class GameUtils { private static void tellRelayDied( Context context, GameSummary summary, boolean informNow ) { - DBUtils.addDeceased( context, summary.relayID, summary.seed ); - if ( informNow ) { - NetUtils.informOfDeaths( context ); + if ( null != summary.relayID ) { + DBUtils.addDeceased( context, summary.relayID, summary.seed ); + if ( informNow ) { + NetUtils.informOfDeaths( context ); + } } } From d24f9a28f63cbb8d33dcbde82fd037653ed04751 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 24 Sep 2012 07:00:18 -0700 Subject: [PATCH 3/3] up release number --- xwords4/android/XWords4-sms/res/raw/changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xwords4/android/XWords4-sms/res/raw/changes b/xwords4/android/XWords4-sms/res/raw/changes index 654ab005d..3a7181f47 100644 --- a/xwords4/android/XWords4-sms/res/raw/changes +++ b/xwords4/android/XWords4-sms/res/raw/changes @@ -6,7 +6,7 @@ -CrossW-SMS 4.4 beta 51 release +CrossW-SMS 4.4 beta 52 release

This is first release of this variant of Crosswords featuring the ability to play via SMS

@@ -21,7 +21,6 @@ ability to play via SMS

  • New word lookup URLs for Catalan language lists
  • Display wordlist comment if present
    • -

    Please remember that this is beta software. Please let me know (at