Explain why SMS fallback is disabled when it is

pull/1/head
Jake McGinty 11 years ago
parent 25e03b3579
commit a0aaa7d724

@ -690,7 +690,8 @@
<string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users"> <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
Increase privacy and avoid SMS fees by using the data channel for communication with other TextSecure users Increase privacy and avoid SMS fees by using the data channel for communication with other TextSecure users
</string> </string>
<string name="preferences__allow_sms_fallback">Allow SMS Fallback</string> <string name="preferences__allow_sms_fallback">SMS Fallback</string>
<string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference.</string>
<string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Send and receive SMS messages when push is not available</string> <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Send and receive SMS messages when push is not available</string>
<string name="preferences__refresh_push_directory">Refresh Push Directory</string> <string name="preferences__refresh_push_directory">Refresh Push Directory</string>

@ -210,8 +210,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
if (Util.isDefaultSmsProvider(this) || !TextSecurePreferences.isPushRegistered(this)) { if (Util.isDefaultSmsProvider(this) || !TextSecurePreferences.isPushRegistered(this)) {
allowSmsPreference.setEnabled(false); allowSmsPreference.setEnabled(false);
allowSmsPreference.setChecked(true); allowSmsPreference.setChecked(true);
allowSmsPreference.setSummary(R.string.preferences__allow_sms_fallback_disabled_reason);
} else { } else {
allowSmsPreference.setEnabled(true); allowSmsPreference.setEnabled(true);
allowSmsPreference.setSummary(R.string.preferences__send_and_receive_sms_messages_when_push_is_not_available);
} }
} else { } else {
if (TextSecurePreferences.isInterceptAllMmsEnabled(this) || if (TextSecurePreferences.isInterceptAllMmsEnabled(this) ||
@ -220,8 +222,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
{ {
allowSmsPreference.setEnabled(false); allowSmsPreference.setEnabled(false);
allowSmsPreference.setChecked(true); allowSmsPreference.setChecked(true);
allowSmsPreference.setSummary(R.string.preferences__allow_sms_fallback_disabled_reason);
} else { } else {
allowSmsPreference.setEnabled(true); allowSmsPreference.setEnabled(true);
allowSmsPreference.setSummary(R.string.preferences__send_and_receive_sms_messages_when_push_is_not_available);
} }
} }
} }

Loading…
Cancel
Save