Skip to content

Commit dff1926

Browse files
FabianDevelKevinBoulongne
authored andcommitted
fix(Print): Fix print not working for empty subject
1 parent e603eb1 commit dff1926

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

app/src/main/java/com/infomaniak/mail/ui/main/thread/PrintMailViewModel.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import android.print.PrintManager
2929
import android.webkit.WebView
3030
import androidx.lifecycle.ViewModel
3131
import androidx.lifecycle.viewModelScope
32+
import com.infomaniak.mail.utils.extensions.formatSubject
3233
import kotlinx.coroutines.Dispatchers
3334
import kotlinx.coroutines.launch
3435

@@ -40,11 +41,10 @@ class PrintMailViewModel : ViewModel() {
4041
webView: WebView,
4142
onFinish: () -> Unit,
4243
) = viewModelScope.launch(Dispatchers.Main) {
43-
subject?.let { subject ->
44-
val webViewPrintAdapter = PrintAdapterWrapper(webView.createPrintDocumentAdapter(subject), onFinish)
45-
val printManager = activityContext.getSystemService(Context.PRINT_SERVICE) as PrintManager
46-
printManager.print(subject, webViewPrintAdapter, null)
47-
}
44+
val protectedSubject = activityContext.formatSubject(subject)
45+
val webViewPrintAdapter = PrintAdapterWrapper(webView.createPrintDocumentAdapter(protectedSubject), onFinish)
46+
val printManager = activityContext.getSystemService(Context.PRINT_SERVICE) as PrintManager
47+
printManager.print(protectedSubject, webViewPrintAdapter, null)
4848
}
4949

5050
private class PrintAdapterWrapper(

app/src/main/java/com/infomaniak/mail/utils/PrintHeaderUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.infomaniak.mail.R
2222
import com.infomaniak.mail.data.models.correspondent.Recipient
2323
import com.infomaniak.mail.data.models.message.Message
2424
import com.infomaniak.mail.utils.MailDateFormatUtils.formatForHeader
25+
import com.infomaniak.mail.utils.extensions.formatSubject
2526
import com.infomaniak.mail.utils.extensions.toDate
2627
import org.jsoup.nodes.Element
2728
import java.util.Date
@@ -40,10 +41,9 @@ object PrintHeaderUtils {
4041
elementsToInsert.add(iconElement)
4142
elementsToInsert.add(firstSeparator)
4243

43-
message.subject?.let { subject ->
44-
val subjectElement = Element("b").appendText(subject)
45-
elementsToInsert.add(subjectElement)
46-
}
44+
val subject = context.formatSubject(message.subject)
45+
val subjectElement = Element("b").appendText(subject)
46+
elementsToInsert.add(subjectElement)
4747

4848
elementsToInsert.add(secondSeparator)
4949

0 commit comments

Comments
 (0)