Skip to content

Commit bbd5304

Browse files
shamim-emonshamim-emon
committed
feat: add AccountSettingError.UnsupportedQuoteStyle
1 parent 35da3b5 commit bbd5304

9 files changed

Lines changed: 23 additions & 8 deletions

File tree

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/AccountSettingsModule.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.thunderbird.feature.account.settings
22

33
import kotlinx.collections.immutable.ImmutableList
4+
import net.thunderbird.components.core.logging.Logger
45
import net.thunderbird.core.common.resources.StringsResourceManager
56
import net.thunderbird.feature.account.settings.api.AccountSettingsNavigation
67
import net.thunderbird.feature.account.settings.impl.DefaultAccountSettingsNavigation
@@ -188,7 +189,7 @@ val featureAccountSettingsModule = module {
188189
viewModel { params ->
189190
SendingMailSettingsViewModel(
190191
accountId = params.get(),
191-
logger = get(),
192+
logger = get<Logger>(),
192193
getAccountName = get(),
193194
getLegacyAccount = get(),
194195
updateSendingMailSettings = get(),

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/AccountSettingsDomainContract.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,11 @@ internal interface AccountSettingsDomainContract {
128128
val message: String,
129129
) : AccountSettingError
130130

131-
data class UnsupportedMessageFormat (
131+
data class UnsupportedMessageFormat(
132+
val message: String,
133+
) : AccountSettingError
134+
135+
data class UnsupportedQuoteStyle(
132136
val message: String,
133137
) : AccountSettingError
134138
}

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/UpdateSendingMailSettings.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ internal class UpdateSendingMailSettings(
3131
account.copy(
3232
messageFormat = when (command.value) {
3333
"TEXT" -> MessageFormat.TEXT
34+
3435
"HTML" -> MessageFormat.HTML
36+
3537
"AUTO" -> MessageFormat.AUTO
38+
3639
else -> error(
3740
AccountSettingError.UnsupportedMessageFormat(
3841
message = "Invalid Message format value: ${command.value}",
@@ -58,11 +61,13 @@ internal class UpdateSendingMailSettings(
5861
account.copy(
5962
quoteStyle = when (command.value) {
6063
"PREFIX" -> QuoteStyle.PREFIX
64+
6165
"HEADER" -> QuoteStyle.HEADER
66+
6267
else -> error(
6368
AccountSettingError.UnsupportedQuoteStyle(
64-
message = "Invalid quote style value: ${command.value}"
65-
)
69+
message = "Invalid quote style value: ${command.value}",
70+
),
6671
)
6772
},
6873
)

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/fetchingMail/FetchingMailSettingsViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ internal class FetchingMailSettingsViewModel(
318318
is AccountSettingError.StorageError -> logger.error(tag = TAG, message = { error.message })
319319
is AccountSettingError.UnsupportedFormat -> logger.error(tag = TAG, message = { error.message })
320320
is AccountSettingError.UnsupportedMessageFormat -> logger.error(tag = TAG, message = { error.message })
321+
is AccountSettingError.UnsupportedQuoteStyle -> logger.error(tag = TAG, message = { error.message })
321322
}
322323
}
323324
}

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/general/GeneralSettingsViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ internal class GeneralSettingsViewModel(
9696
is AccountSettingError.StorageError -> logger.error(tag = TAG, message = { error.message })
9797
is AccountSettingError.UnsupportedFormat -> logger.error(tag = TAG, message = { error.message })
9898
is AccountSettingError.UnsupportedMessageFormat -> logger.error(tag = TAG, message = { error.message })
99+
is AccountSettingError.UnsupportedQuoteStyle -> logger.error(tag = TAG, message = { error.message })
99100
}
100101
}
101102
}

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/readingMail/ReadingMailSettingsViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ internal class ReadingMailSettingsViewModel(
155155
is AccountSettingError.StorageError -> logger.error(tag = TAG, message = { error.message })
156156
is AccountSettingError.UnsupportedFormat -> logger.error(tag = TAG, message = { error.message })
157157
is AccountSettingError.UnsupportedMessageFormat -> logger.error(tag = TAG, message = { error.message })
158+
is AccountSettingError.UnsupportedQuoteStyle -> logger.error(tag = TAG, message = { error.message })
158159
}
159160
}
160161
}

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/search/SearchSettingsViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ internal class SearchSettingsViewModel(
113113
is AccountSettingError.StorageError -> logger.error(tag = TAG, message = { error.message })
114114
is AccountSettingError.UnsupportedFormat -> logger.error(tag = TAG, message = { error.message })
115115
is AccountSettingError.UnsupportedMessageFormat -> logger.error(tag = TAG, message = { error.message })
116+
is AccountSettingError.UnsupportedQuoteStyle -> logger.error(tag = TAG, message = { error.message })
116117
}
117118
}
118119
}

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/sendingMail/SendingMailSettingsBuilder.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ internal class SendingMailSettingsBuilder(
2525
settings += readReceipt(state.readReceipt)
2626
settings += replyQuotingStyle(state.replyQuotingStyle)
2727
settings += quoteMessageWhenReplying(state.quoteMessageWhenReplying)
28-
if(state.shouldShowQuoteSettings) {
28+
if (state.shouldShowQuoteSettings) {
2929
settings += replyAfterQuotedText(state.replyAfterQuotedText)
3030
}
3131
settings += stripSignatureOnReply(state.stripSignatureOnReply)
32-
if(state.shouldShowQuoteSettings) {
32+
if (state.shouldShowQuoteSettings) {
3333
settings += quotePrefix(state.quotedTextPrefix)
3434
}
35-
if(state.supportsUpload) {
35+
if (state.supportsUpload) {
3636
settings += uploadSentMessages(state.uploadSentMessages)
3737
}
3838
settings += outgoingServer(onEvent)

‎feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/sendingMail/SendingMailSettingsViewModel.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.onEach
66
import kotlinx.coroutines.launch
77
import net.thunderbird.components.core.outcome.handle
88
import net.thunderbird.core.android.account.QuoteStyle
9-
import net.thunderbird.core.logging.Logger
9+
import net.thunderbird.components.core.logging.Logger
1010
import net.thunderbird.core.ui.contract.mvi.BaseViewModel
1111
import net.thunderbird.feature.account.AccountCapabilities
1212
import net.thunderbird.feature.account.AccountId
@@ -262,6 +262,7 @@ internal class SendingMailSettingsViewModel(
262262
is AccountSettingError.StorageError -> logger.error(tag = TAG, message = { error.message })
263263
is AccountSettingError.UnsupportedFormat -> logger.error(tag = TAG, message = { error.message })
264264
is AccountSettingError.UnsupportedMessageFormat -> logger.error(tag = TAG, message = { error.message })
265+
is AccountSettingError.UnsupportedQuoteStyle -> logger.error(tag = TAG, message = { error.message })
265266
}
266267
}
267268

0 commit comments

Comments
 (0)