From 778720ab232f6cc90d2b98e26a71c4187497decf Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 27 Nov 2019 11:30:12 -0600
Subject: [PATCH] Ignore click on same filter

---
 .../java/com/todoroo/astrid/adapter/FilterViewHolder.java | 6 ++----
 .../todoroo/astrid/adapter/NavigationDrawerAdapter.java   | 8 +++++++-
 .../main/java/org/tasks/ui/NavigationDrawerFragment.java  | 3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
index b2e25686b..b8aa49932 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
@@ -129,9 +129,7 @@ public class FilterViewHolder extends RecyclerView.ViewHolder {
       size.setVisibility(View.VISIBLE);
     }
 
-    if (onClick != null) {
-      row.setOnClickListener(v -> onClick.onClick(filter));
-    }
+    row.setOnClickListener(onClick == null ? null : v -> onClick.onClick(filter));
   }
 
   private int getColor(FilterListItem filter) {
@@ -168,6 +166,6 @@ public class FilterViewHolder extends RecyclerView.ViewHolder {
   }
 
   public interface OnClick {
-    void onClick(FilterListItem item);
+    void onClick(@Nullable FilterListItem item);
   }
 }
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
index bbe60cb17..b79cca4f1 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
@@ -6,6 +6,7 @@
 
 package com.todoroo.astrid.adapter;
 
+import static com.google.common.base.Objects.equal;
 import static com.todoroo.andlib.utility.AndroidUtilities.assertMainThread;
 import static com.todoroo.astrid.api.FilterListItem.Type.ITEM;
 import static com.todoroo.astrid.api.FilterListItem.Type.SUBHEADER;
@@ -16,6 +17,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil.ItemCallback;
 import androidx.recyclerview.widget.ListAdapter;
 import com.todoroo.astrid.adapter.FilterViewHolder.OnClick;
@@ -96,7 +98,7 @@ public class NavigationDrawerAdapter extends ListAdapter<FilterListItem, FilterV
     View view = inflater.inflate(type.layout, parent, false);
     if (type == ITEM) {
       return new FilterViewHolder(
-          view, accent, themeCache, true, locale, activity, inventory, onClick);
+          view, accent, themeCache, true, locale, activity, inventory, this::onClickFilter);
     } else if (type == SUBHEADER) {
       return new FilterViewHolder(view, activity);
     } else {
@@ -104,6 +106,10 @@ public class NavigationDrawerAdapter extends ListAdapter<FilterListItem, FilterV
     }
   }
 
+  private void onClickFilter(@Nullable FilterListItem filter) {
+    onClick.onClick(equal(filter, selected) ? null : filter);
+  }
+
   @Override
   public void onBindViewHolder(@NonNull FilterViewHolder holder, int position) {
     FilterListItem item = getItem(position);
diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index b72c38c05..f08dd58b2 100644
--- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -19,6 +19,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
@@ -138,7 +139,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
     recyclerView.setAdapter(adapter);
   }
 
-  private void onFilterItemSelected(FilterListItem item) {
+  private void onFilterItemSelected(@Nullable FilterListItem item) {
     mDrawerLayout.addDrawerListener(
         new SimpleDrawerListener() {
           @Override