From 06e7ddae2aa9079e3a8c05042e38c6c771380d76 Mon Sep 17 00:00:00 2001 From: Siddharth Kannan Date: Mon, 20 Feb 2017 20:30:10 +0530 Subject: [PATCH] Fix crash inside MultiUserIdsFrag because of null lastName FIXES #2044 Signed-off-by: Siddharth Kannan --- .../sufficientlysecure/keychain/ui/MultiUserIdsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java index 5490f6b05..c4acc3acd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java @@ -180,7 +180,7 @@ public class MultiUserIdsFragment extends Fragment implements LoaderManager.Load // Two cases: boolean grouped = masterKeyId == lastMasterKeyId; - boolean subGrouped = data.isFirst() || grouped && lastName.equals(name); + boolean subGrouped = data.isFirst() || grouped && lastName != null && lastName.equals(name); // Remember for next loop lastName = name;