chore(lint): Use Object.equals where possible

Signed-off-by: Stefan Niedermann <info@niedermann.it>

33 files changed, 134 insertions, 107 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java
index 01612a952..39313387f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java
@@ -7,6 +7,8 @@ import androidx.room.Index;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity;
 import it.niedermann.nextcloud.deck.model.ocs.user.GroupMemberUIDs;
 
@@ -144,10 +146,10 @@ public class AccessControl extends AbstractRemoteEntity {
         if (permissionEdit != that.permissionEdit) return false;
         if (permissionShare != that.permissionShare) return false;
         if (permissionManage != that.permissionManage) return false;
-        if (type != null ? !type.equals(that.type) : that.type != null) return false;
-        if (boardId != null ? !boardId.equals(that.boardId) : that.boardId != null) return false;
-        if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
-        return user != null ? user.equals(that.user) : that.user == null;
+        if (!Objects.equals(type, that.type)) return false;
+        if (!Objects.equals(boardId, that.boardId)) return false;
+        if (!Objects.equals(userId, that.userId)) return false;
+        return Objects.equals(user, that.user);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java
index 8789e2ee7..640bd582a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java
@@ -7,6 +7,7 @@ import androidx.room.Index;
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.enums.EAttachmentType;
 import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity;
@@ -169,24 +170,24 @@ public class Attachment extends AbstractRemoteEntity implements Comparable<Attac
 
         if (cardId != that.cardId) return false;
         if (filesize != that.filesize) return false;
-        if (type != null ? !type.equals(that.type) : that.type != null) return false;
-        if (data != null ? !data.equals(that.data) : that.data != null) return false;
-        if (createdAt != null ? !createdAt.equals(that.createdAt) : that.createdAt != null)
+        if (!Objects.equals(type, that.type)) return false;
+        if (!Objects.equals(data, that.data)) return false;
+        if (!Objects.equals(createdAt, that.createdAt))
             return false;
-        if (createdBy != null ? !createdBy.equals(that.createdBy) : that.createdBy != null)
+        if (!Objects.equals(createdBy, that.createdBy))
             return false;
-        if (deletedAt != null ? !deletedAt.equals(that.deletedAt) : that.deletedAt != null)
+        if (!Objects.equals(deletedAt, that.deletedAt))
             return false;
-        if (mimetype != null ? !mimetype.equals(that.mimetype) : that.mimetype != null)
+        if (!Objects.equals(mimetype, that.mimetype))
             return false;
-        if (dirname != null ? !dirname.equals(that.dirname) : that.dirname != null) return false;
-        if (basename != null ? !basename.equals(that.basename) : that.basename != null)
+        if (!Objects.equals(dirname, that.dirname)) return false;
+        if (!Objects.equals(basename, that.basename))
             return false;
-        if (extension != null ? !extension.equals(that.extension) : that.extension != null)
+        if (!Objects.equals(extension, that.extension))
             return false;
-        if (filename != null ? !filename.equals(that.filename) : that.filename != null)
+        if (!Objects.equals(filename, that.filename))
             return false;
-        return localPath != null ? localPath.equals(that.localPath) : that.localPath == null;
+        return Objects.equals(localPath, that.localPath);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
index 676753245..3035c174c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
@@ -9,6 +9,7 @@ import androidx.room.Index;
 import com.google.gson.annotations.SerializedName;
 
 import java.time.Instant;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -276,18 +277,18 @@ public class Card extends AbstractRemoteEntity {
         if (notified != card.notified) return false;
         if (overdue != card.overdue) return false;
         if (commentsUnread != card.commentsUnread) return false;
-        if (title != null ? !title.equals(card.title) : card.title != null) return false;
-        if (description != null ? !description.equals(card.description) : card.description != null)
+        if (!Objects.equals(title, card.title)) return false;
+        if (!Objects.equals(description, card.description))
             return false;
-        if (type != null ? !type.equals(card.type) : card.type != null) return false;
-        if (createdAt != null ? !createdAt.equals(card.createdAt) : card.createdAt != null)
+        if (!Objects.equals(type, card.type)) return false;
+        if (!Objects.equals(createdAt, card.createdAt))
             return false;
-        if (deletedAt != null ? !deletedAt.equals(card.deletedAt) : card.deletedAt != null)
+        if (!Objects.equals(deletedAt, card.deletedAt))
             return false;
-        if (done != null ? !done.equals(card.done) : card.done != null)
+        if (!Objects.equals(done, card.done))
             return false;
-        if (userId != null ? !userId.equals(card.userId) : card.userId != null) return false;
-        return dueDate != null ? dueDate.equals(card.dueDate) : card.dueDate == null;
+        if (!Objects.equals(userId, card.userId)) return false;
+        return Objects.equals(dueDate, card.dueDate);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
index 4555faccc..d49367617 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
@@ -12,6 +12,7 @@ import androidx.room.Index;
 import com.google.gson.annotations.JsonAdapter;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import it.niedermann.android.util.ColorUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
@@ -97,7 +98,7 @@ public class Label extends AbstractRemoteEntity implements Serializable {
         Label label = (Label) o;
 
         if (boardId != label.boardId) return false;
-        if (title != null ? !title.equals(label.title) : label.title != null) return false;
+        if (!Objects.equals(title, label.title)) return false;
         return color.equals(label.color);
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
index 5e75b1d31..830f03c75 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
@@ -6,6 +6,7 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 
 import java.time.Instant;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity;
 
@@ -107,8 +108,8 @@ public class Stack extends AbstractRemoteEntity {
 
         if (boardId != stack.boardId) return false;
         if (order != stack.order) return false;
-        if (title != null ? !title.equals(stack.title) : stack.title != null) return false;
-        return deletedAt != null ? deletedAt.equals(stack.deletedAt) : stack.deletedAt == null;
+        if (!Objects.equals(title, stack.title)) return false;
+        return Objects.equals(deletedAt, stack.deletedAt);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
index 87e613fb6..6d2381d82 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
@@ -6,6 +6,7 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity;
 
@@ -77,10 +78,10 @@ public class User extends AbstractRemoteEntity implements Serializable {
 
         User user = (User) o;
 
-        if (primaryKey != null ? !primaryKey.equals(user.primaryKey) : user.primaryKey != null)
+        if (!Objects.equals(primaryKey, user.primaryKey))
             return false;
-        if (uid != null ? !uid.equals(user.uid) : user.uid != null) return false;
-        return displayname != null ? displayname.equals(user.displayname) : user.displayname == null;
+        if (!Objects.equals(uid, user.uid)) return false;
+        return Objects.equals(displayname, user.displayname);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
index 49f10ef24..f26a96242 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
@@ -7,10 +7,11 @@ public enum PermissionType {
     MANAGE(3, "PERMISSION_MANAGE"),
     SHARE(4, "PERMISSION_SHARE");
 
-    private long id;
-    private String key;
+    private final long id;
+    private final String key;
 
     PermissionType(long id, String key) {
+        this.id = id;
         this.key = key;
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java
index f9f1643ff..2b5b861ce 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java
@@ -6,6 +6,7 @@ import androidx.room.Ignore;
 import androidx.room.Relation;
 
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.AccessControl;
 import it.niedermann.nextcloud.deck.model.Board;
@@ -94,13 +95,13 @@ public class FullBoard implements IRemoteEntity {
 
         FullBoard fullBoard = (FullBoard) o;
 
-        if (board != null ? !board.equals(fullBoard.board) : fullBoard.board != null) return false;
-        if (labels != null ? !labels.equals(fullBoard.labels) : fullBoard.labels != null)
+        if (!Objects.equals(board, fullBoard.board)) return false;
+        if (!Objects.equals(labels, fullBoard.labels))
             return false;
-        if (owner != null ? !owner.equals(fullBoard.owner) : fullBoard.owner != null) return false;
-        if (participants != null ? !participants.equals(fullBoard.participants) : fullBoard.participants != null)
+        if (!Objects.equals(owner, fullBoard.owner)) return false;
+        if (!Objects.equals(participants, fullBoard.participants))
             return false;
-        return stacks != null ? stacks.equals(fullBoard.stacks) : fullBoard.stacks == null;
+        return Objects.equals(stacks, fullBoard.stacks);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
index dc4cf1fef..b8f047f9d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
@@ -9,6 +9,7 @@ import androidx.room.Relation;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.android.crosstabdnd.DragAndDropModel;
 import it.niedermann.nextcloud.deck.model.Attachment;
@@ -146,15 +147,15 @@ public class FullCard implements IRemoteEntity, DragAndDropModel {
 
         FullCard fullCard = (FullCard) o;
 
-        if (card != null ? !card.equals(fullCard.card) : fullCard.card != null) return false;
-        if (labels != null ? !labels.equals(fullCard.labels) : fullCard.labels != null)
+        if (!Objects.equals(card, fullCard.card)) return false;
+        if (!Objects.equals(labels, fullCard.labels))
             return false;
-        if (assignedUsers != null ? !assignedUsers.equals(fullCard.assignedUsers) : fullCard.assignedUsers != null)
+        if (!Objects.equals(assignedUsers, fullCard.assignedUsers))
             return false;
-        if (owner != null ? !owner.equals(fullCard.owner) : fullCard.owner != null) return false;
-        if (attachments != null ? !attachments.equals(fullCard.attachments) : fullCard.attachments != null)
+        if (!Objects.equals(owner, fullCard.owner)) return false;
+        if (!Objects.equals(attachments, fullCard.attachments))
             return false;
-        return commentIDs != null ? commentIDs.equals(fullCard.commentIDs) : fullCard.commentIDs == null;
+        return Objects.equals(commentIDs, fullCard.commentIDs);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCardWithProjects.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCardWithProjects.java
index cf43fc86b..00c5086c1 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCardWithProjects.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCardWithProjects.java
@@ -6,6 +6,7 @@ import androidx.room.Relation;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.ocs.projects.JoinCardWithProject;
 import it.niedermann.nextcloud.deck.model.ocs.projects.OcsProject;
@@ -57,15 +58,15 @@ public class FullCardWithProjects extends FullCard {
 
         FullCardWithProjects fullCard = (FullCardWithProjects) o;
 
-        if (card != null ? !card.equals(fullCard.card) : fullCard.card != null) return false;
-        if (labels != null ? !labels.equals(fullCard.labels) : fullCard.labels != null)
+        if (!Objects.equals(card, fullCard.card)) return false;
+        if (!Objects.equals(labels, fullCard.labels))
             return false;
-        if (assignedUsers != null ? !assignedUsers.equals(fullCard.assignedUsers) : fullCard.assignedUsers != null)
+        if (!Objects.equals(assignedUsers, fullCard.assignedUsers))
             return false;
-        if (owner != null ? !owner.equals(fullCard.owner) : fullCard.owner != null) return false;
-        if (attachments != null ? !attachments.equals(fullCard.attachments) : fullCard.attachments != null)
+        if (!Objects.equals(owner, fullCard.owner)) return false;
+        if (!Objects.equals(attachments, fullCard.attachments))
             return false;
-        return commentIDs != null ? commentIDs.equals(fullCard.commentIDs) : fullCard.commentIDs == null;
+        return Objects.equals(commentIDs, fullCard.commentIDs);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java
index 1c9e94899..2c3f3acc4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java
@@ -5,6 +5,7 @@ import androidx.room.Ignore;
 import androidx.room.Relation;
 
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.Card;
 import it.niedermann.nextcloud.deck.model.Stack;
@@ -47,8 +48,8 @@ public class FullStack implements IRemoteEntity {
 
         FullStack fullStack = (FullStack) o;
 
-        if (stack != null ? !stack.equals(fullStack.stack) : fullStack.stack != null) return false;
-        return cards != null ? cards.equals(fullStack.cards) : fullStack.cards == null;
+        if (!Objects.equals(stack, fullStack.stack)) return false;
+        return Objects.equals(cards, fullStack.cards);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java
index 2f7771383..8c874ae74 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java
@@ -7,6 +7,7 @@ import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
 import java.time.Instant;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
@@ -158,11 +159,11 @@ public abstract class AbstractRemoteEntity implements IRemoteEntity {
 
         if (accountId != that.accountId) return false;
         if (status != that.status) return false;
-        if (localId != null ? !localId.equals(that.localId) : that.localId != null) return false;
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (lastModified != null ? !lastModified.equals(that.lastModified) : that.lastModified != null)
+        if (!Objects.equals(localId, that.localId)) return false;
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(lastModified, that.lastModified))
             return false;
-        return lastModifiedLocal != null ? lastModifiedLocal.equals(that.lastModifiedLocal) : that.lastModifiedLocal == null;
+        return Objects.equals(lastModifiedLocal, that.lastModifiedLocal);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/DeckComment.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/DeckComment.java
index 370850113..33edda1d0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/DeckComment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/DeckComment.java
@@ -8,6 +8,7 @@ import androidx.room.Index;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Card;
@@ -145,10 +146,10 @@ public class DeckComment extends AbstractRemoteEntity {
 
         DeckComment that = (DeckComment) o;
 
-        if (actorId != null ? !actorId.equals(that.actorId) : that.actorId != null) return false;
-        if (actorDisplayName != null ? !actorDisplayName.equals(that.actorDisplayName) : that.actorDisplayName != null)
+        if (!Objects.equals(actorId, that.actorId)) return false;
+        if (!Objects.equals(actorDisplayName, that.actorDisplayName))
             return false;
-        return message != null ? message.equals(that.message) : that.message == null;
+        return Objects.equals(message, that.message);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/Mention.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/Mention.java
index 4bc6d0b76..d3ba9110f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/Mention.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/comment/Mention.java
@@ -6,6 +6,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 @Entity(inheritSuperIndices = true,
         indices = {
                 @Index("commentId")
@@ -84,14 +86,14 @@ public class Mention {
 
         Mention mention = (Mention) o;
 
-        if (id != null ? !id.equals(mention.id) : mention.id != null) return false;
-        if (commentId != null ? !commentId.equals(mention.commentId) : mention.commentId != null)
+        if (!Objects.equals(id, mention.id)) return false;
+        if (!Objects.equals(commentId, mention.commentId))
             return false;
-        if (mentionId != null ? !mentionId.equals(mention.mentionId) : mention.mentionId != null)
+        if (!Objects.equals(mentionId, mention.mentionId))
             return false;
-        if (mentionType != null ? !mentionType.equals(mention.mentionType) : mention.mentionType != null)
+        if (!Objects.equals(mentionType, mention.mentionType))
             return false;
-        return mentionDisplayName != null ? mentionDisplayName.equals(mention.mentionDisplayName) : mention.mentionDisplayName == null;
+        return Objects.equals(mentionDisplayName, mention.mentionDisplayName);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUser.java
index 24627cb9a..2c10c8eb2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUser.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.model.ocs.user;
 
+import java.util.Objects;
+
 public class OcsUser {
     String id;
     String displayName;
@@ -36,8 +38,8 @@ public class OcsUser {
 
         OcsUser ocsUser = (OcsUser) o;
 
-        if (id != null ? !id.equals(ocsUser.id) : ocsUser.id != null) return false;
-        return displayName != null ? displayName.equals(ocsUser.displayName) : ocsUser.displayName == null;
+        if (!Objects.equals(id, ocsUser.id)) return false;
+        return Objects.equals(displayName, ocsUser.displayName);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java
index d6e7d4b08..d336bced6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java
@@ -8,6 +8,7 @@ import androidx.room.PrimaryKey;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.enums.EDueType;
 
@@ -113,7 +114,7 @@ public class FilterWidget {
         FilterWidget that = (FilterWidget) o;
 
         if (id != that.id) return false;
-        if (title != null ? !title.equals(that.title) : that.title != null) return false;
+        if (!Objects.equals(title, that.title)) return false;
         if (dueType != that.dueType) return false;
         if (widgetType != that.widgetType) return false;
         if (!accounts.equals(that.accounts)) return false;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java
index caf4e5dd1..971e26920 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java
@@ -9,6 +9,7 @@ import androidx.room.PrimaryKey;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.Account;
 
@@ -136,14 +137,14 @@ public class FilterWidgetAccount {
 
         if (includeNoUser != that.includeNoUser) return false;
         if (includeNoProject != that.includeNoProject) return false;
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterWidgetId != null ? !filterWidgetId.equals(that.filterWidgetId) : that.filterWidgetId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterWidgetId, that.filterWidgetId))
             return false;
-        if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null)
+        if (!Objects.equals(accountId, that.accountId))
             return false;
-        if (boards != null ? !boards.equals(that.boards) : that.boards != null) return false;
-        if (users != null ? !users.equals(that.users) : that.users != null) return false;
-        return projects != null ? projects.equals(that.projects) : that.projects == null;
+        if (!Objects.equals(boards, that.boards)) return false;
+        if (!Objects.equals(users, that.users)) return false;
+        return Objects.equals(projects, that.projects);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java
index b1697f9b7..95fff94c4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java
@@ -8,6 +8,7 @@ import androidx.room.PrimaryKey;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import it.niedermann.nextcloud.deck.model.Board;
 
@@ -109,12 +110,12 @@ public class FilterWidgetBoard {
         FilterWidgetBoard that = (FilterWidgetBoard) o;
 
         if (includeNoLabel != that.includeNoLabel) return false;
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterAccountId, that.filterAccountId))
             return false;
-        if (boardId != null ? !boardId.equals(that.boardId) : that.boardId != null) return false;
-        if (stacks != null ? !stacks.equals(that.stacks) : that.stacks != null) return false;
-        return labels != null ? labels.equals(that.labels) : that.labels == null;
+        if (!Objects.equals(boardId, that.boardId)) return false;
+        if (!Objects.equals(stacks, that.stacks)) return false;
+        return Objects.equals(labels, that.labels);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java
index 0df280c98..e2811a48e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java
@@ -5,6 +5,8 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.Label;
 
 @Entity(
@@ -63,10 +65,10 @@ public class FilterWidgetLabel {
 
         FilterWidgetLabel that = (FilterWidgetLabel) o;
 
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterBoardId != null ? !filterBoardId.equals(that.filterBoardId) : that.filterBoardId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterBoardId, that.filterBoardId))
             return false;
-        return labelId != null ? labelId.equals(that.labelId) : that.labelId == null;
+        return Objects.equals(labelId, that.labelId);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java
index 7ed3f956c..d1e0456ea 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java
@@ -6,6 +6,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.ocs.projects.OcsProject;
 
 @Entity(
@@ -73,10 +75,10 @@ public class FilterWidgetProject {
 
         FilterWidgetProject that = (FilterWidgetProject) o;
 
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterAccountId, that.filterAccountId))
             return false;
-        return projectId != null ? projectId.equals(that.projectId) : that.projectId == null;
+        return Objects.equals(projectId, that.projectId);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java
index ae6516c94..26ab9eab3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java
@@ -7,6 +7,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.enums.ESortCriteria;
 
 @Entity(
@@ -108,8 +110,8 @@ public class FilterWidgetSort {
 
         if (direction != that.direction) return false;
         if (ruleOrder != that.ruleOrder) return false;
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterWidgetId != null ? !filterWidgetId.equals(that.filterWidgetId) : that.filterWidgetId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterWidgetId, that.filterWidgetId))
             return false;
         return criteria == that.criteria;
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java
index 2da1c0b79..00f9cce49 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java
@@ -6,6 +6,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.Stack;
 
 @Entity(
@@ -73,10 +75,10 @@ public class FilterWidgetStack {
 
         FilterWidgetStack that = (FilterWidgetStack) o;
 
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterBoardId != null ? !filterBoardId.equals(that.filterBoardId) : that.filterBoardId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterBoardId, that.filterBoardId))
             return false;
-        return stackId != null ? stackId.equals(that.stackId) : that.stackId == null;
+        return Objects.equals(stackId, that.stackId);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java
index 9fd69aa85..304284239 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java
@@ -6,6 +6,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.util.Objects;
+
 import it.niedermann.nextcloud.deck.model.User;
 
 @Entity(
@@ -73,10 +75,10 @@ public class FilterWidgetUser {
 
         FilterWidgetUser that = (FilterWidgetUser) o;
 
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null)
+        if (!Objects.equals(id, that.id)) return false;
+        if (!Objects.equals(filterAccountId, that.filterAccountId))
             return false;
-        return userId != null ? userId.equals(that.userId) : that.userId == null;
+        return Objects.equals(userId, that.userId);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java
index 4347af0b5..89974602a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java
@@ -18,7 +18,7 @@ import it.niedermann.nextcloud.deck.remote.helpers.SyncHelper;
 public abstract class AbstractSyncDataProvider<T extends IRemoteEntity> {
 
     @Nullable
-    protected AbstractSyncDataProvider<?> parent;
+    protected final AbstractSyncDataProvider<?> parent;
     protected final List<AbstractSyncDataProvider<?>> children = new ArrayList<>();
     protected boolean stillGoingDeeper = false;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java
index 09ad2c81b..07ad054f7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java
@@ -21,10 +21,10 @@ import it.niedermann.nextcloud.deck.remote.api.ResponseCallback;
 
 public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment> {
 
-    private FullCard card;
-    private Board board;
-    private Stack stack;
-    private List<Attachment> attachments;
+    private final FullCard card;
+    private final Board board;
+    private final Stack stack;
+    private final List<Attachment> attachments;
 
     public AttachmentDataProvider(AbstractSyncDataProvider<?> parent, Board board, Stack stack, FullCard card, List<Attachment> attachments) {
         super(parent);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java
index 16eea8692..dda38764c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java
@@ -106,8 +106,7 @@ public class StackDataProvider extends AbstractSyncDataProvider<FullStack> {
             // so we can just skip this one and proceed with cards.
             return Collections.emptyList();
         }
-        List<FullStack> changedStacks = dataBaseAdapter.getLocallyChangedStacksForBoard(accountId, board.getLocalId());
-        return changedStacks;
+        return dataBaseAdapter.getLocallyChangedStacksForBoard(accountId, board.getLocalId());
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java
index 13d2ecb5e..88f4a7a6f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java
@@ -5,7 +5,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import it.niedermann.nextcloud.deck.databinding.ItemAccessControlBinding;
 
 public class AccessControlViewHolder extends RecyclerView.ViewHolder {
-    public ItemAccessControlBinding binding;
+    public final ItemAccessControlBinding binding;
 
     @SuppressWarnings("WeakerAccess")
     public AccessControlViewHolder(ItemAccessControlBinding binding) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
index 6452883d3..2709e056e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
@@ -6,7 +6,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -62,7 +61,7 @@ public class CardAssigneeDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        binding = DialogPreviewBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = DialogPreviewBinding.inflate(getLayoutInflater());
         viewModel = new ViewModelProvider(requireActivity()).get(EditCardViewModel.class);
 
         final var dialogBuilder = new DeleteAlertDialogBuilder(requireContext());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/previewdialog/PreviewDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/previewdialog/PreviewDialog.java
index eafe97fe5..71340c8ac 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/previewdialog/PreviewDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/previewdialog/PreviewDialog.java
@@ -9,7 +9,6 @@ import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
@@ -34,7 +33,7 @@ public class PreviewDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         viewModel = new ViewModelProvider(requireActivity()).get(PreviewDialogViewModel.class);
-        binding = DialogPreviewBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = DialogPreviewBinding.inflate(getLayoutInflater());
 
         final var context = requireContext();
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
index 398323429..5ddc41987 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
@@ -3,7 +3,6 @@ package it.niedermann.nextcloud.deck.ui.card.projectresources;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -47,7 +46,7 @@ public class CardProjectResourcesDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        binding = DialogProjectResourcesBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = DialogProjectResourcesBinding.inflate(getLayoutInflater());
         viewModel = new ViewModelProvider(requireActivity()).get(EditCardViewModel.class);
 
         return new MaterialAlertDialogBuilder(requireContext())
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
index 8656d5bbb..b4c282c97 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
@@ -85,7 +85,7 @@ public class MoveCardDialogFragment extends DialogFragment implements Themed, Pi
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         final var dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
 
-        binding = DialogMoveCardBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = DialogMoveCardBinding.inflate(getLayoutInflater());
         binding.title.setText(getString(R.string.action_card_move_title, originCardTitle));
         binding.submit.setOnClickListener((v) -> {
             DeckLog.verbose("[Move card] Attempt to move to", Stack.class.getSimpleName(), "#" + selectedStack.getLocalId());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/AutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/AutoCompleteAdapter.java
index 2cabb472d..1a28e8a90 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/AutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/AutoCompleteAdapter.java
@@ -75,7 +75,7 @@ public abstract class AutoCompleteAdapter<ItemType extends IRemoteEntity> extend
     }
 
     protected static class ViewHolder<ViewBindingType extends ViewBinding> {
-        public ViewBindingType binding;
+        public final ViewBindingType binding;
 
         public ViewHolder(ViewBindingType binding) {
             this.binding = binding;
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 182b019ab..222025781 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -49,11 +49,11 @@
         android:contentDescription="@string/copy_logs"
         android:padding="@dimen/spacer_2x"
         android:src="@drawable/ic_bug_report_black_24dp"
-        android:tint="@android:color/white"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:tint="@android:color/white"
         app:tooltipText="@string/copy_logs"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file