Commit b8715e50 authored by Thomas Markiewicz's avatar Thomas Markiewicz

Fixed crashes after merging from upstream.

parent c33f8c07
Pipeline #4186 passed with stage
in 23 minutes and 38 seconds
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools">
<PreferenceCategory
android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
......@@ -199,44 +197,17 @@
android:title="@string/settings_notification_privacy" />
<im.vector.preference.VectorPreference
android:dialogTitle="@string/settings_notification_ringtone"
android:key="SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY"
android:title="@string/settings_notification_ringtone" />
android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:key="SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/settings_notification_advanced_summary"
android:title="@string/settings_notification_advanced"
app:fragment="im.vector.fragments.VectorSettingsNotificationsAdvancedFragment" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY_2"
android:title="@string/settings_containing_my_display_name" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_CONTAINING_MY_USER_NAME_PREFERENCE_KEY_2"
android:title="@string/settings_containing_my_user_name" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY_2"
android:title="@string/settings_messages_in_one_to_one" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY_2"
android:title="@string/settings_messages_in_group_chat" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_INVITED_TO_ROOM_PREFERENCE_KEY_2"
android:title="@string/settings_invited_to_room" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_CALL_INVITATIONS_PREFERENCE_KEY_2"
android:title="@string/settings_call_invitations" />
<im.vector.preference.BingRulePreference
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY_2"
android:title="@string/settings_messages_sent_by_bot" />
<im.vector.preference.VectorPreference
android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"
android:title="@string/settings_notification_troubleshoot"
app:fragment="im.vector.fragments.VectorSettingsNotificationsTroubleshootFragment" />
</PreferenceCategory>
......@@ -247,6 +218,7 @@
android:title="@string/settings_background_sync">
<im.vector.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
android:title="@string/settings_start_on_boot" />
......@@ -362,6 +334,22 @@
android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"
android:title="@string/encryption_information_device_key" />
<im.vector.preference.VectorSwitchPreference
android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
android:summary="@string/encryption_never_send_to_unverified_devices_summary"
android:title="@string/encryption_never_send_to_unverified_devices_title" />
</PreferenceCategory>
<im.vector.preference.VectorPreferenceDivider />
<PreferenceCategory android:title="@string/settings_cryptography_manage_keys">
<im.vector.preference.VectorPreference
android:key="SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/encryption_settings_manage_message_recovery_summary"
android:title="@string/encryption_settings_manage_message_recovery" />
<im.vector.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_EXPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
android:summary="@string/encryption_export_room_keys_summary"
......@@ -372,14 +360,9 @@
android:summary="@string/encryption_import_room_keys_summary"
android:title="@string/encryption_import_e2e_room_keys" />
<im.vector.preference.VectorSwitchPreference
android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
android:summary="@string/encryption_never_send_to_unverified_devices_summary"
android:title="@string/encryption_never_send_to_unverified_devices_title" />
</PreferenceCategory>
<im.vector.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
<im.vector.preference.VectorPreferenceDivider />
<!-- devices list: device ids + device names -->
<PreferenceCategory
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment