From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 1 May 2012 22:04:17 +0000 (+0200)
Subject: making callback to context not view
X-Git-Tag: oc-android-1.4.3~433
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a10efb1229c7200721b19533dde9301d9052ce25?ds=inline

making callback to context not view
---

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 3a9cb4e6..6b1bd1cb 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -131,36 +131,6 @@
 
                 </eu.alefzero.owncloud.widgets.ActionEditText>
             </TableRow>
-            <TableRow android:id="@+id/tableRow5"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0">
-                
-                <CheckBox
-					android:id="@+id/show_password"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight=".75"
-					android:hint="@string/setup_hint_show_password"
-					android:textColor="@android:color/black"
-					android:onClick="onCheckboxClick"/>
-            </TableRow>
-            <TableRow android:id="@+id/tableRow6"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0">
-                
-                <CheckBox
-          android:id="@+id/use_ssl"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight=".75"
-          android:hint="@string/use_ssl"
-          android:textColor="@android:color/black"
-          android:onClick="onCheckboxClick"/>
-            </TableRow>
         </TableLayout>
 
         <LinearLayout
diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index b6c9ddab..f1d45b47 100644
--- 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);
     }
     
-    /**
-     * 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);
       }
-    	
     }
 }
diff --git a/src/eu/alefzero/owncloud/widgets/ActionEditText.java b/src/eu/alefzero/owncloud/widgets/ActionEditText.java
index adc18457..b0d550d2 100644
--- 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);
-    }
-  }
-  
 }