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

change string and enum name to indicate Bluetooth is where the connect

Browse source 
failure is.
This commit is contained in:
Eric House 2016-05-21 14:35:53 -07:00
parent f001455589
commit f8cfb9cc44
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/android/XWords4/res/values/strings.xml
View file

@ -2415,9 +2415,10 @@
devices. Would you like to open the Android Settings Panel to add 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 one or more?\n\n(You may also need to open it on the device you
want to pair with.)</string> want to pair with.)</string>
<string name="app_not_found_fmt">Unable to connect to Crosswords <string name="app_not_found_fmt">Unable to connect via Bluetooth
on the device %1$s. Please check that the device is within range to Crosswords on the device %1$s. Please check that the device is
and that Crosswords is installed on it.</string> within Bluetooth range and that Crosswords is installed on
it.</string>
<!-- label within default wordlists in app preferences --> <!-- label within default wordlists in app preferences -->
<string name="default_language">Default language</string> <string name="default_language">Default language</string>

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

@ -828,7 +828,7 @@ public class BTService extends XWService {
} }
if ( null == reply ) { if ( null == reply ) {
sendResult( MultiEvent.APP_NOT_FOUND, dev.getName() ); sendResult( MultiEvent.APP_NOT_FOUND_BT, dev.getName() );
} else { } else {
switch ( reply ) { switch ( reply ) {
case BAD_PROTO: case BAD_PROTO:

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

@ -597,7 +597,7 @@ public class DelegateBase implements DlgClickNotify,
case BAD_PROTO_SMS: case BAD_PROTO_SMS:
fmtId = R.string.sms_bad_proto_fmt; fmtId = R.string.sms_bad_proto_fmt;
break; break;
case APP_NOT_FOUND: case APP_NOT_FOUND_BT:
fmtId = R.string.app_not_found_fmt; fmtId = R.string.app_not_found_fmt;
break; break;
case RELAY_ALERT: case RELAY_ALERT:

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

@ -61,7 +61,7 @@ public class MultiService {
public enum MultiEvent { _INVALID, public enum MultiEvent { _INVALID,
BAD_PROTO_BT, BAD_PROTO_BT,
BAD_PROTO_SMS, BAD_PROTO_SMS,
APP_NOT_FOUND, APP_NOT_FOUND_BT,
BT_ENABLED, BT_ENABLED,
BT_DISABLED, BT_DISABLED,
SCAN_DONE, SCAN_DONE,