TEMP: Remove the unread counts from stream drawer till the bugs are fixed

Author: kunall17

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

@@ -31,20 +31,19 @@ public ExpandableStreamDrawerAdapter(final Context context, Cursor cursor, int g
 
     @Override
     public Cursor getChildrenCursor(Cursor groupCursor) {
-        int pointer = zulipApp.getPointer();
         List<String[]> results = new ArrayList<>();
         try {
-            results = ZulipApp.get().getDao(Message.class).queryRaw("SELECT DISTINCT subject, count(case when messages.id > " + pointer + " or messages." + Message.MESSAGE_READ_FIELD + " = 0 then 1 end) as unreadcount FROM messages " +
+            results = ZulipApp.get().getDao(Message.class).queryRaw("SELECT DISTINCT subject FROM messages " +
                     "JOIN streams ON streams.id=messages.stream " +
                     "WHERE streams.id=" + groupCursor.getInt(0) + " and streams." + Stream.SUBSCRIBED_FIELD + " = " + "1 group by subject").getResults();
         } catch (SQLException e) {
             ZLog.logException(e);
         }
-        MatrixCursor matrixCursor = new MatrixCursor(new String[]{"subject", "_id", UNREAD_TABLE_NAME});
+        MatrixCursor matrixCursor = new MatrixCursor(new String[]{"subject", "_id"});
 
         for (String[] result : results) {
             try {
-                matrixCursor.addRow(new String[]{result[0], String.valueOf(groupCursor.getInt(0)), result[1]});
+                matrixCursor.addRow(new String[]{result[0], String.valueOf(groupCursor.getInt(0))});
             } catch (Exception e) {
                 ZLog.logException(e);
             }

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

@@ -668,9 +668,7 @@ private Callable<Cursor> getSteamCursorGenerator() {
         Callable<Cursor> steamCursorGenerator = new Callable<Cursor>() {
             @Override
             public Cursor call() throws Exception {
-                int pointer = app.getPointer();
-                String query = "SELECT s.id as _id,  s.name, s.color, count(case when m.id > " + pointer + " or m." + Message.MESSAGE_READ_FIELD
-                        + " = 0 then 1 end) as " + ExpandableStreamDrawerAdapter.UNREAD_TABLE_NAME
+                String query = "SELECT s.id as _id,  s.name, s.color"
                         + " FROM streams as s LEFT JOIN messages as m ON s.id=m.stream ";
                 String selectArg = null;
                 if (!etSearchStream.getText().toString().equals("") && !etSearchStream.getText().toString().isEmpty()) {
@@ -1192,11 +1190,11 @@ public void onAnimationRepeat(Animator animator) {
      */
     private void setupListViewAdapter() {
         streamsDrawerAdapter = null;
-        String[] groupFrom = {Stream.NAME_FIELD, Stream.COLOR_FIELD, ExpandableStreamDrawerAdapter.UNREAD_TABLE_NAME};
-        int[] groupTo = {R.id.name, R.id.stream_dot, R.id.unread_group};
+        String[] groupFrom = {Stream.NAME_FIELD, Stream.COLOR_FIELD};
+        int[] groupTo = {R.id.name, R.id.stream_dot};
         // Comparison of data elements and View
-        String[] childFrom = {Message.SUBJECT_FIELD, ExpandableStreamDrawerAdapter.UNREAD_TABLE_NAME};
-        int[] childTo = {R.id.name_child, R.id.unread_child};
+        String[] childFrom = {Message.SUBJECT_FIELD};
+        int[] childTo = {R.id.name_child};
         final ExpandableListView streamsDrawer = (ExpandableListView) findViewById(R.id.streams_drawer);
         streamsDrawer.setGroupIndicator(null);
         try {