Merge tag 'v6.29.2' into molly-29

mollyim · Aug 16, 2023 · 9c9b660 · 9c9b660
2 parents 11c700d + 28b63e0
commit 9c9b660
Show file tree

Hide file tree

Showing 233 changed files with 11,126 additions and 2,092 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,8 +56,8 @@ ext {
     MAPS_API_KEY = getEnv('CI_MAPS_API_KEY') ?: mapsApiKey
 }
 
-def canonicalVersionCode = 1310
-def canonicalVersionName = "6.28.6"
+def canonicalVersionCode = 1314
+def canonicalVersionName = "6.29.2"
 def mollyRevision = 0
 
 def postFixSize = 100

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
@@ -241,12 +241,12 @@ class GroupTableTest {
   private fun insertPushGroup(
     members: List<DecryptedMember> = listOf(
       DecryptedMember.newBuilder()
-        .setUuid(harness.self.requireServiceId().toByteString())
+        .setAciBytes(harness.self.requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build(),
       DecryptedMember.newBuilder()
-        .setUuid(Recipient.resolved(harness.others[0]).requireServiceId().toByteString())
+        .setAciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build()
@@ -265,14 +265,14 @@ class GroupTableTest {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
 
     val selfMember: DecryptedMember = DecryptedMember.newBuilder()
-      .setUuid(harness.self.requireServiceId().toByteString())
+      .setAciBytes(harness.self.requireAci().toByteString())
       .setJoinedAtRevision(0)
       .setRole(Member.Role.DEFAULT)
       .build()
 
     val otherMembers: List<DecryptedMember> = others.map { id ->
       DecryptedMember.newBuilder()
-        .setUuid(Recipient.resolved(id).requireServiceId().toByteString())
+        .setAciBytes(Recipient.resolved(id).requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build()

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
@@ -24,14 +24,14 @@ class RecipientTableTest {
   val harness = SignalActivityRule()
 
   @Test
-  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIDoNotExpectHiddenToBeReturned() {
+  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIExpectHiddenToBeReturned() {
     val hiddenRecipient = harness.others[0]
     SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
     SignalDatabase.recipients.markHidden(hiddenRecipient)
 
     val results = SignalDatabase.recipients.queryAllContacts("Hidden")!!
 
-    assertEquals(0, results.count)
+    assertEquals(1, results.count)
   }
 
   @Test

diff --git a/...va/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt b/...va/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt
@@ -92,12 +92,12 @@ class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorT
       .addAllMembers(
         listOf(
           DecryptedMember.newBuilder()
-            .setUuid(harness.self.requireServiceId().toByteString())
+            .setAciBytes(harness.self.requireAci().toByteString())
             .setJoinedAtRevision(0)
             .setRole(Member.Role.DEFAULT)
             .build(),
           DecryptedMember.newBuilder()
-            .setUuid(sender.requireServiceId().toByteString())
+            .setAciBytes(sender.requireAci().toByteString())
             .setJoinedAtRevision(0)
             .setRole(Member.Role.DEFAULT)
             .build()

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
@@ -44,7 +44,6 @@ class ContactRecordProcessorTest {
     }
 
     val remote2 = buildRecord(STORAGE_ID_C) {
-      setAci(PNI_A.toString())
       setPni(PNI_A.toString())
       setE164(E164_A)
     }

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
@@ -8,16 +8,16 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import kotlin.random.Random
 
 /**
  * Helper methods for creating groups for message processing tests et al.
  */
 object GroupTestingUtils {
-  fun member(serviceId: ServiceId, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
+  fun member(aci: ACI, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
     return DecryptedMember.newBuilder()
-      .setUuid(serviceId.toByteString())
+      .setAciBytes(aci.toByteString())
       .setJoinedAtRevision(revision)
       .setRole(role)
       .build()
@@ -43,7 +43,7 @@ object GroupTestingUtils {
   }
 
   fun Recipient.asMember(): DecryptedMember {
-    return member(serviceId = requireServiceId())
+    return member(aci = requireAci())
   }
 
   data class TestGroupInfo(val groupId: GroupId.V2, val masterKey: GroupMasterKey, val recipientId: RecipientId)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -15,12 +15,14 @@
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import org.thoughtcrime.securesms.components.DebugLogsPromptDialogFragment;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
 import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSheetFragment;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
+import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -134,6 +136,10 @@ protected void onResume() {
     }
 
     updateTabVisibility();
+
+    if (SlowNotificationHeuristics.shouldPromptUserForLogs()) {
+      DebugLogsPromptDialogFragment.show(this, getSupportFragmentManager());
+    }
   }
 
   @Override