Use NullSafety.equals().

This commit is contained in:
akwizgran
2021-01-25 13:40:48 +00:00
parent 4ffa9e191c
commit 0befa6a823

View File

@@ -1,6 +1,7 @@
package org.briarproject.briar.api.identity; package org.briarproject.briar.api.identity;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.nullsafety.NullSafety;
import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.AttachmentHeader;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -60,13 +61,10 @@ public class AuthorInfo {
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof AuthorInfo)) return false; if (!(o instanceof AuthorInfo)) return false;
AuthorInfo info = (AuthorInfo) o; AuthorInfo info = (AuthorInfo) o;
//noinspection EqualsReplaceableByObjectsCall
return status == info.status && return status == info.status &&
// aliases are equal // aliases are equal
(alias == null ? info.alias == null : NullSafety.equals(alias, info.alias) &&
alias.equals(info.alias)) &&
// avatars are equal // avatars are equal
(avatarHeader == null ? info.avatarHeader == null : NullSafety.equals(avatarHeader, info.avatarHeader);
avatarHeader.equals(info.avatarHeader));
} }
} }