AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SusiMail: Don't store loading/fetching/refresh messages in session object,

Browse Source 
so they go away when done
This commit is contained in:
zzz
2018-05-30 15:55:19 +00:00
parent 04a9f5612b
commit 3f2fe39515
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -2349,14 +2349,8 @@ public class WebMail extends HttpServlet
}
boolean showRefresh = false;
if (mc != null && mc.isLoading()) {
// not += so it doesn't cascade
sessionObject.info = _t("Loading emails, please wait...") + '\n';
if (sessionObject.isFetching)
sessionObject.info += _t("Checking for new emails on server") + '\n';
showRefresh = true;
} else if (sessionObject.isFetching) {
// not += so it doesn't cascade
sessionObject.info = _t("Checking for new emails on server") + '\n';
showRefresh = true;
} else if (state != State.LOADING && state != State.AUTH && state != State.CONFIG) {
String error = sessionObject.connectError;
@@ -2373,15 +2367,22 @@ public class WebMail extends HttpServlet
sessionObject.newMails = -1;
}
}
if (showRefresh) {
sessionObject.info += _t("Refresh the page for updates") + '\n';
}
if (sessionObject.error.length() > 0 || sessionObject.info.length() > 0) {
if (showRefresh || sessionObject.error.length() > 0 || sessionObject.info.length() > 0) {
out.println("<div class=\"notifications\" onclick=\"this.remove()\">");
if (sessionObject.error.length() > 0)
out.println("<p class=\"error\">" + quoteHTML(sessionObject.error).replace("\n", "<br>") + "</p>");
if (sessionObject.info.length() > 0)
out.println("<p class=\"info\"><b>" + quoteHTML(sessionObject.info).replace("\n", "<br>") + "</b></p>");
if (sessionObject.info.length() > 0 || showRefresh) {
out.println("<p class=\"info\"><b>");
if (mc != null && mc.isLoading())
out.println(_t("Loading emails, please wait...") + "<br>");
if (sessionObject.isFetching)
out.println(_t("Checking for new emails on server") + "<br>");
if (showRefresh)
out.println(_t("Refresh the page for updates") + "<br>");
if (sessionObject.info.length() > 0)
out.println(quoteHTML(sessionObject.info).replace("\n", "<br>"));
out.println("</b></p>");
}
out.println("</div>" );
}
/*