Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

get rid of raw-string toast error messages

Browse source 
They were hacks for debugging SMS early on, probably infrequently
seen. Instead post messages. BUT: they aren't being received because of
how listeners get cleared in onPause(). Needs to be fixed, but there's
no harm in having them dangle for now.
This commit is contained in:
Eric House 2016-12-30 20:11:02 -08:00
parent 62aabc8cbc
commit 250f4b0139
7 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/archive/R.java
View file

@ -6011,6 +6011,7 @@ XLATE-ME
/** <string name="sms_ready_text">Tap the receiving device now</string>
*/
public static final int sms_ready_text=0x7f050288;
public static final int sms_send_failed=0x7f05035d;
/** <string name="square_tiles">Square rack tiles</string>
*/
public static final int square_tiles=0x7f050278;

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

@ -2741,5 +2741,6 @@
<string name="remove_sms">Remove SMS</string>
<string name="contact_not_found">Not in Contacts</string>
<string name="sms_send_failed">SMS send failed</string>
</resources>

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

@ -2340,4 +2340,5 @@
rednes lliw eb deyalpsid.</string>
<string name="remove_sms">Evomer SMS</string>
<string name="contact_not_found">Ton ni Stcatnoc</string>
<string name="sms_send_failed">SMS dnes deliaf</string>
</resources>

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

@ -2340,4 +2340,5 @@
SENDER WILL BE DISPLAYED.</string>
<string name="remove_sms">REMOVE SMS</string>
<string name="contact_not_found">NOT IN CONTACTS</string>
<string name="sms_send_failed">SMS SEND FAILED</string>
</resources>

9
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -1272,13 +1272,8 @@ public class BoardDelegate extends DelegateBase
break;
case SMS_SEND_FAILED:
case SMS_SEND_FAILED_NORADIO:
// if ( null != m_jniThread ) {
// boolean accepted =
// MultiService.MultiEvent.SMS_RECEIVE_OK == event
// || MultiService.MultiEvent.SMS_SEND_OK == event;
// m_jniThread.handle( JNICmd.CMD_DRAW_SMS_STATUS, accepted );
// }
case SMS_SEND_FAILED_NOPERMISSION:
DbgUtils.showf( m_activity, R.string.sms_send_failed );
break;
default:

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

@ -85,6 +85,7 @@ public class MultiService {
SMS_SEND_OK,
SMS_SEND_FAILED,
SMS_SEND_FAILED_NORADIO,
SMS_SEND_FAILED_NOPERMISSION,
BT_GAME_CREATED,
BT_ERR_COUNT,

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

@ -680,8 +680,7 @@ public class SMSService extends XWService {
} catch ( NullPointerException npe ) {
Assert.fail(); // shouldn't be trying to do this!!!
} catch ( java.lang.SecurityException se ) {
DbgUtils.logd( TAG, "caught SecurityException; "
+ "no SEND_SMS permission?" );
postEvent( MultiEvent.SMS_SEND_FAILED_NOPERMISSION );
} catch ( Exception ee ) {
DbgUtils.logex( TAG, ee );
}
@ -719,11 +718,9 @@ public class SMSService extends XWService {
postEvent( MultiEvent.SMS_SEND_OK );
break;
case SmsManager.RESULT_ERROR_RADIO_OFF:
DbgUtils.showf( SMSService.this, "NO RADIO!!!" );
postEvent( MultiEvent.SMS_SEND_FAILED_NORADIO );
break;
case SmsManager.RESULT_ERROR_NO_SERVICE:
DbgUtils.showf( SMSService.this, "NO SERVICE!!!" );
default:
DbgUtils.logw( TAG, "FAILURE!!!" );
postEvent( MultiEvent.SMS_SEND_FAILED );