Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

better test for GSM phone

Browse source 
This one doesn't think a wifi-only tablet can send SMS messages.
This commit is contained in:
Eric House 2016-12-30 11:40:15 -08:00
parent e5166a62e8
commit ee042ff3cd
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2439,9 +2439,9 @@
<string name="lmi_tiles_fmt">Tiles assigned to %1$s</string> <string name="lmi_tiles_fmt">Tiles assigned to %1$s</string>
<string name="bt_no_devs">You currently have no paired Bluetooth <string name="bt_no_devs">You currently have no paired Bluetooth
devices. Would you like to open the Android Settings Panel to add devices (or Bluetooth is turned off). Would you like to open the
one or more?\n\n(You may also need to open it on the device you Android Settings Panel to add one or more?\n\n(You may also need
want to pair with.)</string> to open it on the device you want to pair with.)</string>
<string name="app_not_found_fmt">Unable to connect via Bluetooth <string name="app_not_found_fmt">Unable to connect via Bluetooth
to Crosswords on the device %1$s. Please check that the device is to Crosswords on the device %1$s. Please check that the device is
within Bluetooth range and that Crosswords is installed on within Bluetooth range and that Crosswords is installed on

6
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -2095,9 +2095,9 @@
<string name="lmi_phony_fmt">%1$s tsol a nrut</string> <string name="lmi_phony_fmt">%1$s tsol a nrut</string>
<string name="lmi_tiles_fmt">Selit dengissa ot %1$s</string> <string name="lmi_tiles_fmt">Selit dengissa ot %1$s</string>
<string name="bt_no_devs">Uoy yltnerruc evah on deriap Htooteulb <string name="bt_no_devs">Uoy yltnerruc evah on deriap Htooteulb
secived. Dluow uoy ekil ot nepo eht Diordna Sgnittes Lenap ot dda secived ro( Htooteulb si denrut )ffo. Dluow uoy ekil ot nepo eht
eno ro ?erom\n\nuOy( yam osla deen ot nepo ti no eht ecived uoy Diordna Sgnittes Lenap ot dda eno ro ?erom\n\nuOy( yam osla deen
tnaw ot riap htiw.)</string> ot nepo ti no eht ecived uoy tnaw ot riap htiw.)</string>
<string name="app_not_found_fmt">Elbanu ot tcennoc aiv Htooteulb <string name="app_not_found_fmt">Elbanu ot tcennoc aiv Htooteulb
ot Sdrowssorc no eht ecived %1$s. Esaelp kcehc taht eht ecived si ot Sdrowssorc no eht ecived %1$s. Esaelp kcehc taht eht ecived si
nihtiw Htooteulb egnar dna taht Sdrowssorc si dellatsni no nihtiw Htooteulb egnar dna taht Sdrowssorc si dellatsni no

6
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -2095,9 +2095,9 @@
<string name="lmi_phony_fmt">%1$s LOST A TURN</string> <string name="lmi_phony_fmt">%1$s LOST A TURN</string>
<string name="lmi_tiles_fmt">TILES ASSIGNED TO %1$s</string> <string name="lmi_tiles_fmt">TILES ASSIGNED TO %1$s</string>
<string name="bt_no_devs">YOU CURRENTLY HAVE NO PAIRED BLUETOOTH <string name="bt_no_devs">YOU CURRENTLY HAVE NO PAIRED BLUETOOTH
DEVICES. WOULD YOU LIKE TO OPEN THE ANDROID SETTINGS PANEL TO ADD DEVICES (OR BLUETOOTH IS TURNED OFF). WOULD YOU LIKE TO OPEN THE
ONE OR MORE?\n\n(YOU MAY ALSO NEED TO OPEN IT ON THE DEVICE YOU ANDROID SETTINGS PANEL TO ADD ONE OR MORE?\n\n(YOU MAY ALSO NEED
WANT TO PAIR WITH.)</string> TO OPEN IT ON THE DEVICE YOU WANT TO PAIR WITH.)</string>
<string name="app_not_found_fmt">UNABLE TO CONNECT VIA BLUETOOTH <string name="app_not_found_fmt">UNABLE TO CONNECT VIA BLUETOOTH
TO CROSSWORDS ON THE DEVICE %1$s. PLEASE CHECK THAT THE DEVICE IS TO CROSSWORDS ON THE DEVICE %1$s. PLEASE CHECK THAT THE DEVICE IS
WITHIN BLUETOOTH RANGE AND THAT CROSSWORDS IS INSTALLED ON WITHIN BLUETOOTH RANGE AND THAT CROSSWORDS IS INSTALLED ON

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
View file

@ -132,7 +132,10 @@ public class Utils {
if ( Perms23.havePermission( Perm.READ_PHONE_STATE ) ) { if ( Perms23.havePermission( Perm.READ_PHONE_STATE ) ) {
TelephonyManager tm = (TelephonyManager) TelephonyManager tm = (TelephonyManager)
context.getSystemService( Context.TELEPHONY_SERVICE ); context.getSystemService( Context.TELEPHONY_SERVICE );
result = null != tm; if ( null != tm ) {
int type = tm.getPhoneType();
result = TelephonyManager.PHONE_TYPE_GSM == type;
}
} }
DbgUtils.logd( TAG, "deviceSupportsSMS() => %b", result ); DbgUtils.logd( TAG, "deviceSupportsSMS() => %b", result );
return result; return result;