Use guava Objects.equal

app/src/main/java/com/todoroo/astrid/api/CustomFilter.java

@@ -5,7 +5,7 @@ import static com.todoroo.andlib.utility.AndroidUtilities.mapToSerializedString;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
-import org.tasks.Objects;
+import com.google.common.base.Objects;
 import org.tasks.R;
 
 public class CustomFilter extends Filter {
@@ -88,6 +88,6 @@ public class CustomFilter extends Filter {
   @Override
   public boolean areContentsTheSame(@NonNull FilterListItem other) {
     return super.areContentsTheSame(other)
-        && Objects.equals(criterion, ((CustomFilter) other).criterion);
+        && Objects.equal(criterion, ((CustomFilter) other).criterion);
   }
 }

app/src/main/java/com/todoroo/astrid/api/Filter.java

@@ -10,11 +10,11 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.MenuRes;
 import androidx.annotation.NonNull;
+import com.google.common.base.Objects;
 import com.todoroo.andlib.sql.QueryTemplate;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.tasks.Objects;
 
 /**
  * A <code>FilterListFilter</code> allows users to display tasks that have something in common.
@@ -213,12 +213,12 @@ public class Filter extends FilterListItem {
 
   @Override
   public boolean areItemsTheSame(@NonNull FilterListItem other) {
-    return other instanceof Filter && Objects.equals(sqlQuery, ((Filter) other).sqlQuery);
+    return other instanceof Filter && Objects.equal(sqlQuery, ((Filter) other).sqlQuery);
   }
 
   @Override
   public boolean areContentsTheSame(@NonNull FilterListItem other) {
     return super.areContentsTheSame(other)
-        && Objects.equals(sqlQuery, ((Filter) other).sqlQuery);
+        && Objects.equal(sqlQuery, ((Filter) other).sqlQuery);
   }
 }

app/src/main/java/com/todoroo/astrid/api/FilterListItem.java

@@ -10,7 +10,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
-import org.tasks.Objects;
+import com.google.common.base.Objects;
 import org.tasks.R;
 
 /**
@@ -56,7 +56,7 @@ public abstract class FilterListItem implements Parcelable {
   public abstract boolean areItemsTheSame(@NonNull FilterListItem other);
 
   public boolean areContentsTheSame(@NonNull FilterListItem other) {
-    return Objects.equals(listingTitle, other.listingTitle)
+    return Objects.equal(listingTitle, other.listingTitle)
         && icon == other.icon
         && tint == other.tint
         && count == other.count;

app/src/main/java/org/tasks/Objects.java

@@ -1,9 +0,0 @@
-package org.tasks;
-
-public class Objects {
-  private Objects() {}
-
-  public static boolean equals(Object a, Object b) {
-    return (a == b) || (a != null && a.equals(b));
-  }
-}