From alexlehm at freenetproject.org  Thu Jun  5 18:44:35 2008
From: alexlehm at freenetproject.org (alexlehm at freenetproject.org)
Date: Thu,  5 Jun 2008 18:44:35 +0000 (UTC)
Subject: [Freemail] r20224 - trunk/apps/Freemail/src/freemail/imap
Message-ID: <20080605184435.2F64D479737@freenetproject.org>

Author: alexlehm
Date: 2008-06-05 18:44:34 +0000 (Thu, 05 Jun 2008)
New Revision: 20224

Modified:
   trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
Log:
0002421: NPE when asking for STATUS of non-existent mailbox (https://bugs.freenetproject.org/view.php?id=2421)

Modified: trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
===================================================================
--- trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java	2008-06-05 18:34:18 UTC (rev 20223)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java	2008-06-05 18:44:34 UTC (rev 20224)
@@ -975,8 +975,13 @@
 		
 		String mbname = trimQuotes(msg.args[0]);
 		
-                MessageBank statmb = this.getMailboxFromPath(mbname);
+		MessageBank statmb = this.getMailboxFromPath(mbname);
 		
+		if (statmb == null) {
+			this.reply(msg, "NO Could not find mailbox");
+			return;
+		}
+		
 		SortedMap msgs = statmb.listMessages();
 		
 		// gather statistics



From alexlehm at freenetproject.org  Mon Jun 16 20:07:52 2008
From: alexlehm at freenetproject.org (alexlehm at freenetproject.org)
Date: Mon, 16 Jun 2008 20:07:52 +0000 (UTC)
Subject: [Freemail] r20380 - trunk/apps/Freemail/src/freemail
Message-ID: <20080616200752.6D95C47981E@freenetproject.org>

Author: alexlehm
Date: 2008-06-16 20:07:52 +0000 (Mon, 16 Jun 2008)
New Revision: 20380

Modified:
   trunk/apps/Freemail/src/freemail/MailMessage.java
Log:
0002433: Freemail bug with Unicode characters (https://bugs.freenetproject.org/view.php?id=2433)
calculate message size based on byte length not character length, otherwise we get truncated messages in IMAP with locale with utf-8 encoding

Modified: trunk/apps/Freemail/src/freemail/MailMessage.java
===================================================================
--- trunk/apps/Freemail/src/freemail/MailMessage.java	2008-06-16 20:07:34 UTC (rev 20379)
+++ trunk/apps/Freemail/src/freemail/MailMessage.java	2008-06-16 20:07:52 UTC (rev 20380)
@@ -256,8 +256,8 @@
 		String line;
 		
 		while ( (line = br.readLine()) != null) {
-			counter += line.length();
-			counter += "\r\n".length();
+			counter += line.getBytes().length;
+			counter += "\r\n".getBytes().length;
 		}
 		
 		br.close();