From be2b1e352873446328f7db04365ecc389da67a3c Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Fri, 5 Apr 2019 20:04:53 +0200 Subject: [PATCH] Use extra property to determine the content of messages --- .../com/github/gotify/messages/Extras.java | 21 +++++++++++++++++++ .../gotify/messages/ListMessageAdapter.java | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/github/gotify/messages/Extras.java diff --git a/app/src/main/java/com/github/gotify/messages/Extras.java b/app/src/main/java/com/github/gotify/messages/Extras.java new file mode 100644 index 0000000..dcd6842 --- /dev/null +++ b/app/src/main/java/com/github/gotify/messages/Extras.java @@ -0,0 +1,21 @@ +package com.github.gotify.messages; + +import com.github.gotify.client.model.Message; +import java.util.Map; + +public final class Extras { + private Extras() {} + + public static boolean useMarkdown(Message message) { + if (message.getExtras() == null) { + return false; + } + + Object display = message.getExtras().get("client::display"); + if (!(display instanceof Map)) { + return false; + } + + return "text/markdown".equals(((Map) display).get("contentType")); + } +} diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java index f0645de..cb8606f 100644 --- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java +++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java @@ -74,7 +74,11 @@ public class ListMessageAdapter extends BaseAdapter { } ViewHolder holder = new ViewHolder(view); final MessageWithImage message = items.get(position); - markwon.setMarkdown(holder.message, message.message.getMessage()); + if (Extras.useMarkdown(message.message)) { + markwon.setMarkdown(holder.message, message.message.getMessage()); + } else { + holder.message.setText(message.message.getMessage()); + } holder.title.setText(message.message.getTitle()); picasso.load(Utils.resolveAbsoluteUrl(settings.url() + "/", message.image)) .error(R.drawable.ic_alarm)