Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fbcce726 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8254 from cketti/remove_unused_settings 

Remove unused settings
parents 49e00c47 ddc96511

legacy/core/src/main/res/values/arrays_account_settings_values.xml

+0 −16
Original line number Diff line number Diff line
@@ -95,14 +95,6 @@ 
        <item>ALWAYS</item>

    </string-array>



    <string-array name="folder_sync_mode_values" translatable="false">

        <item>ALL</item>

        <item>FIRST_CLASS</item>

        <item>FIRST_AND_SECOND_CLASS</item>

        <item>NOT_SECOND_CLASS</item>

        <item>NONE</item>

    </string-array>



    <string-array name="push_limit_values" translatable="false">

        <item>5</item>

        <item>10</item>
@@ -114,14 +106,6 @@ 
        <item>1000</item>

    </string-array>



    <string-array name="folder_notify_new_mail_mode_values" translatable="false">

        <item>ALL</item>

        <item>FIRST_CLASS</item>

        <item>FIRST_AND_SECOND_CLASS</item>

        <item>NOT_SECOND_CLASS</item>

        <item>NONE</item>

    </string-array>



    <string-array name="delete_policy_values" translatable="false">

        <item>NEVER</item>

        <item>ON_DELETE</item>

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt

+0 −2
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ class AccountSettingsDataStore( 
            "sent_folder" -> loadSpecialFolder(account.sentFolderId, account.sentFolderSelection)

            "spam_folder" -> loadSpecialFolder(account.spamFolderId, account.spamFolderSelection)

            "trash_folder" -> loadSpecialFolder(account.trashFolderId, account.trashFolderSelection)

            "folder_notify_new_mail_mode" -> account.folderNotifyNewMailMode.name

            "account_combined_vibration" -> getCombinedVibrationValue()

            "account_remote_search_num_results" -> account.remoteSearchNumResults.toString()

            "account_ringtone" -> account.notificationSettings.ringtone
@@ -166,7 +165,6 @@ class AccountSettingsDataStore( 
            "sent_folder" -> saveSpecialFolderSelection(value, account::setSentFolderId)

            "spam_folder" -> saveSpecialFolderSelection(value, account::setSpamFolderId)

            "trash_folder" -> saveSpecialFolderSelection(value, account::setTrashFolderId)

            "folder_notify_new_mail_mode" -> account.folderNotifyNewMailMode = Account.FolderMode.valueOf(value)

            "account_combined_vibration" -> setCombinedVibrationValue(value)

            "account_remote_search_num_results" -> account.remoteSearchNumResults = value.toInt()

            "account_ringtone" -> setNotificationSound(value)

legacy/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml

+0 −16
Original line number Diff line number Diff line
@@ -66,14 +66,6 @@ 
        <item>@string/account_settings_show_pictures_always</item>

    </string-array>



    <string-array name="folder_sync_mode_entries">

        <item>@string/account_settings_folder_sync_mode_all</item>

        <item>@string/account_settings_folder_sync_mode_first_class</item>

        <item>@string/account_settings_folder_sync_mode_first_and_second_class</item>

        <item>@string/account_settings_folder_sync_mode_not_second_class</item>

        <item>@string/account_settings_folder_sync_mode_none</item>

    </string-array>



    <string-array name="push_limit_entries">

        <item>@string/account_setup_push_limit_5</item>

        <item>@string/account_setup_push_limit_10</item>
@@ -85,14 +77,6 @@ 
        <item>@string/account_setup_push_limit_1000</item>

    </string-array>



    <string-array name="folder_notify_new_mail_mode_entries">

        <item>@string/account_settings_folder_notify_new_mail_mode_all</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_first_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_first_and_second_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_not_second_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_none</item>

    </string-array>



    <string-array name="delete_policy_entries">

        <item>@string/account_setup_incoming_delete_policy_never_label</item>

        <item>@string/account_setup_incoming_delete_policy_delete_label</item>

legacy/ui/legacy/src/main/res/values/strings.xml

+0 −14
Original line number Diff line number Diff line
@@ -376,13 +376,6 @@ 
    <string name="account_settings_title_fmt">Account settings</string>

    <string name="account_settings_notify_label">New mail notifications</string>



    <string name="account_settings_folder_notify_new_mail_mode_label">Notifications folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_all">All</string>

    <string name="account_settings_folder_notify_new_mail_mode_first_class">Only 1st Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1st and 2nd Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_not_second_class">All except 2nd Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_none">None</string>



    <string name="account_settings_notify_sync_label">Sync notifications</string>

    <string name="account_settings_email_label">Your email address</string>

    <string name="account_settings_notify_summary">Notify in status bar when mail arrives</string>
@@ -488,13 +481,6 @@ 
    <string name="account_settings_message_age_6_months">the last 6 months</string>

    <string name="account_settings_message_age_1_year">the last year</string>



    <string name="account_settings_folder_sync_mode_label">Poll folders</string>

    <string name="account_settings_folder_sync_mode_all">All</string>

    <string name="account_settings_folder_sync_mode_first_class">Only 1st Class folders</string>

    <string name="account_settings_folder_sync_mode_first_and_second_class">1st and 2nd Class folders</string>

    <string name="account_settings_folder_sync_mode_not_second_class">All except 2nd Class folders</string>

    <string name="account_settings_folder_sync_mode_none">None</string>



    <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>

    <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>

legacy/ui/legacy/src/main/res/xml/account_settings.xml

+0 −19
Original line number Diff line number Diff line
@@ -93,15 +93,6 @@ 
            android:title="@string/account_settings_mail_check_frequency_label"

            />



        <ListPreference

            android:dialogTitle="@string/account_settings_folder_sync_mode_label"

            android:entries="@array/folder_sync_mode_entries"

            android:entryValues="@array/folder_sync_mode_values"

            android:key="folder_sync_mode"

            app:useSimpleSummaryProvider="true"

            android:title="@string/account_settings_folder_sync_mode_label"

            />



        <CheckBoxPreference

            android:defaultValue="true"

            android:key="account_sync_remote_deletetions"
@@ -315,16 +306,6 @@ 
            android:title="@string/account_settings_notify_label"

            />



        <ListPreference

            android:dependency="account_notify"

            android:dialogTitle="@string/account_settings_folder_notify_new_mail_mode_label"

            android:entries="@array/folder_notify_new_mail_mode_entries"

            android:entryValues="@array/folder_notify_new_mail_mode_values"

            android:key="folder_notify_new_mail_mode"

            app:useSimpleSummaryProvider="true"

            android:title="@string/account_settings_folder_notify_new_mail_mode_label"

            />



        <CheckBoxPreference

            android:defaultValue="true"

            android:dependency="account_notify"