1 files changed, 6 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
index d852c16a8..f0e926655 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
@@ -89,16 +89,13 @@ public class KeyListPublicAdapter extends CursorAdapter implements StickyListHea
         mainUserIdRest.setText("");
 
         String userId = cursor.getString(mIndexUserId);
-        if (userId != null) {
-            String[] userIdSplit = PgpKeyHelper.splitUserId(userId);
+        String[] userIdSplit = PgpKeyHelper.splitUserId(userId);
 
-            if (userIdSplit[0] != null && userIdSplit[0].length() > 0) {
-                mainUserId.setText(userIdSplit[0]);
-            }
-
-            if (userIdSplit[1] != null && userIdSplit[1].length() > 0) {
-                mainUserIdRest.setText(userIdSplit[1]);
-            }
+        if (userIdSplit[0] != null) {
+            mainUserId.setText(userIdSplit[0]);
+        }
+        if (userIdSplit[1] != null) {
+            mainUserIdRest.setText(userIdSplit[1]);
         }
     }