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

Use "imap" prefix for "useCompression" properties

Browse source
This commit is contained in:
cketti 2023-06-28 14:30:16 +02:00
parent 428b586c88
commit e43ea29378
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigContent.kt
View file

@ -191,9 +191,9 @@ internal fun AccountIncomingConfigContent(
item {
CheckboxInput(
text = stringResource(id = R.string.account_setup_incoming_config_compression_label),
checked = state.useCompression,
onCheckedChange = { onEvent(Event.UseCompressionChanged(it)) },
text = stringResource(id = R.string.account_setup_incoming_config_imap_compression_label),
checked = state.imapUseCompression,
onCheckedChange = { onEvent(Event.ImapUseCompressionChanged(it)) },
contentPadding = defaultItemPadding(),
)
}

4
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigContract.kt
View file

@ -28,7 +28,7 @@ interface AccountIncomingConfigContract {
val clientCertificate: String = "",
val imapAutodetectNamespaceEnabled: Boolean = true,
val imapPrefix: StringInputField = StringInputField(),
val useCompression: Boolean = true,
val imapUseCompression: Boolean = true,
val isSuccess: Boolean = false,
val error: Error? = null,
@ -45,7 +45,7 @@ interface AccountIncomingConfigContract {
data class ClientCertificateChanged(val clientCertificate: String) : Event()
data class ImapAutoDetectNamespaceChanged(val enabled: Boolean) : Event()
data class ImapPrefixChanged(val imapPrefix: String) : Event()
data class UseCompressionChanged(val useCompression: Boolean) : Event()
data class ImapUseCompressionChanged(val useCompression: Boolean) : Event()
object OnNextClicked : Event()
object OnBackClicked : Event()

2
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigViewModel.kt
View file

@ -49,7 +49,7 @@ internal class AccountIncomingConfigViewModel(
it.copy(imapPrefix = it.imapPrefix.updateValue(event.imapPrefix))
}
is Event.UseCompressionChanged -> updateState { it.copy(useCompression = event.useCompression) }
is Event.ImapUseCompressionChanged -> updateState { it.copy(imapUseCompression = event.useCompression) }
Event.OnNextClicked -> onNext()
Event.OnBackClicked -> onBack()

2
feature/account/setup/src/main/res/values/strings.xml
View file

@ -45,7 +45,7 @@
<string name="account_setup_incoming_config_security_label">Security</string>
<string name="account_setup_incoming_config_imap_namespace_label">Auto-detect IMAP namespace</string>
<string name="account_setup_incoming_config_imap_prefix_label">IMAP path prefix</string>
<string name="account_setup_incoming_config_compression_label">Use compression</string>
<string name="account_setup_incoming_config_imap_compression_label">Use compression</string>
<string name="account_setup_incoming_config_loading_message">Checking incoming server settings…</string>
<string name="account_setup_incoming_config_loading_error">Checking incoming server settings failed!</string>
<string name="account_setup_incoming_config_success">Incoming server settings are valid!</string>

2
feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigStateMapperKtTest.kt
View file

@ -26,7 +26,7 @@ class AccountIncomingConfigStateMapperKtTest {
clientCertificate = "",
imapAutodetectNamespaceEnabled = true,
imapPrefix = StringInputField(value = "prefix"),
useCompression = true,
imapUseCompression = true,
)
val result = incomingState.toServerSettings()

2
feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigStateTest.kt
View file

@ -26,7 +26,7 @@ class AccountIncomingConfigStateTest {
password = StringInputField(),
clientCertificate = "",
imapAutodetectNamespaceEnabled = true,
useCompression = true,
imapUseCompression = true,
),
)
}

8
feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/incoming/AccountIncomingConfigViewModelTest.kt
View file

@ -152,12 +152,12 @@ class AccountIncomingConfigViewModelTest {
}
@Test
fun `should change state when UseCompressionChanged event is received`() = runTest {
fun `should change state when ImapUseCompressionChanged event is received`() = runTest {
eventStateTest(
viewModel = testSubject,
initialState = State(useCompression = true),
event = Event.UseCompressionChanged(false),
expectedState = State(useCompression = false),
initialState = State(imapUseCompression = true),
event = Event.ImapUseCompressionChanged(false),
expectedState = State(imapUseCompression = false),
coroutineScope = backgroundScope,
)
}