From a1245baf6183fc1c593aeb4195cfcb9544bc919c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 5 Sep 2019 10:25:23 -0400
Subject: [PATCH] Don't show MMS groups in recent Signal contacts list.

---
 .../thoughtcrime/securesms/database/GroupDatabase.java   | 2 +-
 .../thoughtcrime/securesms/database/ThreadDatabase.java  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
index 9fce6e84cd..d737ff7c76 100644
--- a/src/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -50,7 +50,7 @@ public class GroupDatabase extends Database {
   private static final String AVATAR_DIGEST       = "avatar_digest";
   private static final String TIMESTAMP           = "timestamp";
   private static final String ACTIVE              = "active";
-  private static final String MMS                 = "mms";
+          static final String MMS                 = "mms";
 
   public static final String CREATE_TABLE =
       "CREATE TABLE " + TABLE_NAME +
diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 4ddc8445b6..d526566470 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -375,7 +375,14 @@ public class ThreadDatabase extends Database {
 
   public Cursor getRecentPushConversationList(int limit) {
     SQLiteDatabase db    = databaseHelper.getReadableDatabase();
-    String         where = MESSAGE_COUNT + " != 0 AND (" + RecipientDatabase.REGISTERED + " = " + RecipientDatabase.RegisteredState.REGISTERED.getId() + " OR " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.GROUP_ID + " NOT NULL)";
+    String         where = MESSAGE_COUNT + " != 0 AND " +
+                           "(" +
+                             RecipientDatabase.REGISTERED + " = " + RecipientDatabase.RegisteredState.REGISTERED.getId() + " OR " +
+                             "(" +
+                               GroupDatabase.TABLE_NAME + "." + GroupDatabase.GROUP_ID + " NOT NULL AND " +
+                               GroupDatabase.TABLE_NAME + "." + GroupDatabase.MMS + " = 0" +
+                             ")" +
+                           ")";
     String         query = createQuery(where, limit);
 
     return db.rawQuery(query, null);