From f8cfb9cc44bac8b4efad6890e4736a7879cb98d1 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 21 May 2016 14:35:53 -0700
Subject: [PATCH] change string and enum name to indicate Bluetooth is where
 the connect failure is.

---
 xwords4/android/XWords4/res/values/strings.xml             | 7 ++++---
 .../XWords4/src/org/eehouse/android/xw4/BTService.java     | 2 +-
 .../XWords4/src/org/eehouse/android/xw4/DelegateBase.java  | 2 +-
 .../XWords4/src/org/eehouse/android/xw4/MultiService.java  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index cd8c589a1..3e8d6371f 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2415,9 +2415,10 @@
 	devices. Would you like to open the Android Settings Panel to add
 	one or more?\n\n(You may also need to open it on the device you
 	want to pair with.)</string>
-	<string name="app_not_found_fmt">Unable to connect to Crosswords
-	on the device %1$s.  Please check that the device is within range
-	and that Crosswords is installed on it.</string>
+	<string name="app_not_found_fmt">Unable to connect via Bluetooth
+	to Crosswords on the device %1$s.  Please check that the device is
+	within Bluetooth range and that Crosswords is installed on
+	it.</string>
 
 	<!-- label within default wordlists in app preferences -->
 	<string name="default_language">Default language</string>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
index 3d2f21d87..68391c216 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
@@ -828,7 +828,7 @@ public class BTService extends XWService {
                     }
 
                     if ( null == reply ) {
-                        sendResult( MultiEvent.APP_NOT_FOUND, dev.getName() );
+                        sendResult( MultiEvent.APP_NOT_FOUND_BT, dev.getName() );
                     } else {
                         switch ( reply ) {
                         case BAD_PROTO:
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
index d566504a9..743eb3094 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
@@ -597,7 +597,7 @@ public class DelegateBase implements DlgClickNotify,
         case BAD_PROTO_SMS:
             fmtId = R.string.sms_bad_proto_fmt;
             break;
-        case APP_NOT_FOUND:
+        case APP_NOT_FOUND_BT:
             fmtId = R.string.app_not_found_fmt;
             break;
         case RELAY_ALERT:
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
index 3a666d45b..7aaa75946 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
@@ -61,7 +61,7 @@ public class MultiService {
     public enum MultiEvent { _INVALID,
                              BAD_PROTO_BT,
                              BAD_PROTO_SMS,
-                             APP_NOT_FOUND,
+                             APP_NOT_FOUND_BT,
                              BT_ENABLED,
                              BT_DISABLED,
                              SCAN_DONE,