diff --git a/res/values/strings.xml b/res/values/strings.xml index 308e8571ee..c34ce05649 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -690,7 +690,8 @@ Increase privacy and avoid SMS fees by using the data channel for communication with other TextSecure users - Allow SMS Fallback + SMS Fallback + TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference. Send and receive SMS messages when push is not available Refresh Push Directory diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 7534464c68..ef8f54885f 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -210,8 +210,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr if (Util.isDefaultSmsProvider(this) || !TextSecurePreferences.isPushRegistered(this)) { allowSmsPreference.setEnabled(false); allowSmsPreference.setChecked(true); + allowSmsPreference.setSummary(R.string.preferences__allow_sms_fallback_disabled_reason); } else { allowSmsPreference.setEnabled(true); + allowSmsPreference.setSummary(R.string.preferences__send_and_receive_sms_messages_when_push_is_not_available); } } else { if (TextSecurePreferences.isInterceptAllMmsEnabled(this) || @@ -220,8 +222,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr { allowSmsPreference.setEnabled(false); allowSmsPreference.setChecked(true); + allowSmsPreference.setSummary(R.string.preferences__allow_sms_fallback_disabled_reason); } else { allowSmsPreference.setEnabled(true); + allowSmsPreference.setSummary(R.string.preferences__send_and_receive_sms_messages_when_push_is_not_available); } } }