aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenPGP-Keychain/res/menu/key_list_multi_selection.xml9
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java16
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java273
3 files changed, 289 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/res/menu/key_list_multi_selection.xml b/OpenPGP-Keychain/res/menu/key_list_multi_selection.xml
new file mode 100644
index 000000000..64f8564c1
--- /dev/null
+++ b/OpenPGP-Keychain/res/menu/key_list_multi_selection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/delete_entry"
+ android:icon="@android:drawable/ic_menu_delete"
+ android:title="@string/menu_delete_key"/>
+
+</menu> \ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index ed8427fd0..f0a009482 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
@@ -17,7 +17,6 @@
package org.sufficientlysecure.keychain.ui;
-import java.util.ArrayList;
import java.util.Set;
import org.sufficientlysecure.keychain.Id;
@@ -39,7 +38,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.Messenger;
-import android.provider.BaseColumns;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
@@ -121,18 +119,18 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
- // StringBuilder sb = new StringBuilder();
Set<Integer> positions = mAdapter.getCurrentCheckedPosition();
- // for (Integer pos : positions) {
- // sb.append(" " + pos + ",");
- // }
switch (item.getItemId()) {
case R.id.delete_entry:
+
+ // get IDs for checked positions as long array
long[] ids = new long[positions.size()];
- for (int i=0; i < positions.size(); i++) {
- ids[i] = mAdapter.getItemId(positions.);
+ int i = 0;
+ for (int pos : positions) {
+ ids[i] = mAdapter.getItemId(pos);
+ i++;
}
- showDeleteKeyDialog(ids.to);
+ showDeleteKeyDialog(ids);
break;
}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
new file mode 100644
index 000000000..0c709d25a
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2012-2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.keychain.ui.adapter;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.MergeCursor;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorTreeAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class KeyListAdapterOLD extends CursorTreeAdapter {
+ private Context mContext;
+ private LayoutInflater mInflater;
+
+ protected int mKeyType;
+
+ private static final int CHILD_KEY = 0;
+ private static final int CHILD_USER_ID = 1;
+ private static final int CHILD_FINGERPRINT = 2;
+
+ public KeyListAdapterOLD(Context context, Cursor groupCursor, int keyType) {
+ super(groupCursor, context);
+ mContext = context;
+ mInflater = LayoutInflater.from(context);
+ mKeyType = keyType;
+ }
+
+ /**
+ * Inflate new view for group items
+ */
+ @Override
+ public View newGroupView(Context context, Cursor cursor, boolean isExpanded, ViewGroup parent) {
+ return mInflater.inflate(R.layout.key_list_item, null);
+ }
+
+ /**
+ * Binds TextViews from group view to results from database group cursor.
+ */
+ @Override
+ protected void bindGroupView(View view, Context context, Cursor cursor, boolean isExpanded) {
+ int userIdIndex = cursor.getColumnIndex(UserIds.USER_ID);
+
+ TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
+ mainUserId.setText(R.string.unknown_user_id);
+ TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
+ mainUserIdRest.setText("");
+
+ String userId = cursor.getString(userIdIndex);
+ if (userId != null) {
+ String[] userIdSplit = OtherHelper.splitUserId(userId);
+
+ if (userIdSplit[1] != null) {
+ mainUserIdRest.setText(userIdSplit[1]);
+ }
+ mainUserId.setText(userIdSplit[0]);
+ }
+
+ if (mainUserId.getText().length() == 0) {
+ mainUserId.setText(R.string.unknown_user_id);
+ }
+
+ if (mainUserIdRest.getText().length() == 0) {
+ mainUserIdRest.setVisibility(View.GONE);
+ } else {
+ mainUserIdRest.setVisibility(View.VISIBLE);
+ }
+ }
+
+ /**
+ * Inflate new view for child items
+ */
+ @Override
+ public View newChildView(Context context, Cursor cursor, boolean isLastChild, ViewGroup parent) {
+ return mInflater.inflate(R.layout.key_list_child_item, null);
+ }
+
+ /**
+ * Bind TextViews from view of childs based on query results
+ */
+ @Override
+ protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) {
+ LinearLayout keyLayout = (LinearLayout) view.findViewById(R.id.keyLayout);
+ LinearLayout userIdLayout = (LinearLayout) view.findViewById(R.id.userIdLayout);
+
+ // first entry is fingerprint
+ if (cursor.getPosition() == 0) {
+ // show only userId layout
+ keyLayout.setVisibility(View.GONE);
+ userIdLayout.setVisibility(View.VISIBLE);
+
+ String fingerprint = PgpKeyHelper.getFingerPrint(context,
+ cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID)));
+ fingerprint = fingerprint.replace(" ", "\n");
+
+ TextView userId = (TextView) view.findViewById(R.id.userId);
+ if (userId == null) {
+ Log.d(Constants.TAG, "userId is null!");
+ }
+ userId.setText(context.getString(R.string.fingerprint) + "\n" + fingerprint);
+ } else {
+ // differentiate between keys and userIds in MergeCursor
+ if (cursor.getColumnIndex(Keys.KEY_ID) != -1) {
+ keyLayout.setVisibility(View.VISIBLE);
+ userIdLayout.setVisibility(View.GONE);
+
+ String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(cursor
+ .getColumnIndex(Keys.KEY_ID)));
+ String algorithmStr = PgpKeyHelper.getAlgorithmInfo(
+ cursor.getInt(cursor.getColumnIndex(Keys.ALGORITHM)),
+ cursor.getInt(cursor.getColumnIndex(Keys.KEY_SIZE)));
+
+ TextView keyId = (TextView) view.findViewById(R.id.keyId);
+ keyId.setText(keyIdStr);
+
+ TextView keyDetails = (TextView) view.findViewById(R.id.keyDetails);
+ keyDetails.setText("(" + algorithmStr + ")");
+
+ ImageView masterKeyIcon = (ImageView) view.findViewById(R.id.ic_masterKey);
+ if (cursor.getInt(cursor.getColumnIndex(Keys.IS_MASTER_KEY)) != 1) {
+ masterKeyIcon.setVisibility(View.INVISIBLE);
+ } else {
+ masterKeyIcon.setVisibility(View.VISIBLE);
+ }
+
+ ImageView certifyIcon = (ImageView) view.findViewById(R.id.ic_certifyKey);
+ if (cursor.getInt(cursor.getColumnIndex(Keys.CAN_CERTIFY)) != 1) {
+ certifyIcon.setVisibility(View.GONE);
+ } else {
+ certifyIcon.setVisibility(View.VISIBLE);
+ }
+
+ ImageView encryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
+ if (cursor.getInt(cursor.getColumnIndex(Keys.CAN_ENCRYPT)) != 1) {
+ encryptIcon.setVisibility(View.GONE);
+ } else {
+ encryptIcon.setVisibility(View.VISIBLE);
+ }
+
+ ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
+ if (cursor.getInt(cursor.getColumnIndex(Keys.CAN_SIGN)) != 1) {
+ signIcon.setVisibility(View.GONE);
+ } else {
+ signIcon.setVisibility(View.VISIBLE);
+ }
+ } else {
+ keyLayout.setVisibility(View.GONE);
+ userIdLayout.setVisibility(View.VISIBLE);
+
+ String userIdStr = cursor.getString(cursor.getColumnIndex(UserIds.USER_ID));
+
+ TextView userId = (TextView) view.findViewById(R.id.userId);
+ userId.setText(userIdStr);
+ }
+ }
+ }
+
+ /**
+ * Given the group cursor, we start cursors for a fingerprint, keys, and userIds, which are
+ * merged together and build the child cursor
+ */
+ @Override
+ protected Cursor getChildrenCursor(Cursor groupCursor) {
+ final long keyRingRowId = groupCursor.getLong(groupCursor.getColumnIndex(BaseColumns._ID));
+
+ Cursor fingerprintCursor = getChildCursor(keyRingRowId, CHILD_FINGERPRINT);
+ Cursor keyCursor = getChildCursor(keyRingRowId, CHILD_KEY);
+ Cursor userIdCursor = getChildCursor(keyRingRowId, CHILD_USER_ID);
+
+ MergeCursor mergeCursor = new MergeCursor(new Cursor[] { fingerprintCursor, keyCursor,
+ userIdCursor });
+ Log.d(Constants.TAG, "mergeCursor:" + DatabaseUtils.dumpCursorToString(mergeCursor));
+
+ return mergeCursor;
+ }
+
+ /**
+ * This builds a cursor for a specific type of children
+ *
+ * @param keyRingRowId
+ * foreign row id of the keyRing
+ * @param type
+ * @return
+ */
+ private Cursor getChildCursor(long keyRingRowId, int type) {
+ Uri uri = null;
+ String[] projection = null;
+ String sortOrder = null;
+ String selection = null;
+
+ switch (type) {
+ case CHILD_FINGERPRINT:
+ projection = new String[] { Keys._ID, Keys.KEY_ID, Keys.IS_MASTER_KEY, Keys.ALGORITHM,
+ Keys.KEY_SIZE, Keys.CAN_CERTIFY, Keys.CAN_SIGN, Keys.CAN_ENCRYPT, };
+ sortOrder = Keys.RANK + " ASC";
+
+ // use only master key for fingerprint
+ selection = Keys.IS_MASTER_KEY + " = 1 ";
+
+ if (mKeyType == Id.type.public_key) {
+ uri = Keys.buildPublicKeysUri(String.valueOf(keyRingRowId));
+ } else {
+ uri = Keys.buildSecretKeysUri(String.valueOf(keyRingRowId));
+ }
+ break;
+
+ case CHILD_KEY:
+ projection = new String[] { Keys._ID, Keys.KEY_ID, Keys.IS_MASTER_KEY, Keys.ALGORITHM,
+ Keys.KEY_SIZE, Keys.CAN_CERTIFY, Keys.CAN_SIGN, Keys.CAN_ENCRYPT, };
+ sortOrder = Keys.RANK + " ASC";
+
+ if (mKeyType == Id.type.public_key) {
+ uri = Keys.buildPublicKeysUri(String.valueOf(keyRingRowId));
+ } else {
+ uri = Keys.buildSecretKeysUri(String.valueOf(keyRingRowId));
+ }
+
+ break;
+
+ case CHILD_USER_ID:
+ projection = new String[] { UserIds._ID, UserIds.USER_ID, UserIds.RANK, };
+ sortOrder = UserIds.RANK + " ASC";
+
+ // not the main user id
+ selection = UserIds.RANK + " > 0 ";
+
+ if (mKeyType == Id.type.public_key) {
+ uri = UserIds.buildPublicUserIdsUri(String.valueOf(keyRingRowId));
+ } else {
+ uri = UserIds.buildSecretUserIdsUri(String.valueOf(keyRingRowId));
+ }
+
+ break;
+
+ default:
+ return null;
+
+ }
+
+ return mContext.getContentResolver().query(uri, projection, selection, null, sortOrder);
+ }
+
+}