Skip to content

feat: Make possible to report a thread or message as phishing from spam folder #2883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FabianDevel merged 4 commits into from
Apr 28, 2026
+10 −9
Merged

feat: Make possible to report a thread or message as phishing from spam folder #2883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67a31cd
feat: Make possible to report a thread or message as phishing from sp…
solrubado Apr 23, 2026
3248857
fix: Remove multi selection after phishing option was selected
solrubado Apr 23, 2026
67a864e
fix: Remove unnecessary MainViewModel since its inside a with(MainVie…
solrubado Apr 23, 2026
233a9d3
fix: Remove unnecessary phishing visibility change.
solrubado Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...c/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import com.infomaniak.mail.ui.main.folderPicker.FolderPickerFragmentArgs
import com.infomaniak.mail.ui.main.thread.PrintMailFragmentArgs
import com.infomaniak.mail.ui.main.thread.ThreadFragment.Companion.OPEN_REACTION_BOTTOM_SHEET
import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setBlockUserUi
import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setSpamPhishingUi
import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setSpamUi
import com.infomaniak.mail.utils.FolderRoleUtils
import com.infomaniak.mail.utils.extensions.animatedNavigation
import com.infomaniak.mail.utils.extensions.archiveWithConfirmationPopup
Expand Down Expand Up @@ -96,7 +96,7 @@ class MessageActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
setArchiveUi(isFromArchive = folderRole == FolderRole.ARCHIVE)
setFavoriteUi(message.isFavorite)
setReactionUi(message.isValidReactionTarget)
setSpamPhishingUi(binding.spam, binding.phishing, isFromSpam)
setSpamUi(binding.spam, isFromSpam)

observeReportPhishingResult()
observePotentialBlockedSenders()
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
description = resources.getQuantityString(R.plurals.reportPhishingDescription, messages.count()),
onPositiveButtonClicked = { mainViewModel.reportPhishing(threadsUids, messages) },
)

isMultiSelectOn = false
Comment thread
FabianDevel marked this conversation as resolved.
}

binding.blockSender.setClosingOnClickListener {
Expand All @@ -178,7 +180,7 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
junkMessagesViewModel.messageOfUserToBlock.value = message
}
}
mainViewModel.isMultiSelectOn = false
isMultiSelectOn = false
}

binding.favorite.setClosingOnClickListener(shouldCloseMultiSelection = true) {
Expand Down Expand Up @@ -281,9 +283,8 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
}

setSnoozeUi(threads)
ThreadActionsBottomSheetDialog.setSpamPhishingUi(
ThreadActionsBottomSheetDialog.setSpamUi(
spam = binding.spam,
phishing = binding.phishing,
isFromSpam = mainViewModel.currentFolder.value?.role == FolderRole.SPAM
)
hideFirstActionItemDivider()
Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
setFavoriteUi(thread.isFavorite)
setSnoozeUi(thread.isSnoozed())
setReactionUi(canBeReactedTo = messageUidToReactTo != null)
setSpamPhishingUi(binding.spam, binding.phishing, isFromSpam)
setSpamUi(binding.spam, isFromSpam)

initOnClickListener(onActionClick(thread, messageUidToExecuteAction, messageUidToReactTo))
}
Expand Down Expand Up @@ -263,6 +263,8 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
description = resources.getQuantityString(R.plurals.reportPhishingDescription, thread.messages.count()),
onPositiveButtonClicked = { mainViewModel.reportPhishing(junkMessagesViewModel.threadsUids, junkMessages) },
)

mainViewModel.isMultiSelectOn = false
}
Comment thread
solrubado marked this conversation as resolved.

override fun onBlockSender() {
Expand Down Expand Up @@ -321,7 +323,7 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
const val TAG = "ThreadActionsBottomSheetDialog"
const val OPEN_SNOOZE_BOTTOM_SHEET = "openSnoozeBottomSheet"

fun setSpamPhishingUi(spam: ActionItemView, phishing: ActionItemView, isFromSpam: Boolean) {
fun setSpamUi(spam: ActionItemView, isFromSpam: Boolean) {
spam.apply {
val (text, icon) = if (isFromSpam) {
R.string.actionNonSpam to R.drawable.ic_non_spam
Expand All @@ -333,8 +335,6 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
setIconResource(icon)
isVisible = true
}

phishing.isVisible = !isFromSpam
}

fun setBlockUserUi(blockSender: ActionItemView, potentialUsersToBlock: Map<Recipient, Message>, isFromSpam: Boolean) {
Expand Down
Loading