wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set "inboxFolderName" and "autoExpandFolderName" to null by default

Browse source
This commit is contained in:
cketti 2019-12-12 00:26:29 +01:00
parent df2711d520
commit 059d0ed7cb
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/core/src/main/java/com/fsck/k9/Account.java
View file

@ -28,11 +28,6 @@ import org.jetbrains.annotations.Nullable;
* Account stores all of the settings for a single account defined by the user. Each account is defined by a UUID.
*/
public class Account implements BaseAccount, StoreConfig {
/**
* Default value for the inbox folder (never changes for POP3 and IMAP)
*/
public static final String INBOX = "INBOX";
/**
* This local folder is used to store messages to be sent.
*/

9
app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
View file

@ -6,7 +6,6 @@ import com.fsck.k9.Account.DEFAULT_SYNC_INTERVAL
import com.fsck.k9.Account.DeletePolicy
import com.fsck.k9.Account.Expunge
import com.fsck.k9.Account.FolderMode
import com.fsck.k9.Account.INBOX
import com.fsck.k9.Account.MessageFormat
import com.fsck.k9.Account.NO_OPENPGP_KEY
import com.fsck.k9.Account.QuoteStyle
@ -52,7 +51,7 @@ class AccountPreferenceSerializer(
isNotifyContactsMailOnly = storage.getBoolean("$accountUuid.notifyContactsMailOnly", false)
isNotifySync = storage.getBoolean("$accountUuid.notifyMailCheck", false)
deletePolicy = DeletePolicy.fromInt(storage.getInt("$accountUuid.deletePolicy", DeletePolicy.NEVER.setting))
inboxFolder = storage.getString("$accountUuid.inboxFolderName", INBOX)
inboxFolder = storage.getString("$accountUuid.inboxFolderName", null)
val draftsFolder = storage.getString("$accountUuid.draftsFolderName", null)
val draftsFolderSelection = getEnumStringPref<SpecialFolderSelection>(storage, "$accountUuid.draftsFolderSelection",
@ -104,7 +103,7 @@ class AccountPreferenceSerializer(
setCompression(type, useCompression)
}
autoExpandFolder = storage.getString("$accountUuid.autoExpandFolderName", INBOX)
autoExpandFolder = storage.getString("$accountUuid.autoExpandFolderName", null)
accountNumber = storage.getInt("$accountUuid.accountNumber", UNASSIGNED_ACCOUNT_NUMBER)
@ -525,8 +524,8 @@ class AccountPreferenceSerializer(
showPictures = ShowPictures.NEVER
isSignatureBeforeQuotedText = false
expungePolicy = Expunge.EXPUNGE_IMMEDIATELY
autoExpandFolder = INBOX
inboxFolder = INBOX
autoExpandFolder = null
inboxFolder = null
maxPushFolders = 10
isGoToUnreadMessageSearch = false
isSubscribedFoldersOnly = false