diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java
index e4f1bcb73b253a92284b95e303d3e7ba86cc7f43..c7d6f89b5b634dcfc007fd21c2554d59c115f0a8 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java
@@ -73,7 +73,7 @@ class Mail {
*/
static final byte HEADER_MATCH[] = DataHelper.getASCII("\r\n\r");
- private int size;
+ private long size;
public String sender, // as received, trimmed only, not HTML escaped
reply,
subject, // as received, trimmed only, not HTML escaped, non-null, default ""
@@ -207,11 +207,14 @@ class Mail {
return part != null;
}
- public synchronized int getSize() {
+ /**
+ * @return 0 if unknown
+ */
+ public synchronized long getSize() {
return size;
}
- public synchronized void setSize(int size) {
+ public synchronized void setSize(long size) {
if (body != null)
return;
this.size = size;
diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
index 6e73438a966744452878496faa051dd5027d2977..d95494ddfb23bce880a8abb9d62713174f985791 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
@@ -193,7 +193,7 @@ class MailCache {
}
if (mail.markForDeletion)
return null;
- int sz = mail.getSize();
+ long sz = mail.getSize();
if (mode == FetchMode.HEADER && sz > 0 && sz <= FETCH_ALL_SIZE)
mode = FetchMode.ALL;
@@ -262,7 +262,7 @@ class MailCache {
}
if (mail.markForDeletion)
continue;
- int sz = mail.getSize();
+ long sz = mail.getSize();
if (sz > 0 && sz <= FETCH_ALL_SIZE)
headerOnly = false;
if( headerOnly ) {
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index b217652ecea367a81892b4b4818e20fce815598a..92cb0d1556c6eb3f7d8b131116d7ae45a66eda01 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -403,7 +403,13 @@ public class WebMail extends HttpServlet
}
protected int compare(Mail a, Mail b) {
- return a.getSize() - b.getSize();
+ long as = a.getSize();
+ long bs = b.getSize();
+ if (as > bs)
+ return 1;
+ if (as < bs)
+ return -1;
+ return 0;
}
}
@@ -2077,7 +2083,6 @@ public class WebMail extends HttpServlet
Debug.debug(Debug.DEBUG, "Final state is " + state);
if (state == State.LIST || state == State.SHOW) {
-
// sort buttons are GETs
String oldSort = folder.getCurrentSortBy();
SortOrder oldOrder = folder.getCurrentSortingDirection();
@@ -2147,13 +2152,13 @@ public class WebMail extends HttpServlet
"<head>\n" +
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
"<title>" + _t("SusiMail") + " - " + subtitle + "</title>\n" +
- "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css?" + CoreVersion.VERSION + "\">\n" );
+ "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css?" + CoreVersion.VERSION + "\">" );
if (sessionObject.isMobile ) {
out.println( "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes\" />\n" +
- "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "mobile.css\" />\n" );
+ "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "mobile.css?" + CoreVersion.VERSION + "\" />" );
}
if(state != State.AUTH)
- out.println("<link rel=\"stylesheet\" href=\"/susimail/css/print.css\" type=\"text/css\" media=\"print\" />");
+ out.println("<link rel=\"stylesheet\" href=\"/susimail/css/print.css?" + CoreVersion.VERSION + "\" type=\"text/css\" media=\"print\" />");
if (state == State.NEW) {
// TODO cancel if to and body are empty
out.println(
@@ -2368,7 +2373,6 @@ public class WebMail extends HttpServlet
HttpServletResponse response)
{
Buffer content = mail.getBody();
-
if(content == null)
return false;
String name;
@@ -2381,7 +2385,9 @@ public class WebMail extends HttpServlet
InputStream in = null;
try {
response.setContentType("message/rfc822");
- response.setContentLength(content.getLength());
+ long sz = mail.getSize();
+ if (sz > 0 && sz <= Integer.MAX_VALUE)
+ response.setContentLength((int) sz);
response.setHeader("Cache-Control", "public, max-age=604800");
response.addHeader("Content-Disposition", "attachment; filename=\"" + name2 + "\"; " +
"filename*=" + name3);
@@ -2389,7 +2395,7 @@ public class WebMail extends HttpServlet
DataHelper.copy(in, response.getOutputStream());
return true;
} catch (IOException e) {
- e.printStackTrace();
+ Debug.debug(Debug.DEBUG, "Save-As", e);
return false;
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}
@@ -2732,7 +2738,7 @@ public class WebMail extends HttpServlet
int i = 0;
for (Iterator<String> it = folder.currentPageIterator(); it != null && it.hasNext(); ) {
String uidl = it.next();
- Mail mail = sessionObject.mailCache.getMail( uidl, MailCache.FetchMode.HEADER );
+ Mail mail = sessionObject.mailCache.getMail(uidl, MailCache.FetchMode.CACHE_ONLY);
if (mail == null || !mail.hasHeader()) {
continue;
}