1 files changed, 11 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
index ff0ec70f3..137217ff4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
@@ -55,15 +55,12 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
 
         @Override
         public String toString() {
-            String userId = null;
-            if (!TextUtils.isEmpty(name)) {
-                userId = name;
-                if (!TextUtils.isEmpty(comment)) {
-                    userId += " (" + comment + ")";
-                }
-                if (!TextUtils.isEmpty(address)) {
-                    userId += " <" + address + ">";
-                }
+            String userId = name;
+            if (!TextUtils.isEmpty(comment)) {
+                userId += " (" + comment + ")";
+            }
+            if (!TextUtils.isEmpty(address)) {
+                userId += " <" + address + ">";
             }
             return userId;
         }
@@ -84,10 +81,13 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
                 );
     }
 
-    public List<String> getDataAsStringList() {
+    public ArrayList<String> getDataAsStringList() {
         ArrayList<String> out = new ArrayList<String>();
         for (UserIdModel id : mData) {
-            out.add(id.toString());
+            // ignore empty user ids
+            if (!TextUtils.isEmpty(id.toString())) {
+                out.add(id.toString());
+            }
         }
 
         return out;