From f4b366c4bd97131499bb28018cfa7b235b7e0571 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 1 Mar 2023 10:07:59 -0500 Subject: [PATCH] Fixing merge issue on reported Types --- .../java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 1611492036..5913ca458a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -317,8 +317,8 @@ fun NoteCompose( ) } } else if (noteEvent is ReportEvent) { - val reportType = noteEvent.reportType.map { - when (it) { + val reportType = (noteEvent.reportedPost + noteEvent.reportedAuthor).map { + when (it.reportType) { ReportEvent.ReportType.EXPLICIT -> stringResource(R.string.explicit_content) ReportEvent.ReportType.NUDITY -> stringResource(R.string.nudity) ReportEvent.ReportType.PROFANITY -> stringResource(R.string.profanity_hateful_speech)