Search in current narrowed view.

Currently, search is performed in home view. This is especially
undesirable when the query gives a lot of matching results. It'd be
helpful to be able to search in current view of the user.

Author: Sam1301

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

@@ -1971,7 +1971,12 @@ private boolean prepareSearchView(Menu menu) {
             searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String s) {
-                    onNarrow(new NarrowFilterSearch(s));
+                    if (narrowedList != null) {
+                        onNarrow(new NarrowFilterSearch(s, narrowedList.filter));
+                    } else {
+                        onNarrow(new NarrowFilterSearch(s, null));
+                    }
+
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
                         mSearchMenuItem.collapseActionView();
                     }
@@ -2033,7 +2038,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                                 public void onClick(
                                         DialogInterface dialogInterface, int i) {
                                     String query = editText.getText().toString();
-                                    onNarrow(new NarrowFilterSearch(query));
+                                    if (narrowedList != null) {
+                                        onNarrow(new NarrowFilterSearch(query, narrowedList.filter));
+                                    } else {
+                                        onNarrow(new NarrowFilterSearch(query, null));
+                                    }
                                 }
                             });
                     builder.show();

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

@@ -16,23 +16,28 @@
 
 /**
  * Narrow based on search terms
+ * {@link NarrowFilterSearch#query} is the search query
+ * {@link NarrowFilterSearch#filter} indicates the current narrow filter
  */
 public class NarrowFilterSearch implements NarrowFilter {
     public static final Creator<NarrowFilterSearch> CREATOR = new Creator<NarrowFilterSearch>() {
         @Override
         public NarrowFilterSearch createFromParcel(Parcel parcel) {
-            return new NarrowFilterSearch(parcel.readString());
+            return new NarrowFilterSearch(parcel.readString(), null);
         }
 
         @Override
         public NarrowFilterSearch[] newArray(int i) {
             return new NarrowFilterSearch[i];
         }
     };
-    private final String query;
 
-    public NarrowFilterSearch(String query) {
+    private String query;
+    private NarrowFilter filter;
+
+    public NarrowFilterSearch(String query, NarrowFilter filter) {
         this.query = query;
+        this.filter = filter;
     }
 
     @Override
@@ -47,8 +52,10 @@ public Where<Message, Object> modWhere(Where<Message, Object> where)
 
     @Override
     public boolean matches(Message msg) {
-        //api matching for us
-        return true;
+        // api gives a list of messages matching the search query
+        // when in home view, we want to show all the matching results
+        // when narrowed, we want to show messages which match the current narrow of user
+        return filter == null || filter.matches(msg);
     }
 
     @Override

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

@@ -2,6 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 import com.j256.ormlite.stmt.SelectArg;
 import com.j256.ormlite.stmt.Where;
@@ -71,8 +72,14 @@ public String toString() {
 
     @Override
     public boolean matches(Message msg) {
-        return msg.getType() == MessageType.STREAM_MESSAGE
-                && msg.getStream().equals(stream);
+        if (TextUtils.isEmpty(this.subject)) {
+            return msg.getType() == MessageType.STREAM_MESSAGE
+                    && msg.getStream().equals(stream);
+        } else {
+            return msg.getType() == MessageType.STREAM_MESSAGE
+                    && msg.getStream().equals(stream)
+                    && this.subject.equals(msg.getSubject());
+        }
     }
 
     @Override