TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-02 07:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option that allows disabling MMS fallback with TS users.

Browse Source 
// FREEBIE

Closes #1444
This commit is contained in:
Moxie Marlinspike
2014-12-11 16:10:11 -08:00
parent ff05642f3e
commit 3c4ac4b105
9 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/preferences_advanced.xml
View File

@@ -16,6 +16,11 @@
android:title="@string/preferences__choose_identity"
android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/>
<CheckBoxPreference android:defaultValue="true"
android:key="pref_auto_complete_key_exchange"
android:title="@string/preferences__complete_key_exchanges"
android:summary="@string/preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key" />
<Preference android:key="pref_submit_debug_logs"
android:title="@string/preferences__submit_debug_log"/>
</PreferenceScreen>

7
res/xml/preferences_sms_mms.xml
View File

@@ -17,7 +17,7 @@
<org.thoughtcrime.securesms.components.OutgoingSmsPreference
android:key="pref_outgoing_sms"
android:title="@string/preferences__allow_sms_fallback" />
android:title="@string/preferences__sms_fallback" />
<CheckBoxPreference android:defaultValue="false"
android:key="pref_delivery_report_sms"
@@ -27,9 +27,4 @@
<Preference android:key="pref_mms_preferences"
android:title="@string/preferences__advanced_mms_access_point_names"/>
<CheckBoxPreference android:defaultValue="true"
android:key="pref_auto_complete_key_exchange"
android:title="@string/preferences__complete_key_exchanges"
android:summary="@string/preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key" />
</PreferenceScreen>