From 263846bba01fc340614e812c5b0cb8c6d651ebea Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 23 Oct 2017 09:52:10 -0700
Subject: [PATCH] Fix mms group migration for those who haven't encountered it
 yet

Fixes #7091
// FREEBIE
---
 src/org/thoughtcrime/securesms/database/DatabaseFactory.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
index 0e06a28aa..bb95a7273 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
@@ -56,6 +56,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -1241,6 +1242,8 @@ public class DatabaseFactory {
 
             members.add(DelimiterUtil.escape(TextSecurePreferences.getLocalNumber(context), ','));
 
+            Collections.sort(members);
+
             String        encodedGroupId = "__signal_mms_group__!" + Hex.toStringCondensed(groupId);
             ContentValues groupValues    = new ContentValues();
             ContentValues threadValues   = new ContentValues();