");
+ break;
default:
out.print("
"+quoteUser+
"
"+ format(dataQuote) + "
");
@@ -639,10 +645,11 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
switch (message.getMessageType()) {
case TEXT_MESSAGE:
+ case TEMPLATE_QUOTE:
if (message.getData() != null && !message.getData().isBlank()) {
out.print(format(message.getData()) + "
"); //$NON-NLS-1$
}
- // Some (rare) text messages have thumbs
+ // Some textual messages may have thumbs
printThumb(out, message);
break;
case UNKNOWN_MEDIA_MESSAGE:
@@ -694,26 +701,7 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
break;
case TEMPLATE_MESSAGE:
printThumb(out, message);
- if (message.getData() != null && !message.getData().isBlank()) {
- out.println(format(message.getData()) + "
");
- }
- MessageTemplate t = message.getMessageTemplate();
- if (t != null) {
- String content = t.getContent();
- if (content != null && !content.isBlank()) {
- out.println(format(content) + "
");
- }
- for (MessageTemplate.Button button : t.getButtons()) {
- String text = button.getText();
- if (text != null && !text.isBlank()) {
- out.println("
[" + format(text) + "]");
- }
- String extra = button.getExtra();
- if (extra != null && !extra.isBlank() && !extra.equals(text)) {
- out.println(format(extra) + "
");
- }
- }
- }
+ out.println(formatTemplate(message));
break;
case POLL_MESSAGE:
printThumb(out, message);
@@ -1020,6 +1008,31 @@ private void printThumb(PrintWriter out, Message message) {
}
}
+ private String formatTemplate(Message message) {
+ StringBuilder sb = new StringBuilder();
+ if (message.getData() != null && !message.getData().isBlank()) {
+ sb.append(format(message.getData())).append("
");
+ }
+ MessageTemplate t = message.getMessageTemplate();
+ if (t != null) {
+ String content = t.getContent();
+ if (content != null && !content.isBlank()) {
+ sb.append(format(content)).append("
");
+ }
+ for (MessageTemplate.Button button : t.getButtons()) {
+ String text = button.getText();
+ if (text != null && !text.isBlank()) {
+ sb.append("
[").append(format(text)).append("]");
+ }
+ String extra = button.getExtra();
+ if (extra != null && !extra.isBlank() && !extra.equals(text)) {
+ sb.append(format(extra)).append("
");
+ }
+ }
+ }
+ return sb.toString();
+ }
+
private String getBestContactName(Message message, WAContactsDirectory contactsDirectory, WAAccount account) {
return getBestContactName(message.isFromMe(), message.getRemoteResource(), contactsDirectory, account);
}