diff options
Diffstat (limited to 'OpenKeychain/src/main')
15 files changed, 455 insertions, 228 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java index ebc49ab05..7d11a20d3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java @@ -1,12 +1,15 @@ package org.sufficientlysecure.keychain.pgp; +import android.text.TextUtils; + import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import java.util.regex.Matcher; import java.util.regex.Pattern; -/** An abstract KeyRing. - * +/** + * An abstract KeyRing. + * <p/> * This is an abstract class for all KeyRing constructs. It serves as a common * denominator of available information, two implementations wrapping the same * keyring should in all cases agree on the output of all methods described @@ -14,7 +17,6 @@ import java.util.regex.Pattern; * * @see CanonicalizedKeyRing * @see org.sufficientlysecure.keychain.provider.CachedPublicKeyRing - * */ public abstract class KeyRing { @@ -77,4 +79,24 @@ public abstract class KeyRing { return result; } + /** + * Returns a composed user id. Returns null if name is null! + * + * @param name + * @param email + * @param comment + * @return + */ + public static String createUserId(String name, String email, String comment) { + String userId = name; // consider name a required value + if (userId != null && !TextUtils.isEmpty(comment)) { + userId += " (" + comment + ")"; + } + if (userId != null && !TextUtils.isEmpty(email)) { + userId += " <" + email + ">"; + } + + return userId; + } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index f9ed16cba..662ba4ce1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -35,6 +35,7 @@ import org.spongycastle.bcpg.sig.KeyFlags; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; +import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; @@ -171,7 +172,7 @@ public class CreateKeyFinalFragment extends Fragment { parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.CERTIFY_OTHER, null)); parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.SIGN_DATA, null)); parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, null)); - String userId = mName + " <" + mEmail + ">"; + String userId = KeyRing.createUserId(mName, mEmail, null); parcel.mAddUserIds.add(userId); parcel.mNewPassphrase = mPassphrase; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index 9083d1567..b76755bb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -43,6 +43,8 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround; import org.sufficientlysecure.keychain.helper.ActionBarHelper; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; +import org.sufficientlysecure.keychain.pgp.KeyRing; +import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.KeychainIntentService; @@ -55,6 +57,7 @@ import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.SubkeysAddedAdapter; import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter; import org.sufficientlysecure.keychain.ui.adapter.UserIdsAddedAdapter; +import org.sufficientlysecure.keychain.ui.dialog.AddUserIdDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.ChangeExpiryDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditUserIdDialogFragment; @@ -89,11 +92,10 @@ public class EditKeyFragment extends LoaderFragment implements private UserIdsAddedAdapter mUserIdsAddedAdapter; private SubkeysAddedAdapter mSubkeysAddedAdapter; - private ArrayList<UserIdsAddedAdapter.UserIdModel> mUserIdsAddedData; - private Uri mDataUri; private SaveKeyringParcel mSaveKeyringParcel; + private String mPrimaryUserId; private String mCurrentPassphrase; @@ -173,8 +175,13 @@ public class EditKeyFragment extends LoaderFragment implements mSaveKeyringParcel = new SaveKeyringParcel(keyRing.getMasterKeyId(), keyRing.getUncachedKeyRing().getFingerprint()); + mPrimaryUserId = keyRing.getPrimaryUserIdWithFallback(); } catch (ProviderHelper.NotFoundException e) { - Log.e(Constants.TAG, "Keyring not found: " + e.getMessage(), e); + Log.e(Constants.TAG, "Keyring not found", e); + Toast.makeText(getActivity(), R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show(); + getActivity().finish(); + } catch (PgpGeneralException e) { + Log.e(Constants.TAG, "PgpGeneralException", e); Toast.makeText(getActivity(), R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show(); getActivity().finish(); } @@ -213,9 +220,8 @@ public class EditKeyFragment extends LoaderFragment implements } }); - // TODO: mUserIdsAddedData and SaveParcel from savedInstance?! - mUserIdsAddedData = new ArrayList<UserIdsAddedAdapter.UserIdModel>(); - mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mUserIdsAddedData); + // TODO: SaveParcel from savedInstance?! + mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mSaveKeyringParcel.mAddUserIds); mUserIdsAddedList.setAdapter(mUserIdsAddedAdapter); mSubkeysAdapter = new SubkeysAdapter(getActivity(), null, 0, mSaveKeyringParcel); @@ -421,7 +427,29 @@ public class EditKeyFragment extends LoaderFragment implements } private void addUserId() { - mUserIdsAddedAdapter.add(new UserIdsAddedAdapter.UserIdModel()); + // Message is received after passphrase is cached + Handler returnHandler = new Handler() { + @Override + public void handleMessage(Message message) { + if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) { + Bundle data = message.getData(); + + // add new user id + mUserIdsAddedAdapter.add(data + .getString(AddUserIdDialogFragment.MESSAGE_DATA_USER_ID)); + } + } + }; + + // Create a new Messenger for the communication back + Messenger messenger = new Messenger(returnHandler); + + // pre-fill out primary name + String predefinedName = KeyRing.splitUserId(mPrimaryUserId)[0]; + AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger, + predefinedName); + + addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog"); } private void addSubkey() { @@ -451,8 +479,6 @@ public class EditKeyFragment extends LoaderFragment implements } private void save(String passphrase) { - mSaveKeyringParcel.mAddUserIds = mUserIdsAddedAdapter.getDataAsStringList(); - Log.d(Constants.TAG, "mSaveKeyringParcel.mAddUserIds: " + mSaveKeyringParcel.mAddUserIds); Log.d(Constants.TAG, "mSaveKeyringParcel.mNewPassphrase: " + mSaveKeyringParcel.mNewPassphrase); Log.d(Constants.TAG, "mSaveKeyringParcel.mRevokeUserIds: " + mSaveKeyringParcel.mRevokeUserIds); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index e5dbebe01..c2a882fdb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -114,7 +114,7 @@ public class SubkeysAdapter extends CursorAdapter { ImageView vEncryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey); ImageView vSignIcon = (ImageView) view.findViewById(R.id.ic_signKey); ImageView vRevokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey); - ImageView vEditImage = (ImageView) view.findViewById(R.id.edit_image); + ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image); long keyId = cursor.getLong(INDEX_KEY_ID); String keyIdStr = PgpKeyHelper.convertKeyIdToHex(keyId); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java index 6d46f3c8f..ee3341c08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java @@ -102,11 +102,14 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC @Override public void bindView(View view, Context context, Cursor cursor) { - TextView vName = (TextView) view.findViewById(R.id.userId); - TextView vAddress = (TextView) view.findViewById(R.id.address); - TextView vComment = (TextView) view.findViewById(R.id.comment); - ImageView vVerified = (ImageView) view.findViewById(R.id.certified); - ImageView vEditImage = (ImageView) view.findViewById(R.id.edit_image); + TextView vName = (TextView) view.findViewById(R.id.user_id_item_name); + TextView vAddress = (TextView) view.findViewById(R.id.user_id_item_address); + TextView vComment = (TextView) view.findViewById(R.id.user_id_item_comment); + ImageView vVerified = (ImageView) view.findViewById(R.id.user_id_item_certified); + View vVerifiedLayout = view.findViewById(R.id.user_id_item_certified_layout); + ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image); + ImageView vDeleteButton = (ImageView) view.findViewById(R.id.user_id_item_delete_button); + vDeleteButton.setVisibility(View.GONE); // not used String userId = cursor.getString(INDEX_USER_ID); String[] splitUserId = KeyRing.splitUserId(userId); @@ -152,8 +155,10 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC } vEditImage.setVisibility(View.VISIBLE); + vVerifiedLayout.setVisibility(View.GONE); } else { vEditImage.setVisibility(View.GONE); + vVerifiedLayout.setVisibility(View.VISIBLE); } if (isRevoked) { @@ -211,7 +216,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC return; } - final CheckBox vCheckBox = (CheckBox) view.findViewById(R.id.checkBox); + final CheckBox vCheckBox = (CheckBox) view.findViewById(R.id.user_id_item_check_box); final int position = cursor.getPosition(); vCheckBox.setOnCheckedChangeListener(null); vCheckBox.setChecked(mCheckStates.get(position)); @@ -225,7 +230,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC } public void onItemClick(AdapterView<?> adapter, View view, int position, long id) { - CheckBox box = ((CheckBox) view.findViewById(R.id.checkBox)); + CheckBox box = ((CheckBox) view.findViewById(R.id.user_id_item_check_box)); if (box != null) { box.toggle(); } @@ -251,7 +256,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC public View newView(Context context, Cursor cursor, ViewGroup parent) { View view = mInflater.inflate(R.layout.view_key_user_id_item, null); // only need to do this once ever, since mShowCheckBoxes is final - view.findViewById(R.id.checkBox).setVisibility(mCheckStates != null ? View.VISIBLE : View.GONE); + view.findViewById(R.id.user_id_item_check_box).setVisibility(mCheckStates != null ? View.VISIBLE : View.GONE); return view; } 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<UserIdsAddedAdapter.UserIdModel> { +public class UserIdsAddedAdapter extends ArrayAdapter<String> { private LayoutInflater mInflater; - private Activity mActivity; - - private ArrayAdapter<String> mAutoCompleteNameAdapter; - private ArrayAdapter<String> mAutoCompleteEmailAdapter; // hold a private reference to the underlying data List - private List<UserIdModel> 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<String> mData; - public UserIdsAddedAdapter(Activity activity, List<UserIdModel> data) { + public UserIdsAddedAdapter(Activity activity, List<String> data) { super(activity, -1, data); - mActivity = activity; mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mData = data; - mAutoCompleteNameAdapter = new ArrayAdapter<String> - (mActivity, android.R.layout.simple_spinner_dropdown_item, - ContactHelper.getPossibleUserNames(mActivity) - ); - mAutoCompleteEmailAdapter = new ArrayAdapter<String> - (mActivity, android.R.layout.simple_spinner_dropdown_item, - ContactHelper.getPossibleUserEmails(mActivity) - ); } - public ArrayList<String> getDataAsStringList() { - ArrayList<String> out = new ArrayList<String>(); - for (UserIdModel id : mData) { - // ignore empty user ids - if (!TextUtils.isEmpty(id.toString())) { - out.add(id.toString()); - } - } - - return out; + public List<String> 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<UserIdsAddedAdapter.UserId UserIdsAddedAdapter.this.remove(holder.mModel); } }); - } final ViewHolder holder = (ViewHolder) convertView.getTag(); // save reference to model item holder.mModel = getItem(position); - holder.vAddress.setText(holder.mModel.address); - holder.vAddress.setThreshold(1); // Start working from first character - holder.vAddress.setAdapter(mAutoCompleteEmailAdapter); - - holder.vName.setText(holder.mModel.name); - holder.vName.setThreshold(1); // Start working from first character - holder.vName.setAdapter(mAutoCompleteNameAdapter); - - holder.vComment.setText(holder.mModel.comment); + String[] splitUserId = KeyRing.splitUserId(holder.mModel); + if (splitUserId[0] != null) { + holder.vName.setText(splitUserId[0]); + } else { + holder.vName.setText(R.string.user_id_no_name); + } + if (splitUserId[1] != null) { + holder.vAddress.setText(splitUserId[1]); + holder.vAddress.setVisibility(View.VISIBLE); + } else { + holder.vAddress.setVisibility(View.GONE); + } + if (splitUserId[2] != null) { + holder.vComment.setText(splitUserId[2]); + holder.vComment.setVisibility(View.VISIBLE); + } else { + holder.vComment.setVisibility(View.GONE); + } return convertView; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java new file mode 100644 index 000000000..d5264ae10 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java @@ -0,0 +1,268 @@ +/* + * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package org.sufficientlysecure.keychain.ui.dialog; + +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; +import android.os.Bundle; +import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; +import android.support.v4.app.DialogFragment; +import android.text.Editable; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.util.Patterns; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; +import android.widget.ArrayAdapter; +import android.widget.AutoCompleteTextView; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.TextView.OnEditorActionListener; + +import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.helper.ContactHelper; +import org.sufficientlysecure.keychain.pgp.KeyRing; +import org.sufficientlysecure.keychain.util.Log; + +import java.util.regex.Matcher; + +public class AddUserIdDialogFragment extends DialogFragment implements OnEditorActionListener { + private static final String ARG_MESSENGER = "messenger"; + private static final String ARG_NAME = "name"; + + public static final int MESSAGE_OKAY = 1; + public static final int MESSAGE_CANCEL = 2; + + public static final String MESSAGE_DATA_USER_ID = "user_id"; + + private Messenger mMessenger; + private AutoCompleteTextView mName; + private AutoCompleteTextView mEmail; + private EditText mComment; + + public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName) { + + AddUserIdDialogFragment frag = new AddUserIdDialogFragment(); + Bundle args = new Bundle(); + args.putParcelable(ARG_MESSENGER, messenger); + args.putString(ARG_NAME, predefinedName); + frag.setArguments(args); + + return frag; + } + + /** + * Creates dialog + */ + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Activity activity = getActivity(); + mMessenger = getArguments().getParcelable(ARG_MESSENGER); + String predefinedName = getArguments().getString(ARG_NAME); + + ArrayAdapter<String> autoCompleteEmailAdapter = new ArrayAdapter<String> + (getActivity(), android.R.layout.simple_spinner_dropdown_item, + ContactHelper.getPossibleUserEmails(getActivity()) + ); + + CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity); + + alert.setTitle(R.string.edit_key_action_add_identity); + + LayoutInflater inflater = activity.getLayoutInflater(); + View view = inflater.inflate(R.layout.add_user_id_dialog, null); + alert.setView(view); + + mName = (AutoCompleteTextView) view.findViewById(R.id.add_user_id_name); + mEmail = (AutoCompleteTextView) view.findViewById(R.id.add_user_id_address); + mComment = (EditText) view.findViewById(R.id.add_user_id_comment); + + mName.setText(predefinedName); + + mEmail.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 editable) { + String email = editable.toString(); + if (email.length() > 0) { + Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email); + if (emailMatcher.matches()) { + mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, + R.drawable.uid_mail_ok, 0); + } else { + mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, + R.drawable.uid_mail_bad, 0); + } + } else { + // remove drawable if email is empty + mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + } + } + }); + mEmail.setThreshold(1); // Start working from first character + mEmail.setAdapter(autoCompleteEmailAdapter); + + alert.setPositiveButton(android.R.string.ok, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + dismiss(); + + // return new user id back to activity + Bundle data = new Bundle(); + String userId = KeyRing.createUserId(mName.getText().toString(), + mEmail.getText().toString(), mComment.getText().toString()); + data.putString(MESSAGE_DATA_USER_ID, userId); + sendMessageToHandler(MESSAGE_OKAY, data); + } + }); + + alert.setNegativeButton(android.R.string.cancel, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + + // Hack to open keyboard. + // This is the only method that I found to work across all Android versions + // http://turbomanage.wordpress.com/2012/05/02/show-soft-keyboard-automatically-when-edittext-receives-focus/ + // Notes: * onCreateView can't be used because we want to add buttons to the dialog + // * opening in onActivityCreated does not work on Android 4.4 + mEmail.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + mEmail.post(new Runnable() { + @Override + public void run() { + InputMethodManager imm = (InputMethodManager) getActivity() + .getSystemService(Context.INPUT_METHOD_SERVICE); + imm.showSoftInput(mEmail, InputMethodManager.SHOW_IMPLICIT); + } + }); + } + }); + mEmail.requestFocus(); + + mComment.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE); + mComment.setOnEditorActionListener(this); + + return alert.show(); + } + + @Override + public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); + + dismiss(); + sendMessageToHandler(MESSAGE_CANCEL); + } + + @Override + public void onDismiss(DialogInterface dialog) { + super.onDismiss(dialog); + Log.d(Constants.TAG, "onDismiss"); + + // hide keyboard on dismiss + hideKeyboard(); + } + + private void hideKeyboard() { + InputMethodManager inputManager = (InputMethodManager) getActivity() + .getSystemService(Context.INPUT_METHOD_SERVICE); + + //check if no view has focus: + View v = getActivity().getCurrentFocus(); + if (v == null) + return; + + inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0); + } + + /** + * Associate the "done" button on the soft keyboard with the okay button in the view + */ + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (EditorInfo.IME_ACTION_DONE == actionId) { + AlertDialog dialog = ((AlertDialog) getDialog()); + Button bt = dialog.getButton(AlertDialog.BUTTON_POSITIVE); + + bt.performClick(); + return true; + } + return false; + } + + /** + * Send message back to handler which is initialized in a activity + * + * @param what Message integer you want to send + */ + private void sendMessageToHandler(Integer what) { + Message msg = Message.obtain(); + msg.what = what; + + try { + mMessenger.send(msg); + } catch (RemoteException e) { + Log.w(Constants.TAG, "Exception sending message, Is handler present?", e); + } catch (NullPointerException e) { + Log.w(Constants.TAG, "Messenger is null!", e); + } + } + + /** + * Send message back to handler which is initialized in a activity + * + * @param what Message integer you want to send + */ + private void sendMessageToHandler(Integer what, Bundle data) { + Message msg = Message.obtain(); + msg.what = what; + if (data != null) { + msg.setData(data); + } + + try { + mMessenger.send(msg); + } catch (RemoteException e) { + Log.w(Constants.TAG, "Exception sending message, Is handler present?", e); + } catch (NullPointerException e) { + Log.w(Constants.TAG, "Messenger is null!", e); + } + } + +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index 9b561f819..f50d2adc6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -110,7 +110,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene mName = (EditText) findViewById(R.id.name); mName.addTextChangedListener(mTextWatcher); mEmail = (AutoCompleteTextView) findViewById(R.id.email); - mComment = (EditText) findViewById(R.id.comment); + mComment = (EditText) findViewById(R.id.user_id_item_comment); mComment.addTextChangedListener(mTextWatcher); diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml new file mode 100644 index 000000000..2575db4ba --- /dev/null +++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp"> + + <AutoCompleteTextView + android:id="@+id/add_user_id_address" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/label_email" + android:imeOptions="actionNext" + android:inputType="textEmailAddress" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <AutoCompleteTextView + android:id="@+id/add_user_id_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:inputType="textPersonName" + android:hint="@string/create_key_hint_full_name" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/add_user_id_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:singleLine="true" + android:lines="1" + android:maxLines="1" + android:imeOptions="actionDone" + android:hint="@string/label_comment" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index 588cbb050..6e629573a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -64,6 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" + android:imeOptions="actionNext" android:inputType="textPassword" android:hint="@string/label_passphrase" android:ems="10" diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml deleted file mode 100644 index ef0e2626e..000000000 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:singleLine="true"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:minWidth="10dp" - android:background="@color/android_green_light" /> - - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_marginLeft="8dp" - android:layout_height="wrap_content" - android:layout_weight="1"> - - <AutoCompleteTextView - android:id="@+id/user_id_added_item_address" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/label_email" - android:inputType="textEmailAddress" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <AutoCompleteTextView - android:id="@+id/user_id_added_item_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPersonName" - android:hint="@string/label_name" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <EditText - android:id="@+id/user_id_added_item_comment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" - android:hint="@string/label_comment" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - </LinearLayout> - - <ImageButton - android:id="@+id/user_id_added_item_delete" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_cancel" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - -</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml index 3454d3668..877ea77db 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml @@ -67,7 +67,7 @@ android:text="@string/label_comment" /> <EditText - android:id="@+id/comment" + android:id="@+id/user_id_item_comment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml index 0c0a5d7e6..226ed52cf 100644 --- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml @@ -20,7 +20,7 @@ <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/edit_image" + android:id="@+id/user_id_item_edit_image" android:src="@drawable/ic_action_edit" android:padding="8dp" android:layout_centerVertical="true" @@ -30,7 +30,7 @@ <LinearLayout android:orientation="vertical" android:layout_toRightOf="@id/ic_masterKey" - android:layout_toLeftOf="@id/edit_image" + android:layout_toLeftOf="@id/user_id_item_edit_image" android:layout_centerVertical="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml index 157903000..e6dae3eeb 100644 --- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml @@ -7,13 +7,14 @@ android:singleLine="true"> <CheckBox - android:id="@+id/checkBox" + android:id="@+id/user_id_item_check_box" android:layout_width="wrap_content" android:layout_height="match_parent" android:clickable="false" android:focusable="false" /> <LinearLayout + android:id="@+id/user_id_item_certified_layout" android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" @@ -21,9 +22,9 @@ android:orientation="vertical"> <ImageView + android:id="@+id/user_id_item_certified" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/certified" android:layout_gravity="center_horizontal" /> </LinearLayout> @@ -39,21 +40,21 @@ android:layout_weight="1"> <TextView - android:id="@+id/address" + android:id="@+id/user_id_item_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="alice@example.com" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/userId" + android:id="@+id/user_id_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Alice" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView - android:id="@+id/comment" + android:id="@+id/user_id_item_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/tertiary_text_light" @@ -63,11 +64,20 @@ </LinearLayout> <ImageView - android:id="@+id/edit_image" + android:id="@+id/user_id_item_edit_image" android:layout_width="wrap_content" android:layout_height="match_parent" android:src="@drawable/ic_action_edit" android:padding="8dp" android:layout_gravity="center_horizontal" /> + <ImageButton + android:id="@+id/user_id_item_delete_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_cancel" + android:layout_gravity="center_vertical" + style="@style/SelectableItem" /> + </LinearLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2842eb8fc..98f6da186 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -311,9 +311,9 @@ <string name="progress_modify">modifying keyring…</string> <string name="progress_modify_unlock">unlocking keyring…</string> - <string name="progress_modify_adduid">adding user ids…</string> - <string name="progress_modify_revokeuid">revoking user ids…</string> - <string name="progress_modify_primaryuid">changing primary user id…</string> + <string name="progress_modify_adduid">adding user IDs…</string> + <string name="progress_modify_revokeuid">revoking user IDs…</string> + <string name="progress_modify_primaryuid">changing primary user ID…</string> <string name="progress_modify_subkeychange">modifying subkeys…</string> <string name="progress_modify_subkeyrevoke">revoking subkeys…</string> <string name="progress_modify_subkeyadd">adding subkeys…</string> |