moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-06 17:25:01 -05:00
Code Issues Releases Wiki Activity

hide encryption settings under 'expert options'

Browse Source
This commit is contained in:
iNPUTmice 2014-09-08 22:11:48 +02:00
parent 3f77e5fa55
commit d9c4637b31
2 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@ -249,5 +249,6 @@
<string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string> <string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
<string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be very careful with those</string>
</resources> </resources>

126
res/xml/preferences.xml
View File

@ -1,84 +1,90 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceCategory
android:title="@string/pref_general"> <PreferenceCategory android:title="@string/pref_general" >
<CheckBoxPreference <CheckBoxPreference
android:key="grant_new_contacts"
android:title="@string/pref_grant_presence_updates"
android:summary="@string/pref_grant_presence_updates_summary"
android:defaultValue="true" android:defaultValue="true"
/> android:key="grant_new_contacts"
<ListPreference android:summary="@string/pref_grant_presence_updates_summary"
android:key="resource" android:title="@string/pref_grant_presence_updates" />
android:title="@string/pref_xmpp_resource"
android:summary="@string/pref_xmpp_resource_summary" <ListPreference
android:defaultValue="Mobile"
android:entries="@array/resources" android:entries="@array/resources"
android:entryValues="@array/resources" android:entryValues="@array/resources"
android:defaultValue="Mobile"/> android:key="resource"
<ListPreference android:summary="@string/pref_xmpp_resource_summary"
android:key="auto_accept_file_size" android:title="@string/pref_xmpp_resource" />
android:title="@string/pref_accept_files" <ListPreference
android:summary="@string/pref_accept_files_summary" android:defaultValue="524288"
android:entries="@array/filesizes" android:entries="@array/filesizes"
android:entryValues="@array/filesizes_values" android:entryValues="@array/filesizes_values"
android:defaultValue="524288"/> android:key="auto_accept_file_size"
<CheckBoxPreference android:summary="@string/pref_accept_files_summary"
android:title="@string/pref_accept_files" />
<CheckBoxPreference
android:defaultValue="true"
android:key="confirm_messages" android:key="confirm_messages"
android:title="@string/pref_confirm_messages"
android:summary="@string/pref_confirm_messages_summary" android:summary="@string/pref_confirm_messages_summary"
android:defaultValue="true" android:title="@string/pref_confirm_messages" />
/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory android:title="@string/pref_notification_settings" >
android:title="@string/pref_notification_settings"> <CheckBoxPreference
<CheckBoxPreference android:defaultValue="true"
android:key="show_notification" android:key="show_notification"
android:title="@string/pref_notifications"
android:summary="@string/pref_notifications_summary" android:summary="@string/pref_notifications_summary"
android:title="@string/pref_notifications" />
<CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
/> android:dependency="show_notification"
<CheckBoxPreference
android:key="vibrate_on_notification" android:key="vibrate_on_notification"
android:dependency="show_notification"
android:title="@string/pref_vibrate"
android:summary="@string/pref_vibrate_summary" android:summary="@string/pref_vibrate_summary"
android:defaultValue="true"/> android:title="@string/pref_vibrate" />
<RingtonePreference
android:key="notification_ringtone" <RingtonePreference
android:title="@string/pref_sound" android:defaultValue="content://settings/system/notification_sound"
android:ringtoneType="notification"
android:dependency="show_notification" android:dependency="show_notification"
android:key="notification_ringtone"
android:ringtoneType="notification"
android:summary="@string/pref_sound_summary" android:summary="@string/pref_sound_summary"
android:defaultValue="content://settings/system/notification_sound"/> android:title="@string/pref_sound" />
<CheckBoxPreference
android:key="notify_in_conversation_when_highlighted"
android:title="@string/pref_conference_notifications"
android:summary="@string/pref_conference_notifications_summary"/>
<CheckBoxPreference <CheckBoxPreference
android:dependency="show_notification"
android:key="notify_in_conversation_when_highlighted"
android:summary="@string/pref_conference_notifications_summary"
android:title="@string/pref_conference_notifications" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="show_notification"
android:key="notification_grace_period_after_carbon_received" android:key="notification_grace_period_after_carbon_received"
android:title="@string/pref_notification_grace_period"
android:summary="@string/pref_notification_grace_period_summary" android:summary="@string/pref_notification_grace_period_summary"
android:defaultValue="true"/> android:title="@string/pref_notification_grace_period" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory android:title="@string/pref_advanced_options" >
android:title="@string/pref_encryption_settings"> <PreferenceScreen
<CheckBoxPreference android:summary="@string/pref_expert_options_summary"
android:key="force_encryption" android:title="@string/pref_expert_options" >
android:title="@string/pref_force_encryption" <PreferenceCategory android:title="@string/pref_encryption_settings" >
android:summary="@string/pref_force_encryption_summary" <CheckBoxPreference
android:defaultValue="false"/> android:defaultValue="false"
<CheckBoxPreference android:key="force_encryption"
android:key="dont_save_encrypted" android:summary="@string/pref_force_encryption_summary"
android:title="@string/pref_dont_save_encrypted" android:title="@string/pref_force_encryption" />
android:summary="@string/pref_dont_save_encrypted_summary" <CheckBoxPreference
android:defaultValue="false"/> android:defaultValue="false"
</PreferenceCategory> android:key="dont_save_encrypted"
<PreferenceCategory android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_advanced_options"> android:title="@string/pref_dont_save_encrypted" />
<CheckBoxPreference </PreferenceCategory>
</PreferenceScreen>
<CheckBoxPreference
android:defaultValue="false"
android:key="never_send" android:key="never_send"
android:title="@string/pref_never_send_crash"
android:summary="@string/pref_never_send_crash_summary" android:summary="@string/pref_never_send_crash_summary"
android:defaultValue="false"/> android:title="@string/pref_never_send_crash" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>