From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 31 Jul 2012 12:02:03 +0000 (+0200)
Subject: No more 'secure icon' when secure connection is NOT available
X-Git-Tag: oc-android-1.4.3~220
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a20681b06320824a80f6da1e86c1c2d52a371636?ds=inline

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 4e178849..119b2422 100644
--- 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://")) {
-            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)) {
-                postResult(ResultType.OK);
+                postResult(ResultType.OK_SSL);
                 return;
             }
             Log.d(TAG,
diff --git a/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java b/src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java
index b45b69f9..f7da0da0 100644
--- 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 {
-        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);
diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index 5c9d093e..caa9820a 100644
--- 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();
 
         switch (type) {
-        case OK:
-            // ugly as hell
-            if (t_url.startsWith("http://") || t_url.startsWith("https://")) {
-                mIsSslConn = t_url.startsWith("http://") ? false : true;
-                mStatusIcon = R.drawable.ic_ok;
-                mStatusText = R.string.auth_connection_established;
-                mStatusCorrect = true;
-            } else {
-                mIsSslConn = true;
-                mStatusIcon = android.R.drawable.ic_secure;
-                mStatusText = R.string.auth_secure_connection;
-                mStatusCorrect = true;
-            }
-            break;
-        case OK_NO_SSL:
+        case OK_SSL:
+            mIsSslConn = true;
             mStatusIcon = android.R.drawable.ic_secure;
-            mStatusText = R.string.auth_nossl_plain_ok_title;
+            mStatusText = R.string.auth_secure_connection;
             mStatusCorrect = true;
+            break;
+        case OK_NO_SSL:
             mIsSslConn = false;
+            mStatusCorrect = true;
+            if (t_url.startsWith("http://") ) {
+                mStatusText = R.string.auth_connection_established;
+                mStatusIcon = R.drawable.ic_ok;
+            } else {
+                mStatusText = R.string.auth_nossl_plain_ok_title;
+                mStatusIcon = android.R.drawable.ic_partial_secure;
+            }
             break;
         case TIMEOUT:
         case INORRECT_ADDRESS: