Allow narrowing to stream or subject more easily

Author: niftynei

app/src/main/java/com/zulip/android/MessageAdapter.java

@@ -86,8 +86,9 @@ public View getView(int position, View convertView, ViewGroup group) {
             display_recipient.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    // TODO: narrow to stream.
-                    Toast.makeText(v.getContext(), "Narrow to stream", Toast.LENGTH_LONG).show();
+                    if (getContext() instanceof NarrowListener) {
+                        ((NarrowListener) getContext()).onNarrow(new NarrowFilterStream(message.getStream(), null));
+                    }
                 }
             });
         }
@@ -106,8 +107,9 @@ public void onClick(View v) {
             instance.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    // TODO: narrow to thread
-                    Toast.makeText(v.getContext(), "Narrow to thread", Toast.LENGTH_LONG).show();
+                    if (getContext() instanceof NarrowListener) {
+                        ((NarrowListener) getContext()).onNarrow(new NarrowFilterStream(message.getStream(), message.getSubject()));
+                    }
                 }
             });
         }

app/src/main/java/com/zulip/android/MessageListFragment.java

@@ -25,7 +25,6 @@
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -286,8 +285,7 @@ public void onCreateContextMenu(ContextMenu menu, View v,
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        Message message = itemFromMenuInfo((AdapterContextMenuInfo) item
-                .getMenuInfo());
+        Message message = itemFromMenuInfo(item.getMenuInfo());
         switch (item.getItemId()) {
             case R.id.reply_to_stream:
                 mListener.openCompose(message.getStream(), message.getSubject());
@@ -299,18 +297,17 @@ public boolean onContextItemSelected(MenuItem item) {
                 mListener.openCompose(message.getSender().getEmail());
                 return true;
             case R.id.narrow_to_private:
-                ((ZulipActivity) getActivity()).doNarrow(new NarrowFilterPM(Arrays
-                        .asList(message.getRecipients(app))));
+                ((ZulipActivity) getActivity()).doNarrow(new NarrowFilterPM(Arrays.asList(message.getRecipients(app))));
                 return true;
             case R.id.narrow_to_stream:
-                // TODO This should probably use an interface defining a custom
-                // listener.
-                ((ZulipActivity) getActivity()).doNarrow(new NarrowFilterStream(
-                        message.getStream(), null));
+                if (getActivity() instanceof NarrowListener) {
+                    ((NarrowListener) getActivity()).onNarrow(new NarrowFilterStream(message.getStream(), null));
+                }
                 return true;
             case R.id.narrow_to_subject:
-                ((ZulipActivity) getActivity()).doNarrow(new NarrowFilterStream(
-                        message.getStream(), message.getSubject()));
+                if (getActivity() instanceof NarrowListener) {
+                    ((NarrowListener) getActivity()).onNarrow(new NarrowFilterStream(message.getStream(), message.getSubject()));
+                }
                 return true;
             case R.id.copy_message:
                 copyMessage(message);

app/src/main/java/com/zulip/android/NarrowListener.java

@@ -0,0 +1,8 @@
+package com.zulip.android;
+
+/**
+ * Listener for narrow actions
+ */
+public interface NarrowListener {
+    void onNarrow(NarrowFilter narrowFilter);
+}

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

@@ -48,7 +48,7 @@
 import com.j256.ormlite.android.AndroidDatabaseResults;
 
 public class ZulipActivity extends FragmentActivity implements
-        MessageListFragment.Listener {
+        MessageListFragment.Listener, NarrowListener {
 
     ZulipApp app;
 
@@ -416,6 +416,11 @@ public void doNarrow(NarrowFilter filter) {
         narrowedList.onReadyToDisplay(true);
     }
 
+    @Override
+    public void onNarrow(NarrowFilter narrowFilter) {
+        doNarrow(narrowFilter);
+    }
+
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);