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

Make sure account display name is never null

Browse source
This commit is contained in:
cketti 2018-07-23 12:54:09 +02:00
parent b35074315c
commit 91164e04ed
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -776,6 +776,10 @@ public class Account implements BaseAccount, StoreConfig {
this.description = description;
}
public String getDisplayName() {
return description != null ? description : getEmail();
}
public synchronized String getName() {
return identities.get(0).getName();
}

2
app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt
View file

@ -27,7 +27,7 @@ class ImapBackendFactory(
override val transportUriPrefix = "smtp"
override fun createBackend(account: Account): Backend {
val accountName = account.description
val accountName = account.displayName
val backendStorage = K9BackendStorage(preferences, account, account.localStore)
val imapStore = createImapStore(account)
val smtpTransport = createSmtpTransport(account)

2
app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt
View file

@ -21,7 +21,7 @@ class Pop3BackendFactory(private val context: Context, private val preferences:
override val transportUriPrefix = "smtp"
override fun createBackend(account: Account): Backend {
val accountName = account.description
val accountName = account.displayName
val backendStorage = K9BackendStorage(preferences, account, account.localStore)
val pop3Store = createPop3Store(account)
val smtpTransport = createSmtpTransport(account)

2
app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt
View file

@ -17,7 +17,7 @@ class WebDavBackendFactory(private val preferences: Preferences) : BackendFactor
override val transportUriPrefix = "webdav"
override fun createBackend(account: Account): Backend {
val accountName = account.description
val accountName = account.displayName
val backendStorage = K9BackendStorage(preferences, account, account.localStore)
val serverSettings = WebDavStoreUriDecoder.decode(account.storeUri)
val webDavStore = createWebDavStore(serverSettings, account)