Add equals method in the narrow filter interface.

Author: Sam1301

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -1896,13 +1896,14 @@ public void onNarrowFillSendBoxStream(String stream, String subject, boolean ope
     }
 
     public void onNarrow(NarrowFilter narrowFilter) {
-        if (narrowedList == null || narrowFilter != narrowedList.filter)
-        doNarrow(narrowFilter);
+        if (narrowedList == null || !narrowedList.filter.equals(narrowFilter)) {
+            doNarrow(narrowFilter);
+        }
     }
 
 
     public void onNarrow(NarrowFilter narrowFilter, int messageId) {
-        if (narrowedList == null || narrowFilter != narrowedList.filter) {
+        if (narrowedList == null || !narrowedList.filter.equals(narrowFilter)) {
             doNarrow(narrowFilter, messageId);
         }
     }
@@ -1941,7 +1942,7 @@ private boolean prepareSearchView(Menu menu) {
             searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String s) {
-                    doNarrow(new NarrowFilterSearch(s));
+                    onNarrow(new NarrowFilterSearch(s));
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
                         mSearchMenuItem.collapseActionView();
                     }
@@ -2003,7 +2004,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                                 public void onClick(
                                         DialogInterface dialogInterface, int i) {
                                     String query = editText.getText().toString();
-                                    doNarrow(new NarrowFilterSearch(query));
+                                    onNarrow(new NarrowFilterSearch(query));
                                 }
                             });
                     builder.show();
@@ -2032,19 +2033,19 @@ public void onClick(
                 if (menu != null && menu.getItem(2).getSubMenu().getItem(0).getTitle().equals(getString(R.string.menu_one_day_before))) {
                     //user selected One Day Before
                     calendar.add(Calendar.DATE, -1);
-                    doNarrow(new NarrowFilterByDate(calendar.getTime()));
+                    onNarrow(new NarrowFilterByDate(calendar.getTime()));
                     break;
                 }
                 //else Narrow to Today
-                doNarrow(new NarrowFilterByDate());
+                onNarrow(new NarrowFilterByDate());
                 break;
             case R.id.enterDate:
                 //show Dialog with calendar date as selected to pick Date
                 DatePickerDialog datePickerDialog = new DatePickerDialog(ZulipActivity.this, new DatePickerDialog.OnDateSetListener() {
                     @Override
                     public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
                         calendar.set(year, month, dayOfMonth);
-                        doNarrow(new NarrowFilterByDate(calendar.getTime()));
+                        onNarrow(new NarrowFilterByDate(calendar.getTime()));
                     }
                 }, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
                 //set max date to today so future dates are not selectable

app/src/main/java/com/zulip/android/filters/NarrowFilter.java

@@ -51,4 +51,9 @@ public Where<Message, Object> modWhere(Where<Message, Object> where)
      * A filter to apply when fetching additional messages from the server
      */
     public String getJsonFilter() throws JSONException;
+
+    /**
+     * Check if the current narrow filter matches the passed filter
+     */
+    public boolean equals(NarrowFilter filter);
 }

app/src/main/java/com/zulip/android/filters/NarrowFilterAllPMs.java

@@ -95,6 +95,15 @@ public String getJsonFilter() throws JSONException {
         return ret.toString();
     }
 
+    @Override
+    public boolean equals(NarrowFilter filter) {
+        if (filter instanceof NarrowFilterAllPMs) {
+            return filter.getTitle().equals("All private messages");
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public String toString() {
         try {

app/src/main/java/com/zulip/android/filters/NarrowFilterByDate.java

@@ -48,6 +48,10 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(date.getTime());
     }
 
+    public Date getDate() {
+        return this.date;
+    }
+
     @Override
     public Where<Message, Object> modWhere(Where<Message, Object> where)
             throws SQLException {
@@ -97,6 +101,17 @@ public String getJsonFilter() throws JSONException {
         return "{}";
     }
 
+    @Override
+    public boolean equals(NarrowFilter filter) {
+        if (filter instanceof NarrowFilterByDate) {
+            NarrowFilterByDate filterByDate = (NarrowFilterByDate) filter;
+            return NarrowFilterByDate.isSameDay(this.getDate(),
+                    filterByDate.getDate());
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public String toString() {
         return "{}";

app/src/main/java/com/zulip/android/filters/NarrowFilterPM.java

@@ -110,6 +110,16 @@ public String getJsonFilter() throws JSONException {
                         TextUtils.join(",", emails)))).toString();
     }
 
+    @Override
+    public boolean equals(NarrowFilter filter) {
+        if (filter instanceof NarrowFilterPM) {
+            NarrowFilterPM filterPM = (NarrowFilterPM) filter;
+            return this.getTitle().equals(filterPM.getTitle());
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public String toString() {
         try {

app/src/main/java/com/zulip/android/filters/NarrowFilterSearch.java

@@ -78,6 +78,16 @@ public String getJsonFilter() throws JSONException {
         return filter.toString();
     }
 
+    @Override
+    public boolean equals(NarrowFilter filter) {
+        if (filter instanceof NarrowFilterSearch) {
+            NarrowFilterSearch filterSearch = (NarrowFilterSearch) filter;
+            return this.getTitle().equals(filterSearch.getTitle());
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public String toString() {
         try {

app/src/main/java/com/zulip/android/filters/NarrowFilterStream.java

@@ -104,4 +104,19 @@ public String getJsonFilter() throws JSONException {
         }
         return filter.toString();
     }
+
+    @Override
+    public boolean equals(NarrowFilter filter) {
+        if (filter instanceof NarrowFilterStream) {
+            NarrowFilterStream filterStream = (NarrowFilterStream) filter;
+            if (filterStream.getSubtitle() == null) {
+                return this.getSubtitle() == null && filterStream.getTitle().equals(this.getTitle());
+            } else {
+                return (filterStream.getTitle().equals(this.getTitle()) &&
+                        filterStream.getSubtitle().equals(this.getSubtitle()));
+            }
+        } else {
+            return false;
+        }
+    }
 }