Skip to content

Improved blockquote style in WebView #2928

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
sosnovsky merged 3 commits into from
Jan 24, 2025
+4 −5
Merged

Improved blockquote style in WebView #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff40a59
Improved blockquote style in WebView.| #2901
DenBond7 Jan 22, 2025
8349855
Merge branch 'master' into issue_2901_imrove_message_details_rendering
DenBond7 Jan 23, 2025
089f245
wip
DenBond7 Jan 23, 2025
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 FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import org.json.JSONObject
import org.jsoup.Jsoup
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import org.jsoup.nodes.Node
import org.jsoup.nodes.TextNode
import org.owasp.html.HtmlPolicyBuilder
import org.pgpainless.decryption_verification.SignatureVerification
Expand Down Expand Up @@ -1262,9 +1261,10 @@ object PgpMsg {
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width"/>
<meta name="viewport" content="width=device-width">
<style>
body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }
blockquote { border-left: 1px solid #CCCCCC; margin: 0px 0px 0px 10px; padding:10px 0px 0px 10px; }
body img { display: inline !important; height: auto !important; max-width: 95% !important; }
body pre { white-space: pre-wrap !important; }
body > div.MsgBlock > table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */
Expand Down
5 changes: 2 additions & 3 deletions FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpMsgTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
* Contributors:
* Ivan Pizhenko
* Contributors: denbond7
*/

package com.flowcrypt.email.security.pgp
Expand Down Expand Up @@ -565,7 +564,7 @@ class PgpMsgTest {
val head = parts[0]
assertTrue(head.contains("<!DOCTYPE html>"))
assertTrue(head.contains("<style>"))
assertTrue(head.contains("<meta name=\"viewport\" content=\"width=device-width\"/>"))
assertTrue(head.contains("<meta name=\"viewport\" content=\"width=device-width\">"))
val foot = parts[2]
assertTrue(foot.contains("</html>"))
val body = parts[1]
Expand Down
Loading