gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

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