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

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / AuthenticatorActivity.java

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
-        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
-            mStatusText = R.string.auth_nossl_plain_ok_title;\r
+            mStatusText = R.string.auth_secure_connection;\r
             mStatusCorrect = true;\r
+            break;\r
+        case OK_NO_SSL:\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