From c9b028804cc4eed313ffe67baba3a60b02995166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 1 Aug 2014 17:47:07 +0200 Subject: Add user id with dialog --- .../keychain/ui/adapter/UserIdsAddedAdapter.java | 181 ++++++--------------- 1 file changed, 46 insertions(+), 135 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 3fe5574ee..15ac11e0b 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 @@ -19,162 +19,65 @@ package org.sufficientlysecure.keychain.ui.adapter; import android.app.Activity; import android.content.Context; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.util.Patterns; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; -import android.widget.EditText; +import android.widget.CheckBox; import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.TextView; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.helper.ContactHelper; +import org.sufficientlysecure.keychain.pgp.KeyRing; -import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; -public class UserIdsAddedAdapter extends ArrayAdapter { +public class UserIdsAddedAdapter extends ArrayAdapter { private LayoutInflater mInflater; - private Activity mActivity; - - private ArrayAdapter mAutoCompleteNameAdapter; - private ArrayAdapter mAutoCompleteEmailAdapter; // hold a private reference to the underlying data List - private List mData; - - public static class UserIdModel { - String name = ""; - String address = ""; - String comment = ""; - - @Override - public String toString() { - String userId = name; - if (!TextUtils.isEmpty(comment)) { - userId += " (" + comment + ")"; - } - if (!TextUtils.isEmpty(address)) { - userId += " <" + address + ">"; - } - return userId; - } - } + private List mData; - public UserIdsAddedAdapter(Activity activity, List data) { + public UserIdsAddedAdapter(Activity activity, List data) { super(activity, -1, data); - mActivity = activity; mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mData = data; - mAutoCompleteNameAdapter = new ArrayAdapter - (mActivity, android.R.layout.simple_spinner_dropdown_item, - ContactHelper.getPossibleUserNames(mActivity) - ); - mAutoCompleteEmailAdapter = new ArrayAdapter - (mActivity, android.R.layout.simple_spinner_dropdown_item, - ContactHelper.getPossibleUserEmails(mActivity) - ); } - public ArrayList getDataAsStringList() { - ArrayList out = new ArrayList(); - for (UserIdModel id : mData) { - // ignore empty user ids - if (!TextUtils.isEmpty(id.toString())) { - out.add(id.toString()); - } - } - - return out; + public List getData() { + return mData; } static class ViewHolder { - public AutoCompleteTextView vAddress; - public AutoCompleteTextView vName; - public EditText vComment; + public TextView vAddress; + public TextView vName; + public TextView vComment; public ImageButton vDelete; // also hold a reference to the model item - public UserIdModel mModel; + public String mModel; } public View getView(final int position, View convertView, ViewGroup parent) { if (convertView == null) { // Not recycled, inflate a new view - convertView = mInflater.inflate(R.layout.edit_key_user_id_added_item, null); + convertView = mInflater.inflate(R.layout.view_key_user_id_item, null); 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) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } - - @Override - public void afterTextChanged(Editable s) { - // update referenced item in view holder - holder.mModel.address = s.toString(); - - // show icon on valid email addresses - if (holder.mModel.address.length() > 0) { - Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(holder.mModel.address); - if (emailMatcher.matches()) { - holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.uid_mail_ok, 0); - } else { - holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.uid_mail_bad, 0); - } - } else { - // remove drawable if email is empty - holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - } - } - }); - - holder.vName.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } - - @Override - public void afterTextChanged(Editable s) { - // update referenced item in view holder - holder.mModel.name = s.toString(); - } - }); - - holder.vComment.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } + holder.vAddress = (TextView) convertView.findViewById(R.id.user_id_item_address); + holder.vName = (TextView) convertView.findViewById(R.id.user_id_item_name); + holder.vComment = (TextView) convertView.findViewById(R.id.user_id_item_comment); + holder.vDelete = (ImageButton) convertView.findViewById(R.id.user_id_item_delete_button); + holder.vDelete.setVisibility(View.VISIBLE); // always visible + + // not used: + CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.user_id_item_check_box); + View certifiedLayout = convertView.findViewById(R.id.user_id_item_certified_layout); + ImageView editImage = (ImageView) convertView.findViewById(R.id.user_id_item_edit_image); + checkBox.setVisibility(View.GONE); + certifiedLayout.setVisibility(View.GONE); + editImage.setVisibility(View.GONE); - @Override - public void afterTextChanged(Editable s) { - // update referenced item in view holder - holder.mModel.comment = s.toString(); - } - }); + convertView.setTag(holder); holder.vDelete.setOnClickListener(new View.OnClickListener() { @Override @@ -183,22 +86,30 @@ public class UserIdsAddedAdapter extends ArrayAdapter