From 57e2dd5492f5074ad71b9840c8c99e99d768a806 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 24 Mar 2014 06:55:13 -0700
Subject: [PATCH] make remote/robot score report dialog non-blocking to fix
 ugly first-game experience

---
 .../src/org/eehouse/android/xw4/BoardActivity.java       | 9 ++++-----
 .../XWords4/src/org/eehouse/android/xw4/DlgID.java       | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index 62e343375..dc671af54 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -329,7 +329,7 @@ public class BoardActivity extends XWActivity
 
             case QUERY_REQUEST_BLK:
             case QUERY_INFORM_BLK:
-            case DLG_SCORES_BLK:
+            case DLG_SCORES:
             case DLG_BADWORDS_BLK: 
                 ab = new AlertDialog.Builder( this )
                     .setMessage( m_dlgBytes );
@@ -353,7 +353,7 @@ public class BoardActivity extends XWActivity
                             }
                         };
                     ab.setNegativeButton( R.string.button_no, lstnr );
-                } else if ( DlgID.DLG_SCORES_BLK == dlgID ) {
+                } else if ( DlgID.DLG_SCORES == dlgID ) {
                     if ( null != m_words && m_words.length > 0 ) {
                         String buttonTxt;
                         boolean studyOn = XWPrefs.getStudyEnabled( this );
@@ -1682,10 +1682,8 @@ public class BoardActivity extends XWActivity
         @Override
         public void informMove( String expl, String words )
         {
-            m_dlgBytes = expl;
-            m_dlgTitle = R.string.info_title;
             m_words = null == words? null : wordsToArray( words );
-            waitBlockingDialog( DlgID.DLG_SCORES_BLK, 0 );
+            nonBlockingDialog( DlgID.DLG_SCORES, expl );
         }
 
         @Override
@@ -2030,6 +2028,7 @@ public class BoardActivity extends XWActivity
     {
         switch ( dlgID ) {
         case DLG_OKONLY:
+        case DLG_SCORES:
             m_dlgTitle = R.string.info_title;
             break;
         case DLG_USEDICT:
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java
index 411848d13..6c0b7f6dc 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java
@@ -58,14 +58,13 @@ public enum DlgID {
     ,WARN_NODICT
     ,WARN_NODICT_NEW
     ,WARN_NODICT_SUBST
-    , BLOCKING_DLG_NONE
     , DLG_BADWORDS_BLK
     , QUERY_REQUEST_BLK
     , QUERY_INFORM_BLK
     , PICK_TILE_REQUESTBLANK_BLK
     , ASK_PASSWORD_BLK
     , DLG_RETRY
-    , DLG_SCORES_BLK
+    , DLG_SCORES
     , PICK_TILE_REQUESTTRAY_BLK
     , DLG_USEDICT
     , DLG_GETDICT