diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java index ce2614082..19a4c40f8 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java @@ -2433,7 +2433,7 @@ public class BoardDelegate extends DelegateBase private void warnIfNoTransport() { if ( m_connTypes.contains( CommsConnType.COMMS_CONN_SMS ) ) { - if ( XWApp.SMSSUPPORTED && !XWPrefs.getSMSEnabled( m_activity ) ) { + if ( !XWPrefs.getSMSEnabled( m_activity ) ) { makeConfirmThenBuilder( R.string.warn_sms_disabled, Action.ENABLE_SMS_ASK ) .setPosButton( R.string.button_enable_sms ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java index e682c285a..6266e3169 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java @@ -528,7 +528,7 @@ public class ConnStatusHandler { boolean result = true; switch( connType ) { case COMMS_CONN_SMS: - result = XWApp.SMSSUPPORTED && XWPrefs.getSMSEnabled( context ) + result = XWPrefs.getSMSEnabled( context ) && !getAirplaneModeOn( context ); break; case COMMS_CONN_BT: diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java index 39ce38aae..8097ddaed 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java @@ -336,7 +336,7 @@ public class PrefsDelegate extends DelegateBase private void hideStuff() { - if ( !XWApp.SMSSUPPORTED || !Utils.isGSMPhone( m_activity ) ) { + if ( !Utils.isGSMPhone( m_activity ) ) { hideOne( R.string.key_enable_sms, R.string.key_network_behavior ); } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java index 132451707..466504da7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java @@ -40,7 +40,7 @@ public class SMSCheckBoxPreference extends ConfirmingCheckBoxPreference { protected void onAttachedToActivity() { super.onAttachedToActivity(); - if ( !XWApp.SMSSUPPORTED || !Utils.deviceSupportsSMS( getContext() ) ) { + if ( !Utils.deviceSupportsSMS( getContext() ) ) { setEnabled( false ); } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java index da12e8403..83c2127f5 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java @@ -285,7 +285,7 @@ public class SMSService extends XWService { @Override public void onCreate() { - if ( XWApp.SMSSUPPORTED && Utils.deviceSupportsSMS( this ) ) { + if ( Utils.deviceSupportsSMS( this ) ) { registerReceivers(); } else { stopSelf(); @@ -317,7 +317,7 @@ public class SMSService extends XWService { public int onStartCommand( Intent intent, int flags, int startId ) { int result = Service.START_NOT_STICKY; - if ( XWApp.SMSSUPPORTED && null != intent ) { + if ( null != intent ) { int ordinal = intent.getIntExtra( CMD_STR, -1 ); if ( -1 == ordinal ) { // ??? diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java index f9996474c..23194f76c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java @@ -36,7 +36,6 @@ public class XWApp extends Application { private static final String TAG = XWApp.class.getSimpleName(); public static final boolean BTSUPPORTED = true; - public static final boolean SMSSUPPORTED = true; public static final boolean GCMSUPPORTED = true; public static final boolean RELAYINVITE_SUPPORTED = false; public static final boolean ATTACH_SUPPORTED = false; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java index 1c6400237..b9e4aec53 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java @@ -301,7 +301,6 @@ public class UtilCtxtImpl implements UtilCtxt { public boolean phoneNumbersSame( String num1, String num2 ) { - Assert.assertTrue( XWApp.SMSSUPPORTED ); boolean same = PhoneNumberUtils.compare( m_context, num1, num2 ); return same; }