moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 02:12:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #48 from rpimonitrbtch/master

Browse Source 
Loosened the restrictions on the TLD to support custom private TLD's, as well as single label hostnames.

Resolves Issue 2784: Cannot set server hostname
This commit is contained in:
Jesse Vincent 2011-08-28 12:48:10 -07:00
commit a1378789b2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/fsck/k9/helper/Utility.java
View File

@ -108,15 +108,13 @@ public class Utility {
public static boolean domainFieldValid(EditText view) { public static boolean domainFieldValid(EditText view) {
if (view.getText() != null) { if (view.getText() != null) {
String s = view.getText().toString(); String s = view.getText().toString();
if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$")) { if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)*[a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?$") &&
s.length() <= 253) {
return true; return true;
} }
if (s.matches("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")) { if (s.matches("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")) {
return true; return true;
} }
if ((s.equalsIgnoreCase("localhost")) || (s.equalsIgnoreCase("localhost.localdomain"))) {
return true;
}
} }
return false; return false;
} }