invert the approach

bindings_ffi/src/mls.rs

@@ -858,7 +858,7 @@ impl FfiConversations {
 
     pub async fn sync_all_conversations(&self) -> Result<u32, GenericError> {
         let inner = self.inner_client.as_ref();
-        let groups = inner.find_groups(GroupQueryArgs::default())?;
+        let groups = inner.find_groups(GroupQueryArgs::default().include_sync_groups())?;
 
         log::info!(
             "groups for client inbox id {:?}: {:?}",

xmtp_mls/src/groups/device_sync/message_sync.rs

@@ -14,18 +14,11 @@ where
         &self,
         conn: &DbConnection,
     ) -> Result<Vec<Syncable>, DeviceSyncError> {
-        let mut groups: Vec<_> = conn
-            .find_groups(GroupQueryArgs::default().conversation_type(ConversationType::Group))?
+        let groups = conn
+            .find_groups(GroupQueryArgs::default())?
             .into_iter()
             .map(Syncable::Group)
             .collect();
-        let mut dms: Vec<_> = conn
-            .find_groups(GroupQueryArgs::default().conversation_type(ConversationType::Dm))?
-            .into_iter()
-            .map(Syncable::Group)
-            .collect();
-
-        groups.append(&mut dms);
 
         Ok(groups)
     }

xmtp_mls/src/storage/encrypted_store/group.rs

@@ -124,6 +124,7 @@ pub struct GroupQueryArgs {
     pub limit: Option<i64>,
     pub conversation_type: Option<ConversationType>,
     pub consent_state: Option<ConsentState>,
+    pub include_sync_groups: bool,
 }
 
 impl AsRef<GroupQueryArgs> for GroupQueryArgs {
@@ -188,6 +189,11 @@ impl GroupQueryArgs {
         self.consent_state = consent_state;
         self
     }
+
+    pub fn include_sync_groups(mut self) -> Self {
+        self.include_sync_groups = true;
+        self
+    }
 }
 
 impl DbConnection {
@@ -205,6 +211,7 @@ impl DbConnection {
             limit,
             conversation_type,
             consent_state,
+            include_sync_groups,
         } = args.as_ref();
 
         let mut query = groups_dsl::groups
@@ -231,6 +238,12 @@ impl DbConnection {
             query = query.filter(groups_dsl::conversation_type.eq(conversation_type));
         }
 
+        // Were sync groups explicitly asked for? Was the include_sync_groups flag set to true?
+        // Otherwise filter sync groups out by default.
+        if !matches!(conversation_type, Some(ConversationType::Sync)) && !include_sync_groups {
+            query = query.filter(groups_dsl::conversation_type.ne(ConversationType::Sync));
+        }
+
         let groups = if let Some(consent_state) = consent_state {
             if *consent_state == ConsentState::Unknown {
                 let query = query