diff --git a/webui/src/main/java/com/muwire/webui/TrustServlet.java b/webui/src/main/java/com/muwire/webui/TrustServlet.java index 76b435c7..21f600b3 100644 --- a/webui/src/main/java/com/muwire/webui/TrustServlet.java +++ b/webui/src/main/java/com/muwire/webui/TrustServlet.java @@ -65,7 +65,10 @@ public class TrustServlet extends HttpServlet { sb.append("").append(Util.escapeHTMLinXML(list.getPersona().getHumanReadableName())).append(""); sb.append("").append(list.getPersona().toBase64()).append(""); sb.append("").append(list.getStatus()).append(""); - sb.append("").append(DataHelper.formatTime(list.getTimestamp())).append(""); + String timestamp = "Never"; + if (list.getTimestamp() > 0) + timestamp = DataHelper.formatTime(list.getTimestamp()); + sb.append("").append(timestamp).append(""); sb.append("").append(list.getGood().size()).append(""); sb.append("").append(list.getBad().size()).append(""); sb.append(""); @@ -175,7 +178,10 @@ public class TrustServlet extends HttpServlet { sb.append(""); sb.append("").append(Util.escapeHTMLinXML(te.getPersona().getHumanReadableName())).append(""); sb.append("").append(te.getPersona().toBase64()).append(""); - sb.append("").append(Util.escapeHTMLinXML(te.getReason())).append(""); + String reason = ""; + if (te.getReason() != null) + reason = te.getReason(); + sb.append("").append(Util.escapeHTMLinXML(reason)).append(""); sb.append("").append(trustSubscriber.isSubscribed(te.getPersona())).append(""); sb.append(""); } @@ -184,7 +190,10 @@ public class TrustServlet extends HttpServlet { sb.append(""); sb.append("").append(Util.escapeHTMLinXML(te.getPersona().getHumanReadableName())).append(""); sb.append("").append(te.getPersona().toBase64()).append(""); - sb.append("").append(Util.escapeHTMLinXML(te.getReason())).append(""); + String reason = ""; + if (te.getReason() != null) + reason = te.getReason(); + sb.append("").append(Util.escapeHTMLinXML(reason)).append(""); sb.append("").append(trustService.getLevel(te.getPersona().getDestination())).append(""); sb.append(""); }