fix white text on configuration screen

[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 b6c9dda..c62290b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -21,6 +21,8 @@ package eu.alefzero.owncloud.ui.activity;
 import java.net.MalformedURLException;\r
 import java.net.URL;\r
 \r
+import com.actionbarsherlock.ActionBarSherlock;\r
+\r
 import android.accounts.Account;\r
 import android.accounts.AccountAuthenticatorActivity;\r
 import android.accounts.AccountManager;\r
@@ -60,7 +62,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     public static final String PARAM_HOSTNAME = "param_Hostname";\r
 \r
     public AuthenticatorActivity() {\r
-      mUseSSLConnection = false;\r
+      mUseSSLConnection = true;\r
     }\r
     \r
     @Override\r
@@ -167,7 +169,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             url_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            url_text.setTextColor(android.R.color.primary_text_light);\r
+            url_text.setTextColor(android.R.color.black);\r
         }\r
         try {\r
             String url_str = url_text.getText().toString();\r
@@ -190,14 +192,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             username_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            username_text.setTextColor(android.R.color.primary_text_light);\r
+            username_text.setTextColor(android.R.color.black);\r
         }\r
 \r
         if (password_text.getText().toString().trim().length() == 0) {\r
             password_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            password_text.setTextColor(android.R.color.primary_text_light);\r
+            password_text.setTextColor(android.R.color.black);\r
         }\r
         if (hasErrors) {\r
             return;\r
@@ -225,29 +227,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
                 AuthenticatorActivity.this);\r
     }\r
     \r
-    /**\r
-     * Handles the show password checkbox\r
-     * @author robstar\r
-     * @author aqu\r
-     * @param view\r
-     */\r
-    public void onCheckboxClick(View view) {\r
-      switch (view.getId()) {\r
-        case R.id.show_password:\r
-          TextView password_text = (TextView) findViewById(R.id.account_password);\r
-          \r
-          if(((CheckBox)view).isChecked()) {\r
-            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
-          } else {\r
-            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
-          }\r
-        break;\r
-        case R.id.use_ssl:\r
-          mUseSSLConnection = ((CheckBox)view).isChecked();\r
-        break;\r
-        default:\r
-          Log.d("AuthActivity", "Clicked invalid view with id: " + view.getId());\r
+    public void sslBadgeClick(View view, String val) {\r
+      mUseSSLConnection = ((TextView)view).getText().equals("SSL");\r
+    }\r
+    \r
+    public void passwordBadgeClick(View view, String val) {\r
+      if(val.equals("Hide")) {\r
+        ((TextView)view).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
+      } else {\r
+        ((TextView)view).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
       }\r
-       \r
     }\r
 }\r