From 55f067b0633a177c2d441a7c79115dd44d7c4a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 3 Jul 2014 15:05:43 +0200
Subject: Work on edit

---
 .../keychain/ui/adapter/UserIdsAddedAdapter.java   | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
index 898e60e2d..3fe5574ee 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
@@ -106,14 +106,14 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
         if (convertView == null) {
             // Not recycled, inflate a new view
             convertView = mInflater.inflate(R.layout.edit_key_user_id_added_item, null);
-            final ViewHolder viewHolder = new ViewHolder();
-            viewHolder.vAddress = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_address);
-            viewHolder.vName = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_name);
-            viewHolder.vComment = (EditText) convertView.findViewById(R.id.user_id_added_item_comment);
-            viewHolder.vDelete = (ImageButton) convertView.findViewById(R.id.user_id_added_item_delete);
-            convertView.setTag(viewHolder);
-
-            viewHolder.vAddress.addTextChangedListener(new TextWatcher() {
+            final ViewHolder holder = new ViewHolder();
+            holder.vAddress = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_address);
+            holder.vName = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_name);
+            holder.vComment = (EditText) convertView.findViewById(R.id.user_id_added_item_comment);
+            holder.vDelete = (ImageButton) convertView.findViewById(R.id.user_id_added_item_delete);
+            convertView.setTag(holder);
+
+            holder.vAddress.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -125,26 +125,26 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
                 @Override
                 public void afterTextChanged(Editable s) {
                     // update referenced item in view holder
-                    viewHolder.mModel.address = s.toString();
+                    holder.mModel.address = s.toString();
 
                     // show icon on valid email addresses
-                    if (viewHolder.mModel.address.length() > 0) {
-                        Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(viewHolder.mModel.address);
+                    if (holder.mModel.address.length() > 0) {
+                        Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(holder.mModel.address);
                         if (emailMatcher.matches()) {
-                            viewHolder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                            holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
                                     R.drawable.uid_mail_ok, 0);
                         } else {
-                            viewHolder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                            holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
                                     R.drawable.uid_mail_bad, 0);
                         }
                     } else {
                         // remove drawable if email is empty
-                        viewHolder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+                        holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
                     }
                 }
             });
 
-            viewHolder.vName.addTextChangedListener(new TextWatcher() {
+            holder.vName.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -156,11 +156,11 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
                 @Override
                 public void afterTextChanged(Editable s) {
                     // update referenced item in view holder
-                    viewHolder.mModel.name = s.toString();
+                    holder.mModel.name = s.toString();
                 }
             });
 
-            viewHolder.vComment.addTextChangedListener(new TextWatcher() {
+            holder.vComment.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -172,15 +172,15 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
                 @Override
                 public void afterTextChanged(Editable s) {
                     // update referenced item in view holder
-                    viewHolder.mModel.comment = s.toString();
+                    holder.mModel.comment = s.toString();
                 }
             });
 
-            viewHolder.vDelete.setOnClickListener(new View.OnClickListener() {
+            holder.vDelete.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     // remove reference model item from adapter (data and notify about change)
-                    UserIdsAddedAdapter.this.remove(viewHolder.mModel);
+                    UserIdsAddedAdapter.this.remove(holder.mModel);
                 }
             });
 
-- 
cgit v1.2.3