aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java1
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java67
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java49
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml24
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_list_item.xml (renamed from OpenKeychain/src/main/res/layout/import_keys_list_entry.xml)18
5 files changed, 98 insertions, 61 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
index 15bcd8576..a8ddd5419 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
@@ -78,6 +78,7 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
modified = true;
}
}
+ existing.updateMergedUserIds();
return modified;
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
index 68555e696..ecf646c07 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -21,6 +21,7 @@ import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
@@ -28,11 +29,14 @@ import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
public class ImportKeysListEntry implements Serializable, Parcelable {
private static final long serialVersionUID = -7797972103284992662L;
private ArrayList<String> mUserIds;
+ private HashMap<String, HashSet<String>> mMergedUserIds;
private long mKeyId;
private String mKeyIdHex;
private boolean mRevoked;
@@ -59,10 +63,11 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(mPrimaryUserId);
dest.writeStringList(mUserIds);
+ dest.writeSerializable(mMergedUserIds);
dest.writeLong(mKeyId);
dest.writeByte((byte) (mRevoked ? 1 : 0));
dest.writeByte((byte) (mExpired ? 1 : 0));
- dest.writeSerializable(mDate);
+ dest.writeLong(mDate.getTime());
dest.writeString(mFingerprintHex);
dest.writeString(mKeyIdHex);
dest.writeInt(mBitStrength);
@@ -79,10 +84,11 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
vr.mPrimaryUserId = source.readString();
vr.mUserIds = new ArrayList<String>();
source.readStringList(vr.mUserIds);
+ vr.mMergedUserIds = (HashMap<String, HashSet<String>>) source.readSerializable();
vr.mKeyId = source.readLong();
vr.mRevoked = source.readByte() == 1;
vr.mExpired = source.readByte() == 1;
- vr.mDate = (Date) source.readSerializable();
+ vr.mDate = new Date(source.readLong());
vr.mFingerprintHex = source.readString();
vr.mKeyIdHex = source.readString();
vr.mBitStrength = source.readInt();
@@ -124,7 +130,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setSelected(boolean selected) {
- this.mSelected = selected;
+ mSelected = selected;
}
public boolean isExpired() {
@@ -132,7 +138,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setExpired(boolean expired) {
- this.mExpired = expired;
+ mExpired = expired;
}
public long getKeyId() {
@@ -140,11 +146,11 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setKeyId(long keyId) {
- this.mKeyId = keyId;
+ mKeyId = keyId;
}
public void setKeyIdHex(String keyIdHex) {
- this.mKeyIdHex = keyIdHex;
+ mKeyIdHex = keyIdHex;
}
public boolean isRevoked() {
@@ -152,7 +158,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setRevoked(boolean revoked) {
- this.mRevoked = revoked;
+ mRevoked = revoked;
}
public Date getDate() {
@@ -160,7 +166,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setDate(Date date) {
- this.mDate = date;
+ mDate = date;
}
public String getFingerprintHex() {
@@ -168,7 +174,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setFingerprintHex(String fingerprintHex) {
- this.mFingerprintHex = fingerprintHex;
+ mFingerprintHex = fingerprintHex;
}
public Integer getBitStrength() {
@@ -180,7 +186,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setBitStrength(int bitStrength) {
- this.mBitStrength = bitStrength;
+ mBitStrength = bitStrength;
}
public String getAlgorithm() {
@@ -188,7 +194,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setAlgorithm(String algorithm) {
- this.mAlgorithm = algorithm;
+ mAlgorithm = algorithm;
}
public boolean isSecretKey() {
@@ -196,7 +202,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setSecretKey(boolean secretKey) {
- this.mSecretKey = secretKey;
+ mSecretKey = secretKey;
}
public ArrayList<String> getUserIds() {
@@ -204,7 +210,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
}
public void setUserIds(ArrayList<String> userIds) {
- this.mUserIds = userIds;
+ mUserIds = userIds;
+ updateMergedUserIds();
}
public String getPrimaryUserId() {
@@ -239,6 +246,10 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
mOrigins.add(origin);
}
+ public HashMap<String, HashSet<String>> getMergedUserIds() {
+ return mMergedUserIds;
+ }
+
/**
* Constructor for later querying from keyserver
*/
@@ -266,6 +277,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
mPrimaryUserId = key.getPrimaryUserIdWithFallback();
mUserIds = key.getUnorderedUserIds();
+ updateMergedUserIds();
// if there was no user id flagged as primary, use the first one
if (mPrimaryUserId == null) {
@@ -284,4 +296,33 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
mAlgorithm = KeyFormattingUtils.getAlgorithmInfo(context, algorithm, mBitStrength, mCurveOid);
}
+ public void updateMergedUserIds() {
+ mMergedUserIds = new HashMap<String, HashSet<String>>();
+ for (String userId : mUserIds) {
+ String[] userIdSplit = KeyRing.splitUserId(userId);
+
+ // TODO: comment field?
+
+ // name
+ if (userIdSplit[0] != null) {
+ // email
+ if (userIdSplit[1] != null) {
+ if (!mMergedUserIds.containsKey(userIdSplit[0])) {
+ HashSet<String> emails = new HashSet<String>();
+ emails.add(userIdSplit[1]);
+ mMergedUserIds.put(userIdSplit[0], emails);
+ } else {
+ mMergedUserIds.get(userIdSplit[0]).add(userIdSplit[1]);
+ }
+ } else {
+ // name only
+ mMergedUserIds.put(userIdSplit[0], new HashSet<String>());
+ }
+ } else {
+ // fallback
+ mMergedUserIds.put(userId, new HashSet<String>());
+ }
+ }
+ }
+
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 377a3d66e..7b378ae79 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -21,7 +21,6 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
-import android.media.Image;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,12 +34,16 @@ import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Highlighter;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
protected LayoutInflater mInflater;
@@ -112,16 +115,16 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
ViewHolder holder;
if (convertView == null) {
holder = new ViewHolder();
- convertView = mInflater.inflate(R.layout.import_keys_list_entry, null);
- holder.mainUserId = (TextView) convertView.findViewById(R.id.mainUserId);
- holder.mainUserIdRest = (TextView) convertView.findViewById(R.id.mainUserIdRest);
- holder.keyId = (TextView) convertView.findViewById(R.id.subkey_item_key_id);
- holder.fingerprint = (TextView) convertView.findViewById(R.id.view_key_fingerprint);
- holder.algorithm = (TextView) convertView.findViewById(R.id.algorithm);
- holder.status = (ImageView) convertView.findViewById(R.id.status);
- holder.userIdsDivider = convertView.findViewById(R.id.user_ids_divider);
- holder.userIdsList = (LinearLayout) convertView.findViewById(R.id.user_ids_list);
- holder.checkBox = (CheckBox) convertView.findViewById(R.id.selected);
+ convertView = mInflater.inflate(R.layout.import_keys_list_item, null);
+ holder.mainUserId = (TextView) convertView.findViewById(R.id.import_item_user_id);
+ holder.mainUserIdRest = (TextView) convertView.findViewById(R.id.import_item_user_id_email);
+ holder.keyId = (TextView) convertView.findViewById(R.id.import_item_key_id);
+ holder.fingerprint = (TextView) convertView.findViewById(R.id.import_item_fingerprint);
+ holder.algorithm = (TextView) convertView.findViewById(R.id.import_item_algorithm);
+ holder.status = (ImageView) convertView.findViewById(R.id.import_item_status);
+ holder.userIdsDivider = convertView.findViewById(R.id.import_item_status_divider);
+ holder.userIdsList = (LinearLayout) convertView.findViewById(R.id.import_item_user_ids_list);
+ holder.checkBox = (CheckBox) convertView.findViewById(R.id.import_item_selected);
convertView.setTag(holder);
} else {
holder = (ViewHolder) convertView.getTag();
@@ -192,15 +195,27 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
// destroyLoader view from holder
holder.userIdsList.removeAllViews();
- Iterator<String> it = entry.getUserIds().iterator();
- // skip primary user id
- it.next();
- while (it.hasNext()) {
- String uid = it.next();
+ HashMap<String, HashSet<String>> mergedUserIds = entry.getMergedUserIds();
+ for (Map.Entry<String, HashSet<String>> pair : mergedUserIds.entrySet()) {
+ String cUserId = pair.getKey();
+ HashSet<String> cEmails = pair.getValue();
+
TextView uidView = (TextView) mInflater.inflate(
R.layout.import_keys_list_entry_user_id, null);
- uidView.setText(highlighter.highlight(uid));
+ uidView.setText(highlighter.highlight(cUserId));
+ uidView.setPadding(0, 0, FormattingUtils.dpToPx(getContext(), 8), 0);
+
holder.userIdsList.addView(uidView);
+
+ for (String email : cEmails) {
+ TextView emailView = (TextView) mInflater.inflate(
+ R.layout.import_keys_list_entry_user_id, null);
+ emailView.setPadding(
+ FormattingUtils.dpToPx(getContext(), 16), 0,
+ FormattingUtils.dpToPx(getContext(), 8), 0);
+ emailView.setText(highlighter.highlight(email));
+ holder.userIdsList.addView(emailView);
+ }
}
}
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
index b5e41b4d8..2b9076201 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
@@ -1,27 +1,7 @@
-<!--
- Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
- 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/>.
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginRight="?android:attr/scrollbarSize"
android:singleLine="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:paddingRight="3dip">
-
-</TextView>
+ android:paddingRight="8dp" />
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index 5f3319c6c..a97e81abe 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -11,7 +11,7 @@
android:paddingBottom="4dp">
<CheckBox
- android:id="@+id/selected"
+ android:id="@+id/import_item_selected"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="8dp"
@@ -39,21 +39,21 @@
android:orientation="vertical">
<TextView
- android:id="@+id/mainUserId"
+ android:id="@+id/import_item_user_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Alice"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
- android:id="@+id/mainUserIdRest"
+ android:id="@+id/import_item_user_id_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
- android:id="@+id/subkey_item_key_id"
+ android:id="@+id/import_item_key_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Key ID: abcd abcd abcd abcd"
@@ -69,7 +69,7 @@
android:paddingLeft="4dp">
<ImageView
- android:id="@+id/status"
+ android:id="@+id/import_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -77,7 +77,7 @@
android:padding="16dp" />
<TextView
- android:id="@+id/algorithm"
+ android:id="@+id/import_item_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="RSA"
@@ -87,7 +87,7 @@
</LinearLayout>
<View
- android:id="@+id/user_ids_divider"
+ android:id="@+id/import_item_status_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:gravity="right"
@@ -96,13 +96,13 @@
android:background="?android:attr/listDivider" />
<LinearLayout
- android:id="@+id/user_ids_list"
+ android:id="@+id/import_item_user_ids_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
<TextView
- android:id="@+id/view_key_fingerprint"
+ android:id="@+id/import_item_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0000 0000 0000 0000 0000\n0000 0000 0000 0000 0000"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:56:40 +0000