Merge pull request #8043 from thunderbird/remove_searchable_folders (a8523dc7) · Commits · e / os / Mail

legacy/core/src/main/java/com/fsck/k9/Account.kt

+0 −10

Original line number	Diff line number	Diff line
		@@ -227,10 +227,6 @@ class Account(override val uuid: String) : BaseAccount {
		@set:Synchronized
		var isSendClientInfoEnabled = true

		@get:Synchronized
		@set:Synchronized
		var searchableFolders = Searchable.ALL

		@get:Synchronized
		@set:Synchronized
		var isSubscribedFoldersOnly = false
		@@ -622,12 +618,6 @@ class Account(override val uuid: String) : BaseAccount {
		ONLY_FROM_CONTACTS,
		}

		enum class Searchable {
		ALL,
		DISPLAYABLE,
		NONE,
		}

		enum class QuoteStyle {
		PREFIX,
		HEADER,

legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt

+0 −7

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ import com.fsck.k9.Account.Expunge
		import com.fsck.k9.Account.FolderMode
		import com.fsck.k9.Account.MessageFormat
		import com.fsck.k9.Account.QuoteStyle
		import com.fsck.k9.Account.Searchable
		import com.fsck.k9.Account.ShowPictures
		import com.fsck.k9.Account.SortType
		import com.fsck.k9.Account.SpecialFolderSelection
		@@ -178,8 +177,6 @@ class AccountPreferenceSerializer(

		folderPushMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderPushMode", FolderMode.NONE)

		searchableFolders = getEnumStringPref<Searchable>(storage, "$accountUuid.searchableFolders", Searchable.ALL)

		isSignatureBeforeQuotedText = storage.getBoolean("$accountUuid.signatureBeforeQuotedText", false)
		replaceIdentities(loadIdentities(accountUuid, storage))

		@@ -320,7 +317,6 @@ class AccountPreferenceSerializer(
		editor.putString("$accountUuid.expungePolicy", expungePolicy.name)
		editor.putBoolean("$accountUuid.syncRemoteDeletions", isSyncRemoteDeletions)
		editor.putInt("$accountUuid.maxPushFolders", maxPushFolders)
		editor.putString("$accountUuid.searchableFolders", searchableFolders.name)
		editor.putInt("$accountUuid.chipColor", chipColor)
		editor.putBoolean("$accountUuid.subscribedFoldersOnly", isSubscribedFoldersOnly)
		editor.putInt("$accountUuid.maximumPolledMessageAge", maximumPolledMessageAge)
		@@ -432,7 +428,6 @@ class AccountPreferenceSerializer(
		editor.remove("$accountUuid.expungePolicy")
		editor.remove("$accountUuid.syncRemoteDeletions")
		editor.remove("$accountUuid.maxPushFolders")
		editor.remove("$accountUuid.searchableFolders")
		editor.remove("$accountUuid.chipColor")
		editor.remove("$accountUuid.notificationLight")
		editor.remove("$accountUuid.subscribedFoldersOnly")
		@@ -621,8 +616,6 @@ class AccountPreferenceSerializer(
		setTrashFolderId(null, SpecialFolderSelection.AUTOMATIC)
		setArchiveFolderId(null, SpecialFolderSelection.AUTOMATIC)

		searchableFolders = Searchable.ALL

		identities = ArrayList<Identity>()

		val identity = Identity(

legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ import com.fsck.k9.Account.Expunge;
		import com.fsck.k9.Account.FolderMode;
		import com.fsck.k9.Account.MessageFormat;
		import com.fsck.k9.Account.QuoteStyle;
		import com.fsck.k9.Account.Searchable;
		import com.fsck.k9.Account.ShowPictures;
		import com.fsck.k9.Account.SortType;
		import com.fsck.k9.Account.SpecialFolderSelection;
		@@ -174,9 +173,6 @@ public class AccountSettingsDescriptions {
		s.put("ringtone", Settings.versions(
		new V(1, new RingtoneSetting("content://settings/system/notification_sound"))
		));
		s.put("searchableFolders", Settings.versions(
		new V(1, new EnumSetting<>(Searchable.class, Searchable.ALL))
		));
		s.put("sentFolderName", Settings.versions(
		new V(1, new StringSetting(FOLDER_NONE)),
		new V(53, new StringSetting(null))

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -102,12 +102,6 @@
		<item>ALWAYS</item>
		</string-array>

		<string-array name="searchable_values" translatable="false">
		<item>ALL</item>
		<item>DISPLAYABLE</item>
		<item>NONE</item>
		</string-array>

		<string-array name="folder_sync_mode_values" translatable="false">
		<item>ALL</item>
		<item>FIRST_CLASS</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
		@@ -128,7 +128,6 @@ class AccountSettingsDataStore(
		loadSpecialFolder(account.autoExpandFolderId, SpecialFolderSelection.MANUAL)
		}
		"folder_display_mode" -> account.folderDisplayMode.name
		"searchable_folders" -> account.searchableFolders.name
		"archive_folder" -> loadSpecialFolder(account.archiveFolderId, account.archiveFolderSelection)
		"drafts_folder" -> loadSpecialFolder(account.draftsFolderId, account.draftsFolderSelection)
		"sent_folder" -> loadSpecialFolder(account.sentFolderId, account.sentFolderSelection)
		@@ -172,7 +171,6 @@ class AccountSettingsDataStore(
		"account_quote_prefix" -> account.quotePrefix = value
		"account_setup_auto_expand_folder" -> account.autoExpandFolderId = extractFolderId(value)
		"folder_display_mode" -> account.folderDisplayMode = Account.FolderMode.valueOf(value)
		"searchable_folders" -> account.searchableFolders = Account.Searchable.valueOf(value)
		"archive_folder" -> saveSpecialFolderSelection(value, account::setArchiveFolderId)
		"drafts_folder" -> saveSpecialFolderSelection(value, account::setDraftsFolderId)
		"sent_folder" -> saveSpecialFolderSelection(value, account::setSentFolderId)