Author: alexlehm Date: 2008-01-11 23:22:03 +0000 (Fri, 11 Jan 2008) New Revision: 17023
Modified: trunk/apps/Freemail/src/freemail/utils/EmailAddress.java Log: 1871: Multi subdomain addresses (https://bugs.freenetproject.org/view.php?id=1871) return full domain if it includes dots (e.g. @foo.bar.freemail) Modified: trunk/apps/Freemail/src/freemail/utils/EmailAddress.java =================================================================== --- trunk/apps/Freemail/src/freemail/utils/EmailAddress.java 2008-01-11 23:17:25 UTC (rev 17022) +++ trunk/apps/Freemail/src/freemail/utils/EmailAddress.java 2008-01-11 23:22:03 UTC (rev 17023) @@ -118,12 +118,14 @@ } // get the part of the domain before the '.freemail' + // note that the domain may contain additional dots, so we cannot use split public String getSubDomain() { - String[] domparts = this.domain.split("\\.", 2); - - if (domparts.length < 2) return null; - - return domparts[0]; + int index=this.domain.lastIndexOf('.'); + if(index<0) { + return null; + } else { + return this.domain.substring(0,index); + } } public String getMailpageKey() {
