Insert session switchover events when appropriate.

signalapp · Jan 25, 2023 · a7d9bd9 · a7d9bd9
1 parent 7745ae6
commit a7d9bd9
Show file tree

Hide file tree

Showing 10 changed files with 331 additions and 76 deletions.
diff --git a/...idTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt b/...idTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
diff --git a/...java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt b/...java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt
@@ -111,7 +111,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A),
           PnpOperation.SetAci(result.id, ACI_A)
         )
@@ -131,9 +131,9 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -151,7 +151,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A)
         )
       ),
@@ -170,7 +170,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetAci(result.id, ACI_A)
         )
       ),
@@ -189,9 +189,9 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -209,7 +209,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A)
         )
       ),
@@ -228,7 +228,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A)
         )
@@ -248,10 +248,10 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -269,15 +269,15 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A),
           PnpOperation.ChangeNumberInsert(
             recipientId = result.id,
             oldE164 = E164_B,
             newE164 = E164_A
           ),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -295,7 +295,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
         )
       ),
@@ -314,7 +314,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.ChangeNumberInsert(
             recipientId = result.id,
@@ -338,7 +338,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetPni(result.id, PNI_A)
         )
@@ -358,7 +358,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetPni(result.id, PNI_A),
           PnpOperation.ChangeNumberInsert(
@@ -387,7 +387,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.thirdId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -416,7 +416,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -441,7 +441,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -470,7 +470,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(
             recipientId = result.firstId,
@@ -496,7 +496,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.Merge(
             primaryId = result.firstId,
@@ -522,7 +522,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(result.firstId, PNI_A)
         )
@@ -545,11 +545,11 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(result.firstId, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.secondId),
-          PnpOperation.SessionSwitchoverInsert(result.firstId)
+          PnpOperation.SessionSwitchoverInsert(result.secondId, E164_A),
+          PnpOperation.SessionSwitchoverInsert(result.firstId, E164_A)
         )
       ),
       result.changeSet
@@ -570,7 +570,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.secondId,
             secondaryId = result.firstId
@@ -595,7 +595,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.SetPni(
             recipientId = result.secondId,
@@ -625,7 +625,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.SetPni(
             recipientId = result.secondId,
@@ -660,7 +660,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.RemoveE164(result.secondId),
           PnpOperation.Merge(
@@ -692,7 +692,7 @@ class RecipientTableTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemoveE164(result.secondId),
           PnpOperation.Merge(
             primaryId = result.secondId,

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java b/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java
@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.util;
+
+/**
+ * A class that allows us to inject feature flags during tests.
+ */
+public final class FeatureFlagsAccessor {
+
+  public static void forceValue(String key, Object value) {
+    FeatureFlags.FORCED_VALUES.put(FeatureFlags.PHONE_NUMBER_PRIVACY, true);
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java
@@ -73,6 +73,7 @@
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExportState;
 import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails;
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent;
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.insights.InsightsConstants;
@@ -94,6 +95,7 @@
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.stories.Stories;
 import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -1125,6 +1127,26 @@ public void insertThreadMergeEvent(@NonNull RecipientId recipientId, long thread
     ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
   }
 
+  public void insertSessionSwitchoverEvent(@NonNull RecipientId recipientId, long threadId, @NonNull SessionSwitchoverEvent event) {
+    if (!FeatureFlags.phoneNumberPrivacy()) {
+      throw new IllegalStateException("Should not occur in a non-PNP world!");
+    }
+
+    ContentValues values = new ContentValues();
+    values.put(RECIPIENT_ID, recipientId.serialize());
+    values.put(RECIPIENT_DEVICE_ID, 1);
+    values.put(DATE_RECEIVED, System.currentTimeMillis());
+    values.put(DATE_SENT, System.currentTimeMillis());
+    values.put(READ, 1);
+    values.put(TYPE, MessageTypes.SESSION_SWITCHOVER_TYPE);
+    values.put(THREAD_ID, threadId);
+    values.put(BODY, Base64.encodeBytes(event.toByteArray()));
+
+    getWritableDatabase().insert(TABLE_NAME, null, values);
+
+    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
+  }
+
   public void insertSmsExportMessage(@NonNull RecipientId recipientId, long threadId) {
     ContentValues values = new ContentValues();
     values.put(RECIPIENT_ID, recipientId.serialize());

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java
@@ -50,6 +50,7 @@ public interface MessageTypes {
   long BOOST_REQUEST_TYPE       = 15;
   long THREAD_MERGE_TYPE        = 16;
   long SMS_EXPORT_TYPE          = 17;
+  long SESSION_SWITCHOVER_TYPE  = 18;
 
   long BASE_INBOX_TYPE                    = 20;
   long BASE_OUTBOX_TYPE                   = 21;
@@ -207,6 +208,10 @@ static boolean isThreadMergeType(long type) {
     return (type & BASE_TYPE_MASK) == THREAD_MERGE_TYPE;
   }
 
+  static boolean isSessionSwitchoverType(long type) {
+    return (type & BASE_TYPE_MASK) == SESSION_SWITCHOVER_TYPE;
+  }
+
   static boolean isSecureType(long type) {
     return (type & SECURE_MESSAGE_BIT) != 0;
   }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt
@@ -37,7 +37,7 @@ data class PnpDataSet(
    * Applies the set of operations and returns the resulting dataset.
    * Important: This only occurs _in memory_. You must still apply the operations to disk to persist them.
    */
-  fun perform(operations: List<PnpOperation>): PnpDataSet {
+  fun perform(operations: LinkedHashSet<PnpOperation>): PnpDataSet {
     if (operations.isEmpty()) {
       return this
     }
@@ -136,7 +136,7 @@ data class PnpDataSet(
  */
 data class PnpChangeSet(
   val id: PnpIdResolver,
-  val operations: List<PnpOperation> = emptyList(),
+  val operations: LinkedHashSet<PnpOperation> = linkedSetOf(),
   val breadCrumbs: List<String> = emptyList()
 ) {
   // We want to exclude breadcrumbs from equality for testing purposes
@@ -213,7 +213,8 @@ sealed class PnpOperation {
   }
 
   data class SessionSwitchoverInsert(
-    override val recipientId: RecipientId
+    override val recipientId: RecipientId,
+    val e164: String?
   ) : PnpOperation()
 
   data class ChangeNumberInsert(