Author: dbkr
Date: 2006-08-07 18:58:55 +0000 (Mon, 07 Aug 2006)
New Revision: 9950
Modified:
trunk/apps/Freemail/src/freemail/Freemail.java
trunk/apps/Freemail/src/freemail/MessageSender.java
Log:
Message about existing accounts of the same name, and fix an NPE.
Modified: trunk/apps/Freemail/src/freemail/Freemail.java
===================================================================
--- trunk/apps/Freemail/src/freemail/Freemail.java 2006-08-07 14:55:21 UTC
(rev 9949)
+++ trunk/apps/Freemail/src/freemail/Freemail.java 2006-08-07 18:58:55 UTC
(rev 9950)
@@ -108,7 +108,7 @@
System.out.println("Account created for
"+account+". You may now set a password with --passwd <password>");
//System.out.println("For the time being, you
address is "+account+"@nim.freemail");
} catch (IOException ioe) {
- System.out.println("Couldn't create account.
Please check write access to Freemail's working directory. Error:
"+ioe.getMessage());
+ System.out.println("Couldn't create account.
Please check write access to Freemail's working directory. If you want to
overwrite your account, delete the appropriate directory manually in 'data'
first. Freemail will intentionally not overwrite it. Error: "+ioe.getMessage());
}
return;
} else if (action.equals("--passwd")) {
Modified: trunk/apps/Freemail/src/freemail/MessageSender.java
===================================================================
--- trunk/apps/Freemail/src/freemail/MessageSender.java 2006-08-07 14:55:21 UTC
(rev 9949)
+++ trunk/apps/Freemail/src/freemail/MessageSender.java 2006-08-07 18:58:55 UTC
(rev 9950)
@@ -99,6 +99,7 @@
private void sendDir(File accdir, File dir) {
File[] files = dir.listFiles();
+ if (dir == null) return;
for (int i = 0; i < files.length; i++) {
if (files[i].getName().startsWith("."))
continue;
