Proton/android-mail
1
0
Fork 0
mirror of https://github.com/ProtonMail/android-mail.git synced 2026-05-15 09:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split usecase into two entry points

Browse Source 
MAILANDR-2566: delete action for spam/trash
This commit is contained in:
Rok Oblak
2025-04-11 19:49:25 +07:00
committed by MargeBot
parent 398ce42a52
commit 46a69c31a2
6 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-detail/domain/src/main/kotlin/ch/protonmail/android/maildetail/domain/usecase/GetDetailBottomSheetActions.kt
+9 -11
View File
@@ -30,18 +30,16 @@ class GetDetailBottomSheetActions @Inject constructor(
@CustomizeToolbarFeatureEnabled val isCustomizeToolbarEnabled: Boolean
) {
operator fun invoke(
conversation: Conversation?,
message: Message,
affectingConversation: Boolean
): List<Action> {
operator fun invoke(conversation: Conversation?, affectingConversation: Boolean): List<Action> {
val showDelete = affectingConversation && conversation?.allMessagesAreSpamOrTrash() == true
return getActions(showDelete = showDelete, affectingConversation = affectingConversation)
}
operator fun invoke(message: Message): List<Action> =
getActions(showDelete = message.isSpamOrTrash(), affectingConversation = false)
private fun getActions(showDelete: Boolean, affectingConversation: Boolean): List<Action> {
val showCustomizeToolbar = isCustomizeToolbarEnabled
val showDelete = when {
conversation != null -> {
affectingConversation && conversation.allMessagesAreSpamOrTrash()
}
else -> message.isSpamOrTrash()
}
return mutableListOf<Action>().apply {
if (!affectingConversation) {
mail-detail/domain/src/test/kotlin/ch/protonmail/android/maildetail/domain/usecase/GetDetailBottomSheetActionsTest.kt
+10 -10
View File
@@ -62,7 +62,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(false)
// When
val result = sut(null, normalMessage, affectingConversation = false)
val result = sut(normalMessage)
// Then
assertEquals(
@@ -91,7 +91,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(null, normalMessage, affectingConversation = false)
val result = sut(normalMessage)
// Then
assertEquals(
@@ -121,7 +121,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(null, spamMessage, affectingConversation = false)
val result = sut(spamMessage)
// Then
assertEquals(
@@ -151,7 +151,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(false)
// When
val result = sut(null, trashMessage, affectingConversation = false)
val result = sut(trashMessage)
// Then
assertEquals(
@@ -180,7 +180,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(normalConversation, trashMessage, affectingConversation = true)
val result = sut(normalConversation, affectingConversation = true)
// Then
assertEquals(
@@ -205,7 +205,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(trashedConversation, trashMessage, affectingConversation = true)
val result = sut(trashedConversation, affectingConversation = true)
// Then
assertEquals(
@@ -225,12 +225,12 @@ class GetDetailBottomSheetActionsTest {
}
@Test
fun `returns correct actions for a spam conversation message with toolbar FF enabled`() = runTest {
fun `returns correct actions for a spam conversation with toolbar FF enabled`() = runTest {
// Given
customizeToolbarFeatureEnabled(true)
// When
val result = sut(spamConversation, normalMessage, affectingConversation = true)
val result = sut(spamConversation, affectingConversation = true)
// Then
assertEquals(
@@ -255,7 +255,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(normalConversation, trashMessage, affectingConversation = true)
val result = sut(normalConversation, affectingConversation = true)
// Then
assertEquals(
@@ -280,7 +280,7 @@ class GetDetailBottomSheetActionsTest {
customizeToolbarFeatureEnabled(true)
// When
val result = sut(normalConversation, trashMessage, affectingConversation = false)
val result = sut(normalConversation, affectingConversation = false)
// Then
assertEquals(
mail-detail/presentation/src/main/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/ConversationDetailViewModel.kt
+1 -1
View File
@@ -857,7 +857,7 @@ class ConversationDetailViewModel @Inject constructor(
val actions = getBottomSheetActions(
conversation = conversation,
affectingConversation = affectingConversation, message = message
affectingConversation = affectingConversation
)
val event = ConversationDetailEvent.ConversationBottomSheetEvent(
mail-detail/presentation/src/main/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/MessageDetailViewModel.kt
+1 -1
View File
@@ -505,7 +505,7 @@ class MessageDetailViewModel @Inject constructor(
return@let resolveParticipantName(message.sender, it)
}?.name ?: message.sender.name
val actions = getBottomSheetActions(conversation = null, affectingConversation = false, message = message)
val actions = getBottomSheetActions(message = message)
val event = MessageDetailEvent.MessageBottomSheetEvent(
DetailMoreActionsBottomSheetState.MessageDetailMoreActionsBottomSheetEvent.DataLoaded(
mail-detail/presentation/src/test/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/ConversationDetailViewModelTest.kt
+1 -1
View File
@@ -366,7 +366,7 @@ class ConversationDetailViewModelTest {
private val updateCustomizeToolbarSpotlight = mockk<UpdateCustomizeToolbarSpotlight>()
private val getBottomSheetActions = mockk<GetDetailBottomSheetActions> {
every { this@mockk.invoke(any(), any(), any()) } returns listOf(Action.Archive)
every { this@mockk.invoke(any(), any()) } returns listOf(Action.Archive)
}
private val testDispatcher: TestDispatcher by lazy {
mail-detail/presentation/src/test/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/MessageDetailViewModelTest.kt
+1 -1
View File
@@ -395,7 +395,7 @@ class MessageDetailViewModelTest {
private val updateCustomizeToolbarSpotlight = mockk<UpdateCustomizeToolbarSpotlight>()
private val getBottomSheetActions = mockk<GetDetailBottomSheetActions> {
every { this@mockk.invoke(any(), any(), any()) } returns listOf(Action.Archive)
every { this@mockk.invoke(any()) } returns listOf(Action.Archive)
}
private val messageDetailReducer = MessageDetailReducer(