Bump version to 6.10.9

app/build.gradle

@@ -53,14 +53,14 @@ ktlint {
 }
 
 def canonicalVersionCode = 1205
-def canonicalVersionName = "6.10.5"
+def canonicalVersionName = "6.10.9"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 20,
+                  'armeabi-v7a' : 21,
+                  'arm64-v8a'   : 22,
+                  'x86'         : 23,
+                  'x86_64'      : 24]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 

app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt

@@ -170,6 +170,48 @@ class GroupTableTest {
     assertEquals(mmsGroup, actual)
   }
 
+  @Test
+  fun givenMultipleMmsGroups_whenIGetOrCreateMmsGroup_thenIExpectMyMmsGroup() {
+    val group1Members: List<RecipientId> = listOf(harness.self.id, harness.others[0], harness.others[1])
+    val group2Members: List<RecipientId> = listOf(harness.self.id, harness.others[0], harness.others[2])
+
+    val group1: GroupId = insertMmsGroup(group1Members)
+    val group2: GroupId = insertMmsGroup(group2Members)
+
+    val group1Result: GroupId = groupTable.getOrCreateMmsGroupForMembers(group1Members.toSet())
+    val group2Result: GroupId = groupTable.getOrCreateMmsGroupForMembers(group2Members.toSet())
+
+    assertEquals(group1, group1Result)
+    assertEquals(group2, group2Result)
+    assertNotEquals(group1Result, group2Result)
+  }
+
+  @Test
+  fun givenMultipleMmsGroupsWithDifferentMemberOrders_whenIGetOrCreateMmsGroup_thenIExpectMyMmsGroup() {
+    val group1Members: List<RecipientId> = listOf(harness.self.id, harness.others[0], harness.others[1], harness.others[2]).shuffled()
+    val group2Members: List<RecipientId> = listOf(harness.self.id, harness.others[0], harness.others[2], harness.others[3]).shuffled()
+
+    val group1: GroupId = insertMmsGroup(group1Members)
+    val group2: GroupId = insertMmsGroup(group2Members)
+
+    val group1Result: GroupId = groupTable.getOrCreateMmsGroupForMembers(group1Members.shuffled().toSet())
+    val group2Result: GroupId = groupTable.getOrCreateMmsGroupForMembers(group2Members.shuffled().toSet())
+
+    assertEquals(group1, group1Result)
+    assertEquals(group2, group2Result)
+    assertNotEquals(group1Result, group2Result)
+  }
+
+  @Test
+  fun givenMmsGroupWithOneMember_whenIGetOrCreateMmsGroup_thenIExpectMyMmsGroup() {
+    val groupMembers: List<RecipientId> = listOf(harness.self.id)
+    val group: GroupId = insertMmsGroup(groupMembers)
+
+    val groupResult: GroupId = groupTable.getOrCreateMmsGroupForMembers(groupMembers.toSet())
+
+    assertEquals(group, groupResult)
+  }
+
   @Test
   fun givenTwoGroupsWithoutMembers_whenIQueryThem_thenIExpectEach() {
     val g1 = insertPushGroup(listOf())

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java

@@ -3375,9 +3375,13 @@ public class ConversationParentFragment extends Fragment
     requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
 
     voiceNoteMediaController.pausePlayback();
-    recordingSession = new RecordingSession(audioRecorder.startRecording());
-
-    disposables.add(recordingSession);
+    try {
+      recordingSession = new RecordingSession(audioRecorder.startRecording());
+      disposables.add(recordingSession);
+    } catch (AssertionError err) {
+      Log.e(TAG, "Could not start audio recording.", err);
+      Toast.makeText(requireContext(), R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_SHORT).show();
+    }
   }
 
   @Override
@@ -3396,8 +3400,9 @@ public class ConversationParentFragment extends Fragment
 
     requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
-    recordingSession.completeRecording();
+    if (recordingSession != null) {
+      recordingSession.completeRecording();
+    }
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt

@@ -483,18 +483,30 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
   }
 
   fun getOrCreateMmsGroupForMembers(members: Set<RecipientId>): GroupId.Mms {
+    val joinedTestMembers = members
+      .toList()
+      .map { it.toLong() }
+      .sorted()
+      .joinToString(separator = ",")
+
     //language=sql
     val statement = """
-      SELECT ${MembershipTable.TABLE_NAME}.${MembershipTable.GROUP_ID} as gid
-      FROM ${MembershipTable.TABLE_NAME}
-      INNER JOIN $TABLE_NAME ON ${MembershipTable.TABLE_NAME}.${MembershipTable.GROUP_ID} = $TABLE_NAME.$GROUP_ID
-      WHERE ${MembershipTable.TABLE_NAME}.$RECIPIENT_ID IN (${members.joinToString(",") { it.serialize() }}) AND $TABLE_NAME.$MMS = 1
-      GROUP BY $TABLE_NAME.$GROUP_ID
-      HAVING (SELECT COUNT(*) FROM ${MembershipTable.TABLE_NAME} WHERE ${MembershipTable.GROUP_ID} = gid) = ${members.size}
-      ORDER BY ${MembershipTable.TABLE_NAME}.${MembershipTable.ID} ASC
+      SELECT 
+        $TABLE_NAME.$GROUP_ID as gid,
+        (
+            SELECT GROUP_CONCAT(${MembershipTable.RECIPIENT_ID}, ',')
+            FROM (
+              SELECT ${MembershipTable.TABLE_NAME}.${MembershipTable.RECIPIENT_ID}
+              FROM ${MembershipTable.TABLE_NAME}
+              WHERE ${MembershipTable.TABLE_NAME}.${MembershipTable.GROUP_ID} = $TABLE_NAME.$GROUP_ID
+              ORDER BY ${MembershipTable.TABLE_NAME}.${MembershipTable.RECIPIENT_ID} ASC
+            )
+        ) as $MEMBER_GROUP_CONCAT
+        FROM $TABLE_NAME
+        WHERE $MEMBER_GROUP_CONCAT = ?
     """.toSingleLine()
 
-    return readableDatabase.query(statement).use { cursor ->
+    return readableDatabase.rawQuery(statement, buildArgs(joinedTestMembers)).use { cursor ->
       if (cursor.moveToNext()) {
         return GroupId.parseOrThrow(cursor.requireNonNullString("gid")).requireMms()
       } else {

app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java

@@ -49,11 +49,11 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
     if (Build.VERSION.SDK_INT < 31) {
       nextTime = System.currentTimeMillis() + INTERVAL;
     } else {
-      LocalDateTime now  = LocalDateTime.now();
-      int hour = SignalStore.settings().getBackupHour();
-      int minute = SignalStore.settings().getBackupMinute();
-      LocalDateTime next = now.withHour(hour).withMinute(minute).withSecond(0);
-      if (now.getHour() >= 2) {
+      LocalDateTime now    = LocalDateTime.now();
+      int           hour   = SignalStore.settings().getBackupHour();
+      int           minute = SignalStore.settings().getBackupMinute();
+      LocalDateTime next   = now.withHour(hour).withMinute(minute).withSecond(0);
+      if (now.isAfter(next)) {
         next = next.plusDays(1);
       }