ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/2847_fix-injecting-dark-style-in-sent-message' into 'develop' 

Fix injecting dark style in sent messages when the app is in dark mode

See merge request android/mail/proton-mail-android!1063
This commit is contained in:
Maciej Surmacz 2022-04-21 12:32:07 +00:00
parent 9ccf56e1df c72bb87103
commit 30abccbfe2
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/ch/protonmail/android/compose/ComposeMessageViewModel.kt
View File

@ -51,6 +51,8 @@ import ch.protonmail.android.contacts.details.presentation.model.ContactLabelUiM
import ch.protonmail.android.core.Constants
import ch.protonmail.android.core.Constants.MessageLocationType
import ch.protonmail.android.core.UserManager
import ch.protonmail.android.crypto.CipherText
import ch.protonmail.android.crypto.Crypto.Companion.forAddress
import ch.protonmail.android.data.local.model.Attachment
import ch.protonmail.android.data.local.model.LocalAttachment
import ch.protonmail.android.data.local.model.Message
@ -93,6 +95,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import me.proton.core.accountmanager.domain.AccountManager
import me.proton.core.domain.entity.UserId
import me.proton.core.user.domain.entity.AddressId
import me.proton.core.util.kotlin.DispatcherProvider
import me.proton.core.util.kotlin.EMPTY_STRING
import timber.log.Timber
@ -984,7 +987,7 @@ class ComposeMessageViewModel @Inject constructor(
messageBodySetup.webViewVisibility = false
messageBodySetup.respondInlineVisibility = false
}
setInitialMessageContent(builder.toString())
setInitialMessageContent()
setContent(builder.toString())
messageBodySetup.respondInline = false
messageBodySetup.isPlainText = isPlainText
@ -1073,6 +1076,35 @@ class ComposeMessageViewModel @Inject constructor(
.build()
}
private fun setInitialMessageContent() {
// Initial message content is the content that in the end is sent as the quoted text when replying/forwarding
// We need this to be the clean HTML message body, instead of the styled one that we show in the composer
viewModelScope.launch {
_parentId?.let { parentMessageId ->
val message = messageDetailsRepository.findMessageById(parentMessageId).first()
val decryptedMessageBody = message?.messageBody?.let { messageBody ->
try {
val crypto = forAddress(
userManager, userManager.requireCurrentUserId(), AddressId(message.addressID!!)
)
crypto.decrypt(CipherText(messageBody)).decryptedData
} catch (e: Exception) {
Timber.w(e, "Decryption error")
null
}
}
decryptedMessageBody?.let {
val builder = StringBuilder()
builder.append("<blockquote class=\"protonmail_quote\">")
builder.append(NEW_LINE)
builder.append(it)
builder.append("</div>")
setInitialMessageContent(builder.toString())
}
}
}
}
fun addSendPreferences(sendPreference: SendPreference) {
var sendPreferencesTemp: Map<String, SendPreference> = _messageDataResult.sendPreferences
sendPreferencesTemp += sendPreference.emailAddress to sendPreference