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

Rewrote code to be easier to read and not raise a potential null pointer warning by Eclipse.

Browse Source
This commit is contained in:
cketti 2011-01-19 00:10:36 +00:00
parent 6a9a5f6b1f
commit 8f2623e33c
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/com/fsck/k9/helper/DomainNameChecker.java
View File

@ -84,36 +84,38 @@ public class DomainNameChecker
*/
private static boolean isIpAddress(String domain)
{
boolean rval = ((domain != null) && (domain.length() != 0));
if (rval)
if ((domain == null) || (domain.length() == 0))
{
try
{
// do a quick-dirty IP match first to avoid DNS lookup
rval = QUICK_IP_PATTERN.matcher(domain).matches();
if (rval)
{
rval = domain.equals(InetAddress.getByName(domain)
.getHostAddress());
}
}
catch (UnknownHostException e)
{
String errorMessage = e.getMessage();
if (errorMessage == null)
{
errorMessage = "unknown host exception";
}
return false;
}
if (K9.DEBUG)
{
Log.v(K9.LOG_TAG, "DomainNameChecker.isIpAddress(): "
+ errorMessage);
}
rval = false;
boolean rval;
try
{
// do a quick-dirty IP match first to avoid DNS lookup
rval = QUICK_IP_PATTERN.matcher(domain).matches();
if (rval)
{
rval = domain.equals(InetAddress.getByName(domain)
.getHostAddress());
}
}
catch (UnknownHostException e)
{
String errorMessage = e.getMessage();
if (errorMessage == null)
{
errorMessage = "unknown host exception";
}
if (K9.DEBUG)
{
Log.v(K9.LOG_TAG, "DomainNameChecker.isIpAddress(): "
+ errorMessage);
}
rval = false;
}
return rval;
}