1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
This commit is contained in:
Jesse Vincent 2011-01-31 23:45:23 +00:00
parent 6550151684
commit 3d090e9626
6 changed files with 100 additions and 91 deletions

View File

@ -819,7 +819,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
return true; return true;
} }
private static String[][] USED_LIBRARIES = new String[][] { private static String[][] USED_LIBRARIES = new String[][]
{
new String[] {"jutf7", "http://jutf7.sourceforge.net/"}, new String[] {"jutf7", "http://jutf7.sourceforge.net/"},
new String[] {"JZlib", "http://www.jcraft.com/jzlib/"}, new String[] {"JZlib", "http://www.jcraft.com/jzlib/"},
new String[] {"Commons IO", "http://commons.apache.org/io/"}, new String[] {"Commons IO", "http://commons.apache.org/io/"},

View File

@ -1288,6 +1288,9 @@ public class LocalStore extends Store implements Serializable
public class LocalFolder extends Folder implements Serializable public class LocalFolder extends Folder implements Serializable
{ {
/**
*
*/
private static final long serialVersionUID = -1973296520918624767L; private static final long serialVersionUID = -1973296520918624767L;
private String mName = null; private String mName = null;
private long mFolderId = -1; private long mFolderId = -1;

View File

@ -153,8 +153,10 @@ public class SmtpTransport extends Transport
try try
{ {
InetAddress[] addresses = InetAddress.getAllByName(mHost); InetAddress[] addresses = InetAddress.getAllByName(mHost);
for (int i = 0; i < addresses.length; i++) { for (int i = 0; i < addresses.length; i++)
try { {
try
{
SocketAddress socketAddress = new InetSocketAddress(addresses[i], mPort); SocketAddress socketAddress = new InetSocketAddress(addresses[i], mPort);
if (mConnectionSecurity == CONNECTION_SECURITY_SSL_REQUIRED || if (mConnectionSecurity == CONNECTION_SECURITY_SSL_REQUIRED ||
mConnectionSecurity == CONNECTION_SECURITY_SSL_OPTIONAL) mConnectionSecurity == CONNECTION_SECURITY_SSL_OPTIONAL)
@ -174,8 +176,11 @@ public class SmtpTransport extends Transport
mSocket = new Socket(); mSocket = new Socket();
mSocket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT); mSocket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT);
} }
} catch (ConnectException e) { }
if (i < (addresses.length - 1)) { catch (ConnectException e)
{
if (i < (addresses.length - 1))
{
// there are still other addresses for that host to try // there are still other addresses for that host to try
continue; continue;
} }