sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category

This commit is contained in:
Daniel Gultsch 2015-07-31 00:51:30 +02:00
parent 74ab36fda2
commit 5191e4ce95
2 changed files with 75 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/res/values/strings.xml
View File

@ -474,7 +474,6 @@
<string name="received_location">Received location</string>
<string name="title_undo_swipe_out_conversation">Conversation closed</string>
<string name="title_undo_swipe_out_muc">Left conference</string>
<string name="pref_certificate_options">Certificate options</string>
<string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
<string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
<string name="pref_remove_trusted_certificates_title">Remove certificates</string>

59
src/main/res/xml/preferences.xml
View File

@ -37,8 +37,8 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_notification_settings"
android:key="notifications">
android:key="notifications"
android:title="@string/pref_notification_settings">
<CheckBoxPreference
android:defaultValue="true"
android:key="show_notification"
@ -46,9 +46,9 @@
android:title="@string/pref_notifications"/>
<PreferenceScreen
android:dependency="show_notification"
android:key="quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
android:title="@string/title_pref_quiet_hours"
android:key="quiet_hours">
android:title="@string/title_pref_quiet_hours">
<CheckBoxPreference
android:defaultValue="false"
android:key="enable_quiet_hours"
@ -106,13 +106,13 @@
android:summary="@string/pref_use_send_button_to_indicate_status_summary"
android:title="@string/pref_use_send_button_to_indicate_status"/>
<ListPreference
android:key="quick_action"
android:defaultValue="recent"
android:dialogTitle="@string/choose_quick_action"
android:entries="@array/quick_actions"
android:entryValues="@array/quick_action_values"
android:key="quick_action"
android:summary="@string/pref_quick_action_summary"
android:title="@string/pref_quick_action"
android:dialogTitle="@string/choose_quick_action"/>
android:title="@string/pref_quick_action"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="show_dynamic_tags"
@ -120,46 +120,39 @@
android:title="@string/pref_show_dynamic_tags"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_advanced_options"
android:key="advanced">
android:key="advanced"
android:title="@string/pref_advanced_options">
<PreferenceScreen
android:key="expert"
android:summary="@string/pref_expert_options_summary"
android:title="@string/pref_expert_options"
android:key="expert">
android:title="@string/pref_expert_options">
<PreferenceCategory android:title="@string/pref_encryption_settings">
<CheckBoxPreference
android:defaultValue="false"
android:key="force_encryption"
android:summary="@string/pref_force_encryption_summary"
android:title="@string/pref_force_encryption" />
<CheckBoxPreference
android:defaultValue="false"
android:key="dont_save_encrypted"
android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_dont_save_encrypted"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="dont_trust_system_cas"
android:summary="@string/pref_dont_trust_system_cas_summary"
android:title="@string/pref_dont_trust_system_cas_title"/>
<Preference
android:key="remove_trusted_certificates"
android:summary="@string/pref_remove_trusted_certificates_summary"
android:title="@string/pref_remove_trusted_certificates_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_input_options">
<CheckBoxPreference
android:defaultValue="false"
android:key="enter_is_send"
android:title="@string/pref_enter_is_send"
android:summary="@string/pref_enter_is_send_summary" />
android:summary="@string/pref_enter_is_send_summary"
android:title="@string/pref_enter_is_send"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="display_enter_key"
android:title="@string/pref_display_enter_key"
android:summary="@string/pref_display_enter_key_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_certificate_options">
<CheckBoxPreference
android:defaultValue="false"
android:key="dont_trust_system_cas"
android:title="@string/pref_dont_trust_system_cas_title"
android:summary="@string/pref_dont_trust_system_cas_summary" />
<Preference
android:key="remove_trusted_certificates"
android:title="@string/pref_remove_trusted_certificates_title"
android:summary="@string/pref_remove_trusted_certificates_summary" />
android:summary="@string/pref_display_enter_key_summary"
android:title="@string/pref_display_enter_key"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_expert_options_other">
<CheckBoxPreference
@ -170,8 +163,8 @@
<CheckBoxPreference
android:defaultValue="false"
android:key="keep_foreground_service"
android:title="@string/pref_keep_foreground_service"
android:summary="@string/pref_keep_foreground_service_summary" />
android:summary="@string/pref_keep_foreground_service_summary"
android:title="@string/pref_keep_foreground_service"/>
</PreferenceCategory>
</PreferenceScreen>