Use extra property to determine the content of messages

This commit is contained in:
Jannis Mattheis
2019-04-05 20:04:53 +02:00
parent 7622eeef21
commit be2b1e3528
2 changed files with 26 additions and 1 deletions

View File

@@ -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"));
}
}

View File

@@ -74,7 +74,11 @@ public class ListMessageAdapter extends BaseAdapter {
} }
ViewHolder holder = new ViewHolder(view); ViewHolder holder = new ViewHolder(view);
final MessageWithImage message = items.get(position); final MessageWithImage message = items.get(position);
if (Extras.useMarkdown(message.message)) {
markwon.setMarkdown(holder.message, message.message.getMessage()); markwon.setMarkdown(holder.message, message.message.getMessage());
} else {
holder.message.setText(message.message.getMessage());
}
holder.title.setText(message.message.getTitle()); holder.title.setText(message.message.getTitle());
picasso.load(Utils.resolveAbsoluteUrl(settings.url() + "/", message.image)) picasso.load(Utils.resolveAbsoluteUrl(settings.url() + "/", message.image))
.error(R.drawable.ic_alarm) .error(R.drawable.ic_alarm)