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

diff --git a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
index 4e17884..119b242 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
+++ b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
@@ -73,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,

diff --git a/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java b/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java
index b45b69f..f7da0da 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java
+++ b/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java
@@ -3,7 +3,7 @@ package eu.alefzero.owncloud.authenticator;
 public interface OnConnectCheckListener {
 
     enum ResultType {
 public interface OnConnectCheckListener {
 
     enum ResultType {

-        OK, OK_NO_SSL, SSL_INIT_ERROR, HOST_NOT_AVAILABLE, TIMEOUT, NO_NETWORK_CONNECTION, INORRECT_ADDRESS, INSTANCE_NOT_CONFIGURED, FILE_NOT_FOUND, UNKNOWN_ERROR
+        OK_SSL, OK_NO_SSL, SSL_INIT_ERROR, HOST_NOT_AVAILABLE, TIMEOUT, NO_NETWORK_CONNECTION, INORRECT_ADDRESS, INSTANCE_NOT_CONFIGURED, FILE_NOT_FOUND, UNKNOWN_ERROR

     }
 
     public void onConnectionCheckResult(ResultType type);
     }
 
     public void onConnectionCheckResult(ResultType type);

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index 5c9d093..caa9820 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -284,25 +284,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 .toString().toLowerCase();\r
 \r
         switch (type) {\r
                 .toString().toLowerCase();\r
 \r
         switch (type) {\r

-        case OK:\r
-            // ugly as hell\r
-            if (t_url.startsWith("http://") || t_url.startsWith("https://")) {\r
-                mIsSslConn = t_url.startsWith("http://") ? false : true;\r
-                mStatusIcon = R.drawable.ic_ok;\r
-                mStatusText = R.string.auth_connection_established;\r
-                mStatusCorrect = true;\r
-            } else {\r
-                mIsSslConn = true;\r
-                mStatusIcon = android.R.drawable.ic_secure;\r
-                mStatusText = R.string.auth_secure_connection;\r
-                mStatusCorrect = true;\r
-            }\r
-            break;\r
-        case OK_NO_SSL:\r
+        case OK_SSL:\r
+            mIsSslConn = true;\r

             mStatusIcon = android.R.drawable.ic_secure;\r
             mStatusIcon = android.R.drawable.ic_secure;\r

-            mStatusText = R.string.auth_nossl_plain_ok_title;\r
+            mStatusText = R.string.auth_secure_connection;\r

             mStatusCorrect = true;\r
             mStatusCorrect = true;\r

+            break;\r
+        case OK_NO_SSL:\r

             mIsSslConn = false;\r
             mIsSslConn = false;\r

+            mStatusCorrect = true;\r
+            if (t_url.startsWith("http://") ) {\r
+                mStatusText = R.string.auth_connection_established;\r
+                mStatusIcon = R.drawable.ic_ok;\r
+            } else {\r
+                mStatusText = R.string.auth_nossl_plain_ok_title;\r
+                mStatusIcon = android.R.drawable.ic_partial_secure;\r
+            }\r

             break;\r
         case TIMEOUT:\r
         case INORRECT_ADDRESS:\r
             break;\r
         case TIMEOUT:\r
         case INORRECT_ADDRESS:\r