1 files changed, 10 insertions, 11 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
index 5a0782e54..028f0fc9c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
@@ -33,7 +33,6 @@ import android.widget.TextView;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 
 import java.util.ArrayList;
 
@@ -83,9 +82,9 @@ public class MultiUserIdsAdapter extends CursorAdapter {
 
         { // first one
             String userId = uids.get(0);
-            String[] splitUserId = KeyRing.splitUserId(userId);
-            if (splitUserId[0] != null) {
-                vName.setText(splitUserId[0]);
+            KeyRing.UserId splitUserId = KeyRing.splitUserId(userId);
+            if (splitUserId.name != null) {
+                vName.setText(splitUserId.name);
             } else {
                 vName.setText(R.string.user_id_no_name);
             }
@@ -93,9 +92,9 @@ public class MultiUserIdsAdapter extends CursorAdapter {
             if (isHeader == 1) {
                 vHeaderId.setVisibility(View.VISIBLE);
                 String message;
-                if (splitUserId[0] != null) {
+                if (splitUserId.name != null) {
                     message = mContext.getString(R.string.section_uids_to_certify) +
-                            splitUserId[0];
+                            splitUserId.name;
                 } else {
                     message = mContext.getString(R.string.section_uids_to_certify) +
                            context.getString(R.string.user_id_no_name);
@@ -108,13 +107,13 @@ public class MultiUserIdsAdapter extends CursorAdapter {
 
         StringBuilder lines = new StringBuilder();
         for (String uid : uids) {
-            String[] splitUserId = KeyRing.splitUserId(uid);
-            if (splitUserId[1] == null) {
+            KeyRing.UserId splitUserId = KeyRing.splitUserId(uid);
+            if (splitUserId.email == null) {
                 continue;
             }
-            lines.append(splitUserId[1]);
-            if (splitUserId[2] != null) {
-                lines.append(" (").append(splitUserId[2]).append(")");
+            lines.append(splitUserId.email);
+            if (splitUserId.comment != null) {
+                lines.append(" (").append(splitUserId.comment).append(")");
             }
             lines.append('\n');
         }