X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ff36d908024994abe425351ba4f01b9cf805d1e3..fc49e582c5e1f40dc3161f27cb7e1afadf1fd7b9:/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 b6c9ddab..c62290b3 100644
--- 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;
 import java.net.URL;
 
+import com.actionbarsherlock.ActionBarSherlock;
+
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
 import android.accounts.AccountManager;
@@ -60,7 +62,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     public static final String PARAM_HOSTNAME = "param_Hostname";
 
     public AuthenticatorActivity() {
-      mUseSSLConnection = false;
+      mUseSSLConnection = true;
     }
     
     @Override
@@ -167,7 +169,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             url_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            url_text.setTextColor(android.R.color.primary_text_light);
+            url_text.setTextColor(android.R.color.black);
         }
         try {
             String url_str = url_text.getText().toString();
@@ -190,14 +192,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             username_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            username_text.setTextColor(android.R.color.primary_text_light);
+            username_text.setTextColor(android.R.color.black);
         }
 
         if (password_text.getText().toString().trim().length() == 0) {
             password_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            password_text.setTextColor(android.R.color.primary_text_light);
+            password_text.setTextColor(android.R.color.black);
         }
         if (hasErrors) {
             return;
@@ -225,29 +227,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
                 AuthenticatorActivity.this);
     }
     
-    /**
-     * Handles the show password checkbox
-     * @author robstar
-     * @author aqu
-     * @param view
-     */
-    public void onCheckboxClick(View view) {
-      switch (view.getId()) {
-        case R.id.show_password:
-          TextView password_text = (TextView) findViewById(R.id.account_password);
-          
-          if(((CheckBox)view).isChecked()) {
-            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
-          } else {
-            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-          }
-        break;
-        case R.id.use_ssl:
-          mUseSSLConnection = ((CheckBox)view).isChecked();
-        break;
-        default:
-          Log.d("AuthActivity", "Clicked invalid view with id: " + view.getId());
+    public void sslBadgeClick(View view, String val) {
+      mUseSSLConnection = ((TextView)view).getText().equals("SSL");
+    }
+    
+    public void passwordBadgeClick(View view, String val) {
+      if(val.equals("Hide")) {
+        ((TextView)view).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+      } else {
+        ((TextView)view).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
       }
-    	
     }
 }