Merge pull request #2274 from nextcloud/bugfix/noid/fixEqualsNPE

Make equals null-safe in case no status is set
This commit is contained in:
Andy Scherzinger 2022-08-05 16:40:33 +02:00 committed by GitHub
commit bb3b13671d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,6 +51,7 @@ import com.nextcloud.talk.utils.DisplayUtils;
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew;
import java.util.List;
import java.util.Objects;
import java.util.regex.Pattern;
import androidx.core.content.ContextCompat;
@ -97,7 +98,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
public boolean equals(Object o) {
if (o instanceof ConversationItem) {
ConversationItem inItem = (ConversationItem) o;
return conversation.equals(inItem.getModel()) && status.equals(inItem.status);
return conversation.equals(inItem.getModel()) && Objects.equals(status, inItem.status);
}
return false;
}