Start new designed activity

OpenKeychain/src/main/AndroidManifest.xml

@@ -84,6 +84,11 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_edit_key"
             android:windowSoftInputMode="stateHidden" />
+        <activity
+            android:name=".ui.EditKeyActivityNew"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_edit_key"
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ViewKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"

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

@@ -0,0 +1,93 @@
+/*
+ * 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;
+
+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
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        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!");
+            finish();
+            return;
+        }
+
+        loadFragment(savedInstanceState, dataUri);
+    }
+
+    private void loadFragment(Bundle savedInstanceState, Uri dataUri) {
+        // However, if we're being restored from a previous state,
+        // then we don't need to do anything and should return or else
+        // we could end up with overlapping fragments.
+        if (savedInstanceState != null) {
+            return;
+        }
+
+        // Create an instance of the fragment
+        mEditKeyFragment = EditKeyFragment.newInstance(dataUri);
+
+        // Add the fragment to the 'fragment_container' FrameLayout
+        // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.edit_key_fragment_container, mEditKeyFragment)
+                .commitAllowingStateLoss();
+        // do it immediately!
+        getSupportFragmentManager().executePendingTransactions();
+    }
+
+}

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

@@ -0,0 +1,200 @@
+/*
+ * 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;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+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.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.ActionBarHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.ui.adapter.ViewKeyKeysAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.ViewKeyUserIdsAdapter;
+import org.sufficientlysecure.keychain.util.Log;
+
+public class EditKeyFragment extends LoaderFragment implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    public static final String ARG_DATA_URI = "uri";
+
+    private ListView mUserIds;
+    private ListView mKeys;
+
+    private static final int LOADER_ID_USER_IDS = 0;
+    private static final int LOADER_ID_KEYS = 1;
+
+    private ViewKeyUserIdsAdapter mUserIdsAdapter;
+    private ViewKeyKeysAdapter mKeysAdapter;
+
+    private Uri mDataUri;
+
+    /**
+     * Creates new instance of this fragment
+     */
+    public static EditKeyFragment newInstance(Uri dataUri) {
+        EditKeyFragment frag = new EditKeyFragment();
+
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_DATA_URI, dataUri);
+
+        frag.setArguments(args);
+
+        return frag;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, superContainer, savedInstanceState);
+        View view = inflater.inflate(R.layout.edit_key_fragment, getContainer());
+
+        mUserIds = (ListView) view.findViewById(R.id.edit_key_user_ids);
+        mKeys = (ListView) view.findViewById(R.id.edit_key_keys);
+//        mActionEdit = view.findViewById(R.id.view_key_action_edit);
+
+        return root;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+
+        // Inflate a "Done"/"Cancel" custom action bar view
+        ActionBarHelper.setTwoButtonView(((ActionBarActivity) getActivity()).getSupportActionBar(),
+                R.string.btn_save, R.drawable.ic_action_save,
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // Save
+                        save();
+                    }
+                }, R.string.menu_key_edit_cancel, R.drawable.ic_action_cancel,
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // Cancel
+                        getActivity().finish();
+                    }
+                }
+        );
+
+        Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
+        if (dataUri == null) {
+            Log.e(Constants.TAG, "Data missing. Should be Uri of key!");
+            getActivity().finish();
+            return;
+        }
+
+        loadData(dataUri);
+    }
+
+    private void loadData(Uri dataUri) {
+        mDataUri = dataUri;
+
+        Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+
+//        mActionEncrypt.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                encrypt(mDataUri);
+//            }
+//        });
+
+
+        mUserIdsAdapter = new ViewKeyUserIdsAdapter(getActivity(), null, 0);
+        mUserIds.setAdapter(mUserIdsAdapter);
+        mKeysAdapter = new ViewKeyKeysAdapter(getActivity(), null, 0);
+        mKeys.setAdapter(mKeysAdapter);
+
+        // Prepare the loaders. Either re-connect with an existing ones,
+        // or start new ones.
+        getLoaderManager().initLoader(LOADER_ID_USER_IDS, null, this);
+        getLoaderManager().initLoader(LOADER_ID_KEYS, null, this);
+    }
+
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        setContentShown(false);
+
+        switch (id) {
+            case LOADER_ID_USER_IDS: {
+                Uri baseUri = KeychainContract.UserIds.buildUserIdsUri(mDataUri);
+                return new CursorLoader(getActivity(), baseUri,
+                        ViewKeyUserIdsAdapter.USER_IDS_PROJECTION, null, null, null);
+            }
+
+            case LOADER_ID_KEYS: {
+                Uri baseUri = KeychainContract.Keys.buildKeysUri(mDataUri);
+                return new CursorLoader(getActivity(), baseUri,
+                        ViewKeyKeysAdapter.KEYS_PROJECTION, null, null, null);
+            }
+
+            default:
+                return null;
+        }
+    }
+
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        switch (loader.getId()) {
+            case LOADER_ID_USER_IDS:
+                mUserIdsAdapter.swapCursor(data);
+                break;
+
+            case LOADER_ID_KEYS:
+                mKeysAdapter.swapCursor(data);
+                break;
+
+        }
+        setContentShown(true);
+    }
+
+    /**
+     * This is called when the last Cursor provided to onLoadFinished() above is about to be closed.
+     * We need to make sure we are no longer using it.
+     */
+    public void onLoaderReset(Loader<Cursor> loader) {
+        switch (loader.getId()) {
+            case LOADER_ID_USER_IDS:
+                mUserIdsAdapter.swapCursor(null);
+                break;
+            case LOADER_ID_KEYS:
+                mKeysAdapter.swapCursor(null);
+                break;
+        }
+    }
+
+    private void save() {
+        getActivity().finish();
+        // TODO
+    }
+
+
+}

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

@@ -83,17 +83,11 @@ public class ViewKeyKeysFragment extends LoaderFragment implements
         getLoaderManager().initLoader(0, null, this);
     }
 
-    static final String[] KEYS_PROJECTION = new String[] {
-            Keys._ID,
-            Keys.KEY_ID, Keys.RANK, Keys.ALGORITHM, Keys.KEY_SIZE, Keys.HAS_SECRET,
-            Keys.CAN_CERTIFY, Keys.CAN_ENCRYPT, Keys.CAN_SIGN, Keys.IS_REVOKED,
-            Keys.CREATION, Keys.EXPIRY, Keys.FINGERPRINT
-    };
-
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         setContentShown(false);
         Uri baseUri = Keys.buildKeysUri(mDataUri);
-        return new CursorLoader(getActivity(), baseUri, KEYS_PROJECTION, null, null, null);
+        return new CursorLoader(getActivity(), baseUri,
+                ViewKeyKeysAdapter.KEYS_PROJECTION, null, null, null);
     }
 
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {

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

@@ -49,6 +49,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements
     public static final String ARG_DATA_URI = "uri";
 
     private View mActionEdit;
+    private View mActionEditNew;
     private View mActionEditDivider;
     private View mActionEncrypt;
     private View mActionCertify;
@@ -73,6 +74,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements
 
         mUserIds = (ListView) view.findViewById(R.id.view_key_user_ids);
         mActionEdit = view.findViewById(R.id.view_key_action_edit);
+        mActionEditNew = view.findViewById(R.id.view_key_action_edit_new);
         mActionEditDivider = view.findViewById(R.id.view_key_action_edit_divider);
         mActionEncrypt = view.findViewById(R.id.view_key_action_encrypt);
         mActionCertify = view.findViewById(R.id.view_key_action_certify);
@@ -116,6 +118,11 @@ public class ViewKeyMainFragment extends LoaderFragment implements
                 editKey(mDataUri);
             }
         });
+        mActionEditNew.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View view) {
+                editKeyNew(mDataUri);
+            }
+        });
 
         mUserIdsAdapter = new ViewKeyUserIdsAdapter(getActivity(), null, 0);
         mUserIds.setAdapter(mUserIdsAdapter);
@@ -256,4 +263,12 @@ public class ViewKeyMainFragment extends LoaderFragment implements
         startActivityForResult(editIntent, 0);
     }
 
+    private void editKeyNew(Uri dataUri) {
+        Intent editIntent = new Intent(getActivity(), EditKeyActivityNew.class);
+//        editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
+        editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
+        editIntent.setAction(EditKeyActivity.ACTION_EDIT_KEY);
+        startActivityForResult(editIntent, 0);
+    }
+
 }

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

@@ -53,6 +53,22 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
 
     private ColorStateList mDefaultTextColor;
 
+    public static final String[] KEYS_PROJECTION = new String[] {
+            Keys._ID,
+            Keys.KEY_ID,
+            Keys.RANK,
+            Keys.ALGORITHM,
+            Keys.KEY_SIZE,
+            Keys.HAS_SECRET,
+            Keys.CAN_CERTIFY,
+            Keys.CAN_ENCRYPT,
+            Keys.CAN_SIGN,
+            Keys.IS_REVOKED,
+            Keys.CREATION,
+            Keys.EXPIRY,
+            Keys.FINGERPRINT
+    };
+
     public ViewKeyKeysAdapter(Context context, Cursor c, int flags) {
         super(context, c, flags);
 

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/edit_key_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
+
+</LinearLayout>

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

@@ -0,0 +1,44 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_user_ids"
+            android:layout_weight="1" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/edit_key_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_keys" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/edit_key_keys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp" />
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -74,6 +74,22 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
+        <TextView
+            android:id="@+id/view_key_action_edit_new"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="NEW EDIT"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_edit"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
         <View
             android:id="@+id/view_key_action_edit_divider"
             android:layout_width="match_parent"