mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Merge pull request #2274 from nextcloud/bugfix/noid/fixEqualsNPE
Make equals null-safe in case no status is set
This commit is contained in:
commit
bb3b13671d
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user