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

Commit e1cc1760 authored by cketti's avatar cketti
Browse files

Remove "Count search results" setting

parent a2d11393

app/core/src/main/java/com/fsck/k9/K9.kt

+0 −5
Original line number Diff line number Diff line
@@ -240,9 +240,6 @@ object K9 : KoinComponent { 
    @JvmStatic

    var isMeasureAccounts = true



    @JvmStatic

    var isCountSearchMessages = true



    @JvmStatic

    var isHideSpecialAccounts = false
@@ -362,7 +359,6 @@ object K9 : KoinComponent { 
        isUseVolumeKeysForListNavigation = storage.getBoolean("useVolumeKeysForListNavigation", false)

        isStartInUnifiedInbox = storage.getBoolean("startIntegratedInbox", false)

        isMeasureAccounts = storage.getBoolean("measureAccounts", true)

        isCountSearchMessages = storage.getBoolean("countSearchMessages", true)

        isHideSpecialAccounts = storage.getBoolean("hideSpecialAccounts", false)

        isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)

        isShowMessageListStars = storage.getBoolean("messageListStars", true)
@@ -450,7 +446,6 @@ object K9 : KoinComponent { 


        editor.putBoolean("startIntegratedInbox", isStartInUnifiedInbox)

        editor.putBoolean("measureAccounts", isMeasureAccounts)

        editor.putBoolean("countSearchMessages", isCountSearchMessages)

        editor.putBoolean("messageListSenderAboveSubject", isMessageListSenderAboveSubject)

        editor.putBoolean("hideSpecialAccounts", isHideSpecialAccounts)

        editor.putBoolean("messageListStars", isShowMessageListStars)

app/core/src/main/java/com/fsck/k9/preferences/GlobalSettings.java

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ public class GlobalSettings { 
        s.put("confirmMarkAllRead", Settings.versions(

                new V(44, new BooleanSetting(true))

        ));

        s.put("countSearchMessages", Settings.versions(

                new V(1, new BooleanSetting(false))

        ));

        s.put("enableDebugLogging", Settings.versions(

                new V(1, new BooleanSetting(false))

        ));

app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ class GeneralSettingsDataStore( 
            "fixed_message_view_theme" -> K9.isFixedMessageViewTheme

            "animations" -> K9.isShowAnimations

            "measure_accounts" -> K9.isMeasureAccounts

            "count_search" -> K9.isCountSearchMessages

            "hide_special_accounts" -> K9.isHideSpecialAccounts

            "folderlist_wrap_folder_name" -> K9.isWrapFolderNames

            "messagelist_stars" -> K9.isShowMessageListStars
@@ -56,7 +55,6 @@ class GeneralSettingsDataStore( 
            "fixed_message_view_theme" -> K9.isFixedMessageViewTheme = value

            "animations" -> K9.isShowAnimations = value

            "measure_accounts" -> K9.isMeasureAccounts = value

            "count_search" -> K9.isCountSearchMessages = value

            "hide_special_accounts" -> K9.isHideSpecialAccounts = value

            "folderlist_wrap_folder_name" -> K9.isWrapFolderNames = value

            "messagelist_stars" -> K9.isShowMessageListStars = value

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

+0 −3
Original line number Diff line number Diff line
@@ -870,9 +870,6 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="measure_accounts_title">Show account size</string>

    <string name="measure_accounts_summary">Turn off for faster display</string>



    <string name="count_search_title">Count search results</string>

    <string name="count_search_summary">Turn off for faster display</string>



    <string name="hide_special_accounts_title">Hide Unified Inbox</string>



    <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>

app/ui/src/main/res/xml/general_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -88,11 +88,6 @@ 
                android:summary="@string/measure_accounts_summary"

                android:title="@string/measure_accounts_title" />



            <CheckBoxPreference

                android:key="count_search"

                android:summary="@string/count_search_summary"

                android:title="@string/count_search_title" />



            <CheckBoxPreference

                android:disableDependentsState="true"

                android:key="hide_special_accounts"