new edit key: first version to add user ids

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityNew.java

@@ -20,19 +20,13 @@ package org.sufficientlysecure.keychain.ui;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
-import android.view.View;
-import android.view.View.OnClickListener;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.ActionBarHelper;
-import org.sufficientlysecure.keychain.remote.ui.AccountsListFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
 public class EditKeyActivityNew extends ActionBarActivity {
 
-    private Uri mDataUri;
-
     private EditKeyFragment mEditKeyFragment;
 
     @Override
@@ -41,25 +35,6 @@ public class EditKeyActivityNew extends ActionBarActivity {
 
         setContentView(R.layout.edit_key_activity_new);
 
-//        // Inflate a "Done"/"Cancel" custom action bar view
-//        ActionBarHelper.setTwoButtonView(getSupportActionBar(),
-//                R.string.btn_save, R.drawable.ic_action_save,
-//                new OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        // Save
-//
-//                    }
-//                }, R.string.menu_key_edit_cancel, R.drawable.ic_action_cancel,
-//                new OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        // Cancel
-//
-//                    }
-//                }
-//        );
-
         Uri dataUri = getIntent().getData();
         if (dataUri == null) {
             Log.e(Constants.TAG, "Data missing. Should be Uri of key!");

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java

@@ -27,6 +27,7 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.support.v7.app.ActionBarActivity;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -45,6 +46,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
 import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.UserIdsArrayAdapter;
 import org.sufficientlysecure.keychain.ui.dialog.AddUserIdDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.EditUserIdDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
@@ -68,6 +70,7 @@ public class EditKeyFragment extends LoaderFragment implements
 
     private UserIdsAdapter mUserIdsAdapter;
     private SubkeysAdapter mKeysAdapter;
+    private UserIdsArrayAdapter mUserIdsAddedAdapter;
 
     private Uri mDataUri;
 
@@ -180,6 +183,10 @@ public class EditKeyFragment extends LoaderFragment implements
             }
         });
 
+        mUserIdsAddedAdapter = new UserIdsArrayAdapter(getActivity());
+        mUserIdsAddedList.setAdapter(mUserIdsAddedAdapter);
+        mUserIdsAddedAdapter.setData(mSaveKeyringParcel.addUserIds);
+
         mKeysAdapter = new SubkeysAdapter(getActivity(), null, 0);
         mKeysList.setAdapter(mKeysAdapter);
 
@@ -321,10 +328,18 @@ public class EditKeyFragment extends LoaderFragment implements
         Handler returnHandler = new Handler() {
             @Override
             public void handleMessage(Message message) {
-                if (message.what == AddUserIdDialogFragment.MESSAGE_OK) {
+                switch (message.what) {
+                    case AddUserIdDialogFragment.MESSAGE_OKAY:
+                        Bundle data = message.getData();
+                        String userId = data.getString(AddUserIdDialogFragment.MESSAGE_DATA_USER_ID);
 
+                        if (userId != null) {
+                            mSaveKeyringParcel.addUserIds.add(userId);
+                            mUserIdsAddedAdapter.setData(mSaveKeyringParcel.addUserIds);
                         }
                 }
+                getLoaderManager().getLoader(LOADER_ID_USER_IDS).forceLoad();
+            }
         };
 
         // Create a new Messenger for the communication back
@@ -345,5 +360,4 @@ public class EditKeyFragment extends LoaderFragment implements
         // TODO
     }
 
-
 }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java

@@ -144,7 +144,6 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
             vComment.setVisibility(View.GONE);
         }
 
-        // show small star icon for primary user ids
         boolean isPrimary = cursor.getInt(mIsPrimary) != 0;
         boolean isRevoked = cursor.getInt(mIsRevoked) > 0;
 
@@ -185,6 +184,8 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
             vName.setEnabled(true);
             vAddress.setEnabled(true);
 
+            // verified: has been verified
+            // isPrimary: show small star icon for primary user ids
             int verified = cursor.getInt(mVerifiedId);
             switch (verified) {
                 case Certs.VERIFIED_SECRET:

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsArrayAdapter.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2013-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.adapter;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+
+import java.util.List;
+
+public class UserIdsArrayAdapter extends ArrayAdapter<String> {
+    protected LayoutInflater mInflater;
+    protected Activity mActivity;
+
+    protected List<String> mData;
+
+    static class ViewHolder {
+        public TextView vName;
+        public TextView vAddress;
+        public TextView vComment;
+        public ImageView vVerified;
+        public ImageView vHasChanges;
+        public CheckBox vCheckBox;
+    }
+
+    public UserIdsArrayAdapter(Activity activity) {
+        super(activity, -1);
+        mActivity = activity;
+        mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public void setData(List<String> data) {
+        clear();
+        if (data != null) {
+            this.mData = data;
+
+            // add data to extended ArrayAdapter
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                addAll(data);
+            } else {
+                for (String entry : data) {
+                    add(entry);
+                }
+            }
+        }
+    }
+
+    public List<String> getData() {
+        return mData;
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+
+    public View getView(int position, View convertView, ViewGroup parent) {
+        String entry = mData.get(position);
+        ViewHolder holder;
+        if (convertView == null) {
+            holder = new ViewHolder();
+            convertView = mInflater.inflate(R.layout.view_key_userids_item, null);
+            holder.vName = (TextView) convertView.findViewById(R.id.userId);
+            holder.vAddress = (TextView) convertView.findViewById(R.id.address);
+            holder.vComment = (TextView) convertView.findViewById(R.id.comment);
+            holder.vVerified = (ImageView) convertView.findViewById(R.id.certified);
+            holder.vHasChanges = (ImageView) convertView.findViewById(R.id.has_changes);
+            holder.vCheckBox = (CheckBox) convertView.findViewById(R.id.checkBox);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+
+        // user id
+        String[] splitUserId = KeyRing.splitUserId(entry);
+        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);
+        }
+
+        holder.vCheckBox.setVisibility(View.GONE);
+
+        holder.vVerified.setImageResource(R.drawable.key_certify_ok_depth0);
+
+        // all items are "new"
+        holder.vHasChanges.setVisibility(View.VISIBLE);
+
+        return convertView;
+    }
+
+}

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java

@@ -24,17 +24,32 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Log;
 
-public class AddUserIdDialogFragment extends DialogFragment {
+public class AddUserIdDialogFragment extends DialogFragment implements EditText.OnEditorActionListener {
     private static final String ARG_MESSENGER = "messenger";
 
-    public static final int MESSAGE_OK = 1;
+    public static final int MESSAGE_OKAY = 1;
+
+    public static final String MESSAGE_DATA_USER_ID = "user_id";
 
     private Messenger mMessenger;
 
+    EditText mName;
+    EditText mAddress;
+    EditText mComment;
+
     /**
      * Creates new instance of this dialog fragment
      */
@@ -55,34 +70,75 @@ public class AddUserIdDialogFragment extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         mMessenger = getArguments().getParcelable(ARG_MESSENGER);
 
-        CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(getActivity());
+        CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(getActivity());
-//        CharSequence[] array = {"change to primary user id", "revoke"};
+        LayoutInflater inflater = getActivity().getLayoutInflater();
-//
+        View view = inflater.inflate(R.layout.add_user_id_dialog, null);
-//        builder.setTitle("select action!");
+        alert.setView(view);
-//        builder.setItems(array, new DialogInterface.OnClickListener() {
+        alert.setTitle("Add Identity");
-//
-//            @Override
-//            public void onClick(DialogInterface dialog, int which) {
-//                switch (which) {
-//                    case 0:
-//                        sendMessageToHandler(MESSAGE_CHANGE_PRIMARY_USER_ID, null);
-//                        break;
-//                    case 1:
-//                        sendMessageToHandler(MESSAGE_REVOKE, null);
-//                        break;
-//                    default:
-//                        break;
-//                }
-//            }
-//        });
-//        builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
-//            @Override
-//            public void onClick(DialogInterface dialog, int id) {
-//                dismiss();
-//            }
-//        });
 
-        return builder.show();
+        mName = (EditText) view.findViewById(R.id.name);
+        mAddress = (EditText) view.findViewById(R.id.address);
+        mComment = (EditText) view.findViewById(R.id.comment);
+
+        alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                done();
+            }
+        });
+
+        alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                dialog.cancel();
+            }
+        });
+
+
+        return alert.show();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle arg0) {
+        super.onActivityCreated(arg0);
+        // Show soft keyboard automatically
+        mName.requestFocus();
+        getDialog().getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        mComment.setOnEditorActionListener(this);
+    }
+
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (EditorInfo.IME_ACTION_DONE == actionId) {
+            done();
+            return true;
+        }
+        return false;
+    }
+
+    private void done() {
+        String name = mName.getText().toString();
+        String email = mAddress.getText().toString();
+        String comment = mComment.getText().toString();
+
+        String userId = null;
+        if (!TextUtils.isEmpty(name)) {
+            userId = name;
+            if (!TextUtils.isEmpty(comment)) {
+                userId += " (" + comment + ")";
+            }
+            if (!TextUtils.isEmpty(email)) {
+                userId += " <" + email + ">";
+            }
+        }
+        Bundle data = new Bundle();
+        data.putString(MESSAGE_DATA_USER_ID, userId);
+        sendMessageToHandler(MESSAGE_OKAY, data);
+
+        this.dismiss();
     }
 
     /**
@@ -105,4 +161,5 @@ public class AddUserIdDialogFragment extends DialogFragment {
             Log.w(Constants.TAG, "Messenger is null!", e);
         }
     }
+
 }

OpenKeychain/src/main/res/layout/add_user_id_dialog.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:stretchColumns="1">
+
+    <TableRow android:layout_marginBottom="5dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Name" />
+
+        <EditText
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:padding="4dp" />
+    </TableRow>
+
+    <TableRow android:layout_marginBottom="10dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Email" />
+
+        <EditText
+            android:id="@+id/address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:padding="4dp" />
+    </TableRow>
+
+    <TableRow android:layout_marginBottom="10dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Comment" />
+
+        <EditText
+            android:id="@+id/comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:padding="4dp" />
+    </TableRow>
+
+</TableLayout>

OpenKeychain/src/main/res/layout/edit_key_fragment.xml

@@ -45,6 +45,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/edit_key_user_ids_added"
             android:layout_width="match_parent"
@@ -82,6 +87,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/edit_key_keys_added"
             android:layout_width="match_parent"