|
|
@ -3580,10 +3580,6 @@ public class MessageHelper {
|
|
|
|
"text/x-patch".equalsIgnoreCase(contentType.getBaseType());
|
|
|
|
"text/x-patch".equalsIgnoreCase(contentType.getBaseType());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
boolean isLog() {
|
|
|
|
|
|
|
|
return "text/x-log".equalsIgnoreCase(contentType.getBaseType());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean isReport() {
|
|
|
|
boolean isReport() {
|
|
|
|
String ct = contentType.getBaseType();
|
|
|
|
String ct = contentType.getBaseType();
|
|
|
|
return (Report.isDeliveryStatus(ct) ||
|
|
|
|
return (Report.isDeliveryStatus(ct) ||
|
|
|
@ -4007,7 +4003,7 @@ public class MessageHelper {
|
|
|
|
Log.e(ex);
|
|
|
|
Log.e(ex);
|
|
|
|
result = HtmlHelper.formatPlainText(result);
|
|
|
|
result = HtmlHelper.formatPlainText(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (h.isPatch() || h.isLog()) {
|
|
|
|
} else if (h.isPatch()) {
|
|
|
|
result = (first ? "" : "<br><hr>") +
|
|
|
|
result = (first ? "" : "<br><hr>") +
|
|
|
|
"<pre style=\"font-family: monospace; font-size:small;\">" +
|
|
|
|
"<pre style=\"font-family: monospace; font-size:small;\">" +
|
|
|
|
HtmlHelper.formatPlainText(result) +
|
|
|
|
HtmlHelper.formatPlainText(result) +
|
|
|
@ -5139,8 +5135,7 @@ public class MessageHelper {
|
|
|
|
|
|
|
|
|
|
|
|
if ("text/markdown".equalsIgnoreCase(ct) ||
|
|
|
|
if ("text/markdown".equalsIgnoreCase(ct) ||
|
|
|
|
"text/x-diff".equalsIgnoreCase(ct) ||
|
|
|
|
"text/x-diff".equalsIgnoreCase(ct) ||
|
|
|
|
"text/x-patch".equalsIgnoreCase(ct) ||
|
|
|
|
"text/x-patch".equalsIgnoreCase(ct))
|
|
|
|
"text/x-log".equalsIgnoreCase(ct))
|
|
|
|
|
|
|
|
parts.extra.add(new PartHolder(part, contentType));
|
|
|
|
parts.extra.add(new PartHolder(part, contentType));
|
|
|
|
|
|
|
|
|
|
|
|
if (Report.isDeliveryStatus(ct) ||
|
|
|
|
if (Report.isDeliveryStatus(ct) ||
|
|
|
|