Author: dbkr
Date: 2008-02-05 09:22:17 +0000 (Tue, 05 Feb 2008)
New Revision: 17546
Modified:
trunk/apps/Freemail/src/freemail/AccountManager.java
trunk/apps/Freemail/src/freemail/FreemailCli.java
trunk/apps/Freemail/src/freemail/FreemailPlugin.java
Log:
Sort out short address success / failure
Modified: trunk/apps/Freemail/src/freemail/AccountManager.java
===================================================================
--- trunk/apps/Freemail/src/freemail/AccountManager.java 2008-02-05
01:17:50 UTC (rev 17545)
+++ trunk/apps/Freemail/src/freemail/AccountManager.java 2008-02-05
09:22:17 UTC (rev 17546)
@@ -260,7 +260,7 @@
Logger.normal(AccountManager.class,"Account creation
completed.");
}
- public static void addShortAddress(String username, String alias)
throws Exception {
+ public static boolean addShortAddress(String username, String alias)
throws Exception {
File accountdir = new File(DATADIR, username);
if (!accountdir.exists()) {
throw new Exception("No such account - "+username+".");
@@ -307,6 +307,9 @@
m.commit();
+ return true;
+ } else {
+ return false;
}
}
Modified: trunk/apps/Freemail/src/freemail/FreemailCli.java
===================================================================
--- trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-02-05 01:17:50 UTC
(rev 17545)
+++ trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-02-05 09:22:17 UTC
(rev 17546)
@@ -126,8 +126,9 @@
}
return;
} else if (action.equals("--shortaddress")) {
+ boolean success = false;
try {
- AccountManager.addShortAddress(account, alias);
+ success =
AccountManager.addShortAddress(account, alias);
} catch (IllegalArgumentException iae) {
System.out.println("Couldn't add short address
for "+account+". Error: "+iae.getMessage());
return;
@@ -136,7 +137,11 @@
e.printStackTrace();
return;
}
- System.out.println("You now have all Freemail addresses
ending: '@"+alias+".freemail'. Your long address will continue to work.");
+ if (success) {
+ System.out.println("You now have all Freemail
addresses ending: '@"+alias+".freemail'. Your long address will continue to
work.");
+ } else {
+ System.out.println("Failed to add short
address.");
+ }
return;
}
Modified: trunk/apps/Freemail/src/freemail/FreemailPlugin.java
===================================================================
--- trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-02-05
01:17:50 UTC (rev 17545)
+++ trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-02-05
09:22:17 UTC (rev 17546)
@@ -242,8 +242,11 @@
try {
AccountManager.Create(name);
AccountManager.ChangePassword(name,
password);
+ boolean tryShortAddress = false;
+ boolean shortAddressWorked = false;
if(!domain.equals("")) {
-
AccountManager.addShortAddress(name, domain);
+ tryShortAddress = true;
+ shortAddressWorked =
AccountManager.addShortAddress(name, domain);
}
Thread t = new Thread(new
SingleAccountWatcher(new File(DATADIR, name)), "Account Watcher for "+name);
t.setDaemon(true);
@@ -255,7 +258,11 @@
HTMLNode text =
successBox.addChild("div", "class", "infobox-content");
text.addChild("#", "The account ");
text.addChild("i", name);
- text.addChild("#", " was created
successfully.");
+ String shortAddrMsg = "";
+ if (tryShortAddress && !
shortAddressWorked) {
+ shortAddrMsg = ", but your
short address could NOT be created";
+ }
+ text.addChild("#", " was created
successfully"+shortAddrMsg+".");
text.addChild("br");
text.addChild("br");
text.addChild("#", "You now need to
configure your email client to send and receive email through "
