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

Disable body height restriction in EntireMessageBody flow

Browse Source 
- Prevent full-message screen from inheriting preview height caps, which blocks
    scrolling in EntireMessageBodyScreen
    - pass forceDisableHeightRestriction=true when mapping body UI model in EntireMessageBodyViewModel
    - keep preview restriction behavior unchanged for conversation detail flow

ET-6187
This commit is contained in:
Serdar Ozturk
2026-05-08 14:00:32 +01:00
committed by MargeBot
parent de3be56ba9
commit b1da8c24ab
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-detail/presentation/src/main/kotlin/ch/protonmail/android/maildetail/presentation/mapper/MessageBodyUiModelMapper.kt
+5 -2
View File
@@ -45,10 +45,13 @@ class MessageBodyUiModelMapper @Inject constructor(
suspend fun toUiModel(
decryptedMessageBody: DecryptedMessageBody,
attachmentListExpandCollapseMode: AttachmentListExpandCollapseMode?,
existingMessageBodyUiModel: MessageBodyUiModel? = null
existingMessageBodyUiModel: MessageBodyUiModel? = null,
forceDisableHeightRestriction: Boolean = false
): MessageBodyUiModel {
val shouldRestrictWebViewHeight =
hasMessageBodyWebViewCrashed() && restrictMessageWebViewHeightEnabled.get()
!forceDisableHeightRestriction &&
hasMessageBodyWebViewCrashed() &&
restrictMessageWebViewHeightEnabled.get()
val decryptedMessageBodyWithType = MessageBodyWithType(
decryptedMessageBody.value,
mail-detail/presentation/src/main/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/EntireMessageBodyViewModel.kt
+6 -1
View File
@@ -167,7 +167,12 @@ class EntireMessageBodyViewModel @Inject constructor(
ifRight = {
mutableState.value = mutableState.value.copy(
messageBodyState = MessageBodyState.Data(
messageBodyUiModel = messageBodyUiModelMapper.toUiModel(it, null)
messageBodyUiModel = messageBodyUiModelMapper.toUiModel(
decryptedMessageBody = it,
attachmentListExpandCollapseMode = null,
existingMessageBodyUiModel = null,
forceDisableHeightRestriction = true
)
),
requestPhishingLinkConfirmation = it.banners.contains(MessageBanner.PhishingAttempt)
)
mail-detail/presentation/src/test/kotlin/ch/protonmail/android/maildetail/presentation/viewmodel/EntireMessageBodyViewModelTest.kt
+18 -3
View File
@@ -128,7 +128,12 @@ class EntireMessageBodyViewModelTest {
getMessageBodyWithClickableLinks(UserIdTestData.userId, MessageId(MESSAGE_ID), any())
} returns decryptedMessageBody.right()
coEvery {
messageBodyUiModelMapper.toUiModel(decryptedMessageBody, null)
messageBodyUiModelMapper.toUiModel(
decryptedMessageBody = decryptedMessageBody,
attachmentListExpandCollapseMode = null,
existingMessageBodyUiModel = null,
forceDisableHeightRestriction = true
)
} returns messageBodyUiModel
// When
@@ -224,7 +229,12 @@ class EntireMessageBodyViewModelTest {
getMessageBodyWithClickableLinks(UserIdTestData.userId, MessageId(MESSAGE_ID), any())
} returns decryptedMessageBody.right()
coEvery {
messageBodyUiModelMapper.toUiModel(decryptedMessageBody, null)
messageBodyUiModelMapper.toUiModel(
decryptedMessageBody = decryptedMessageBody,
attachmentListExpandCollapseMode = null,
existingMessageBodyUiModel = null,
forceDisableHeightRestriction = true
)
} returns messageBodyUiModel
// When
@@ -247,7 +257,12 @@ class EntireMessageBodyViewModelTest {
getMessageBodyWithClickableLinks(UserIdTestData.userId, MessageId(MESSAGE_ID), any())
} returns decryptedMessageBody.right()
coEvery {
messageBodyUiModelMapper.toUiModel(decryptedMessageBody, null)
messageBodyUiModelMapper.toUiModel(
decryptedMessageBody = decryptedMessageBody,
attachmentListExpandCollapseMode = null,
existingMessageBodyUiModel = null,
forceDisableHeightRestriction = true
)
} returns messageBodyUiModel
// When