No more 'secure icon' when secure connection is NOT available

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / authenticator / ConnectionCheckerRunnable.java

diff --git a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
index 62131ef..119b242 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
+++ b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
@@ -19,6 +19,7 @@
 package eu.alefzero.owncloud.authenticator;
 
 import java.net.ConnectException;
 package eu.alefzero.owncloud.authenticator;
 
 import java.net.ConnectException;

+import java.net.SocketTimeoutException;

 import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLHandshakeException;
 import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLHandshakeException;


@@ -39,6 +40,10 @@ import android.os.Handler;
 import android.util.Log;
 
 public class ConnectionCheckerRunnable implements Runnable {
 import android.util.Log;
 
 public class ConnectionCheckerRunnable implements Runnable {

+    
+    /** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs.  */
+    public static final int TRY_CONNECTION_TIMEOUT = 5000;
+    

     private static final String TAG = "ConnectionCheckerRunnable";
     private OnConnectCheckListener mListener;
     private String mUrl;
     private static final String TAG = "ConnectionCheckerRunnable";
     private OnConnectCheckListener mListener;
     private String mUrl;


@@ -68,13 +73,13 @@ public class ConnectionCheckerRunnable implements Runnable {
             return;
         }
         if (mUrl.startsWith("http://") || mUrl.startsWith("https://")) {
             return;
         }
         if (mUrl.startsWith("http://") || mUrl.startsWith("https://")) {

-            mLatestResult = ResultType.OK;
+            mLatestResult = (mUrl.startsWith("https://"))? ResultType.OK_SSL : ResultType.OK_NO_SSL;

             tryConnection(Uri.parse(mUrl + AccountUtils.STATUS_PATH));
             postResult(mLatestResult);
         } else {
             Uri uri = Uri.parse("https://" + mUrl + AccountUtils.STATUS_PATH);
             if (tryConnection(uri)) {
             tryConnection(Uri.parse(mUrl + AccountUtils.STATUS_PATH));
             postResult(mLatestResult);
         } else {
             Uri uri = Uri.parse("https://" + mUrl + AccountUtils.STATUS_PATH);
             if (tryConnection(uri)) {

-                postResult(ResultType.OK);
+                postResult(ResultType.OK_SSL);

                 return;
             }
             Log.d(TAG,
                 return;
             }
             Log.d(TAG,


@@ -99,7 +104,7 @@ public class ConnectionCheckerRunnable implements Runnable {
         GetMethod get = new GetMethod(uri.toString());
         boolean retval = false;
         try {
         GetMethod get = new GetMethod(uri.toString());
         boolean retval = false;
         try {

-            int status = wc.executeMethod(get);
+            int status = wc.executeMethod(get, TRY_CONNECTION_TIMEOUT);

             switch (status) {
             case HttpStatus.SC_OK: {
                 String response = get.getResponseBodyAsString();
             switch (status) {
             case HttpStatus.SC_OK: {
                 String response = get.getResponseBodyAsString();


@@ -127,7 +132,8 @@ public class ConnectionCheckerRunnable implements Runnable {
 
         } catch (Exception e) {
             if (e instanceof UnknownHostException
 
         } catch (Exception e) {
             if (e instanceof UnknownHostException

-                    || e instanceof ConnectException) {
+                    || e instanceof ConnectException 
+                    || e instanceof SocketTimeoutException) {

                 mLatestResult = ResultType.HOST_NOT_AVAILABLE;
             } else if (e instanceof JSONException) {
                 mLatestResult = ResultType.INSTANCE_NOT_CONFIGURED;
                 mLatestResult = ResultType.HOST_NOT_AVAILABLE;
             } else if (e instanceof JSONException) {
                 mLatestResult = ResultType.INSTANCE_NOT_CONFIGURED;