making callback to context not view

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 3a9cb4e..6b1bd1c 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -131,36 +131,6 @@
 \r
                 </eu.alefzero.owncloud.widgets.ActionEditText>\r
             </TableRow>\r
-            <TableRow android:id="@+id/tableRow5"\r
-                android:layout_width="fill_parent"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal"\r
-                android:weightSum="1.0">\r
-                \r
-                <CheckBox\r
-                                       android:id="@+id/show_password"\r
-                                       android:layout_width="fill_parent"\r
-                                       android:layout_height="wrap_content"\r
-                                       android:layout_weight=".75"\r
-                                       android:hint="@string/setup_hint_show_password"\r
-                                       android:textColor="@android:color/black"\r
-                                       android:onClick="onCheckboxClick"/>\r
-            </TableRow>\r
-            <TableRow android:id="@+id/tableRow6"\r
-                android:layout_width="fill_parent"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal"\r
-                android:weightSum="1.0">\r
-                \r
-                <CheckBox\r
-          android:id="@+id/use_ssl"\r
-          android:layout_width="fill_parent"\r
-          android:layout_height="wrap_content"\r
-          android:layout_weight=".75"\r
-          android:hint="@string/use_ssl"\r
-          android:textColor="@android:color/black"\r
-          android:onClick="onCheckboxClick"/>\r
-            </TableRow>\r
         </TableLayout>\r
 \r
         <LinearLayout\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index b6c9dda..f1d45b4 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -225,29 +225,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

diff --git a/src/eu/alefzero/owncloud/widgets/ActionEditText.java b/src/eu/alefzero/owncloud/widgets/ActionEditText.java
index adc1845..b0d550d 100644 (file)
--- a/src/eu/alefzero/owncloud/widgets/ActionEditText.java
+++ b/src/eu/alefzero/owncloud/widgets/ActionEditText.java
@@ -86,23 +86,22 @@ public class ActionEditText extends EditText {
           paramtypes[1] = String.class;
           Method method;
           try {
-            method = this.getClass().getMethod(badgeClickCallback, paramtypes);
-            method.invoke(this, this, s);
+
+            method = getContext().getClass().getMethod(badgeClickCallback, paramtypes);
+            method.invoke(getContext(), this, s);
+
           } catch (NoSuchMethodException e) {
             e.printStackTrace();
           } catch (IllegalArgumentException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
           } catch (IllegalAccessException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
           } catch (InvocationTargetException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
           }
           
+          invalidate();
         }
-        invalidate();
       }
     }
     return r;
@@ -117,17 +116,4 @@ public class ActionEditText extends EditText {
     badgeClickCallback = a.getString(R.styleable.ActionEditText_onBadgeClick);
   }
   
-  public void sslBadgeClick(View view, String val) {
-    Log.d("ASD", val);
-  }
-  
-  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);
-    }
-  }
-  
 }