From 4d0a825e43223094051628633a43cfef3826c240 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 23 Feb 2015 21:16:53 -0800 Subject: [PATCH 1/3] fix NPE downloading .xwd files --- .../XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java index 1a66b0add..59111d7f2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java @@ -273,6 +273,7 @@ public class DwnldDelegate extends ListDelegateBase { || uri.toString().endsWith( XWConstants.DICT_EXTN ) ) { item = (LinearLayout)inflate( R.layout.import_dict_item ); dft = new DownloadFilesTask( uri, item, false ); + uris = new Uri[] { uri }; } if ( null != dft ) { From 64cf060c4e7e8d3081d627070aea4a3625616429 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 23 Feb 2015 21:35:42 -0800 Subject: [PATCH 2/3] up version code and add to changelist --- xwords4/android/XWords4/AndroidManifest.xml | 2 +- xwords4/android/XWords4/assets/changes.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml index 99a038bd3..946e0f2ff 100644 --- a/xwords4/android/XWords4/AndroidManifest.xml +++ b/xwords4/android/XWords4/AndroidManifest.xml @@ -22,7 +22,7 @@ to come from a domain that you own or have control over. --> diff --git a/xwords4/android/XWords4/assets/changes.html b/xwords4/android/XWords4/assets/changes.html index ed5624ec6..f3c3bee55 100644 --- a/xwords4/android/XWords4/assets/changes.html +++ b/xwords4/android/XWords4/assets/changes.html @@ -33,6 +33,7 @@
  • Replace "Do not show again" button in new-player hint dialogs with a checkbox
  • Resend pending messages every time game is opened
    • +
  • Fix crash downloading wordlists

    • (The full changelog From 7229d110a044d520e0bd3deb7e7ea35249428ba7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 23 Feb 2015 21:51:25 -0800 Subject: [PATCH 3/3] go ahead an up the beta version number too --- xwords4/android/XWords4/assets/changes.html | 4 ++-- xwords4/android/XWords4/res/values/app_name.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xwords4/android/XWords4/assets/changes.html b/xwords4/android/XWords4/assets/changes.html index f3c3bee55..42affc4f6 100644 --- a/xwords4/android/XWords4/assets/changes.html +++ b/xwords4/android/XWords4/assets/changes.html @@ -13,7 +13,7 @@ -

    Crosswords 4.4 beta 93 release

    +

    Crosswords 4.4 beta 94 release

    This is an interim release making low-level network changes that need to be out there before the next, more ambitious set of changes @@ -29,7 +29,7 @@

    New with this release

    • Change "protocol" of messages passed between games - to include more information.
      • + to include more information
    • Replace "Do not show again" button in new-player hint dialogs with a checkbox
    • Resend pending messages every time game is opened
      • diff --git a/xwords4/android/XWords4/res/values/app_name.xml b/xwords4/android/XWords4/res/values/app_name.xml index b7b563c68..8bfe44306 100644 --- a/xwords4/android/XWords4/res/values/app_name.xml +++ b/xwords4/android/XWords4/res/values/app_name.xml @@ -1,5 +1,5 @@ - 4.4 beta 93 + 4.4 beta 94