Author: dbkr
Date: 2007-11-22 18:31:06 +0000 (Thu, 22 Nov 2007)
New Revision: 15927
Modified:
trunk/apps/Freemail/src/freemail/AccountManager.java
trunk/apps/Freemail/src/freemail/FreemailCli.java
trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
Log:
Get rid of the anything@<domain>.freemail messages that were confusing people.
Modified: trunk/apps/Freemail/src/freemail/AccountManager.java
===================================================================
--- trunk/apps/Freemail/src/freemail/AccountManager.java 2007-11-22
17:49:13 UTC (rev 15926)
+++ trunk/apps/Freemail/src/freemail/AccountManager.java 2007-11-22
18:31:06 UTC (rev 15927)
@@ -74,7 +74,7 @@
File accountdir = new File(DATADIR, username);
if (!accountdir.mkdir()) throw new IOException("Failed to
create directory "+username+" in "+DATADIR);
- putWelcomeMessage(username, getFreemailAddress(accountdir));
+ putWelcomeMessage(username, new
EmailAddress(username+"@"+getFreemailDomain(accountdir)));
}
public static void setupNIM(String username) throws IOException {
@@ -126,13 +126,13 @@
return accfile;
}
- public static EmailAddress getFreemailAddress(File accdir) {
+ public static String getFreemailDomain(File accdir) {
PropsFile accfile = getAccountFile(accdir);
- return getFreemailAddress(accfile);
+ return getFreemailDomain(accfile);
}
- public static EmailAddress getFreemailAddress(PropsFile accfile) {
+ public static String getFreemailDomain(PropsFile accfile) {
FreenetURI mailsite;
try {
mailsite = new
FreenetURI(accfile.get("mailsite.pubkey"));
@@ -141,17 +141,17 @@
return null;
}
- return new
EmailAddress("anything@"+Base32.encode(mailsite.getKeyBody().getBytes())+".freemail");
+ return
Base32.encode(mailsite.getKeyBody().getBytes())+".freemail";
}
- public static EmailAddress getKSKFreemailAddress(File accdir) {
+ public static String getKSKFreemailDomain(File accdir) {
PropsFile accfile = getAccountFile(accdir);
String alias = accfile.get("domain_alias");
if (alias == null) return null;
- return new EmailAddress("anything@"+alias+".freemail");
+ return alias+".freemail";
}
public static RSAKeyParameters getPrivateKey(File accdir) {
@@ -209,7 +209,7 @@
}
System.out.println("Mailsite keys generated.");
- System.out.println("Your Freemail address is:
"+getFreemailAddress(accfile));
+ System.out.println("Your Freemail address is any
username followed by '@"+getFreemailDomain(accfile)+"'");
} catch (IOException ioe) {
System.out.println("Couldn't create mailsite key file!
"+ioe.getMessage());
}
@@ -251,7 +251,7 @@
accfile.put("domain_alias", alias);
SimpleDateFormat sdf = new SimpleDateFormat("dd MMM
yyyy HH:mm:ss Z");
- EmailAddress to = getKSKFreemailAddress(accountdir);
+ EmailAddress to = new
EmailAddress(username+"@"+getKSKFreemailDomain(accountdir));
MessageBank mb = new MessageBank(username);
Modified: trunk/apps/Freemail/src/freemail/FreemailCli.java
===================================================================
--- trunk/apps/Freemail/src/freemail/FreemailCli.java 2007-11-22 17:49:13 UTC
(rev 15926)
+++ trunk/apps/Freemail/src/freemail/FreemailCli.java 2007-11-22 18:31:06 UTC
(rev 15927)
@@ -128,7 +128,7 @@
e.printStackTrace();
return;
}
- System.out.println("Your short Freemail address is:
'anything@"+alias+".freemail'. Your long address will continue to work.");
+ System.out.println("You now have all Freemail addresses
ending: '@"+alias+".freemail'. Your long address will continue to work.");
return;
}
Modified: trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
===================================================================
--- trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java 2007-11-22
17:49:13 UTC (rev 15926)
+++ trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java 2007-11-22
18:31:06 UTC (rev 15927)
@@ -25,7 +25,6 @@
import java.lang.InterruptedException;
import freemail.utils.PropsFile;
-import freemail.utils.EmailAddress;
import freemail.fcp.ConnectionTerminatedException;
public class SingleAccountWatcher implements Runnable {
@@ -80,13 +79,13 @@
//this.mf = new MailFetcher(this.mb, inbound_dir,
Freemail.getFCPConnection());
// temporary info message until there's a nicer UI :)
- System.out.println("Secure Freemail address:
"+AccountManager.getFreemailAddress(accdir));
+ System.out.println("Secure Freemail address:
<anything>@"+AccountManager.getFreemailDomain(accdir));
- EmailAddress shortaddr =
AccountManager.getKSKFreemailAddress(accdir);
- if (shortaddr != null) {
- System.out.println("Short Freemail address (*probably*
secure): "+shortaddr);
+ String shortdomain =
AccountManager.getKSKFreemailDomain(accdir);
+ if (shortdomain != null) {
+ System.out.println("Short Freemail address (*probably*
secure): <anything>@"+shortdomain);
} else {
- System.out.println("You don't have a short Freemail
address. You could get one by running Freemail with the --shortaddress option,
followed by your account name and the name you'd like. For example, 'java -jar
freemail.jar --shortaddress bob bob' will give you the address 'anything at
bob.freemail'. Try to pick something unique!");
+ System.out.println("You don't have a short Freemail
address. You could get one by running Freemail with the --shortaddress option,
followed by your account name and the name you'd like. For example, 'java -jar
freemail.jar --shortaddress bob bob' will give you all addresses ending
'@bob.freemail'. Try to pick something unique!");
}
}
