Merge branch 'mkirk/fixup-color-for-new-conversation' into release/2.30.2

SignalMessaging/Views/ContactCellView.m

@@ -188,7 +188,7 @@ const CGFloat kContactCellAvatarTextMargin = 12;
             return self.thread.conversationColorName;
         } else {
             OWSAssertDebug(self.recipientId);
-            return [TSThread stableConversationColorNameForString:self.recipientId];
+            return [TSThread stableColorNameForNewConversationWithString:self.recipientId];
         }
     }();
 

SignalMessaging/utils/OWSContactAvatarBuilder.m

@@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
                             colorSeed:(NSString *)colorSeed
                              diameter:(NSUInteger)diameter
 {
-    NSString *colorName = [TSThread stableConversationColorNameForString:colorSeed];
+    NSString *colorName = [TSThread stableColorNameForNewConversationWithString:colorSeed];
     return [self initWithContactId:colorSeed name:nonSignalName colorName:(NSString *)colorName diameter:diameter];
 }
 

SignalServiceKit/src/Contacts/TSThread.h

@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSString *conversationColorName;
 
 - (void)updateConversationColorName:(NSString *)colorName transaction:(YapDatabaseReadWriteTransaction *)transaction;
-+ (NSString *)stableConversationColorNameForString:(NSString *)colorSeed;
++ (NSString *)stableColorNameForNewConversationWithString:(NSString *)colorSeed;
 
 /**
  * @returns

SignalServiceKit/src/Contacts/TSThread.m

@@ -52,9 +52,9 @@ NS_ASSUME_NONNULL_BEGIN
         NSString *_Nullable contactId = self.contactIdentifier;
         if (contactId.length > 0) {
             // To be consistent with colors synced to desktop
-            _conversationColorName = [self.class stableConversationColorNameForString:contactId];
+            _conversationColorName = [self.class stableColorNameForNewConversationWithString:contactId];
         } else {
-            _conversationColorName = [self.class stableConversationColorNameForString:self.uniqueId];
+            _conversationColorName = [self.class stableColorNameForNewConversationWithString:self.uniqueId];
         }
     }
 
@@ -72,9 +72,9 @@ NS_ASSUME_NONNULL_BEGIN
         NSString *_Nullable contactId = self.contactIdentifier;
         if (contactId.length > 0) {
             // To be consistent with colors synced to desktop
-            _conversationColorName = [self.class stableConversationColorNameForString:contactId];
+            _conversationColorName = [self.class stableColorNameForLegacyConversationWithString:contactId];
         } else {
-            _conversationColorName = [self.class stableConversationColorNameForString:self.uniqueId];
+            _conversationColorName = [self.class stableColorNameForLegacyConversationWithString:self.uniqueId];
         }
     }
     
@@ -441,14 +441,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Conversation Color
 
-+ (NSString *)randomConversationColorName
++ (NSArray<NSString *> *)colorNamesForNewConversation
 {
-    NSUInteger count = self.conversationColorNames.count;
+    // all conversation colors except "steel"
-    NSUInteger index = arc4random_uniform((uint32_t)count);
+    return @[
-    return [self.conversationColorNames objectAtIndex:index];
+        @"crimson",
+        @"vermilion",
+        @"burlap",
+        @"forest",
+        @"wintergreen",
+        @"teal",
+        @"blue",
+        @"indigo",
+        @"violet",
+        @"plum",
+        @"taupe"
+    ];
 }
 
-+ (NSString *)stableConversationColorNameForString:(NSString *)colorSeed
++ (NSString *)stableConversationColorNameForString:(NSString *)colorSeed colorNames:(NSArray<NSString *> *)colorNames
 {
     NSData *contactData = [colorSeed dataUsingEncoding:NSUTF8StringEncoding];
 
@@ -461,11 +472,23 @@ NS_ASSUME_NONNULL_BEGIN
         OWSFailDebug(@"could not compute hash for color seed.");
     }
 
-    NSUInteger index = (hash % [self.conversationColorNames count]);
+    NSUInteger index = (hash % colorNames.count);
-    return [self.conversationColorNames objectAtIndex:index];
+    return [colorNames objectAtIndex:index];
+}
+
++ (NSString *)stableColorNameForNewConversationWithString:(NSString *)colorSeed
+{
+    return [self stableConversationColorNameForString:colorSeed colorNames:self.colorNamesForNewConversation];
+}
+
+// After introducing new conversation colors, we want to try to maintain as close
+// as possible to the old color for an existing thread.
++ (NSString *)stableColorNameForLegacyConversationWithString:(NSString *)colorSeed
+{
+    return [self stableConversationColorNameForString:colorSeed colorNames:self.legacyConversationColorNames];
 }
 
-+ (NSArray<NSString *> *)conversationColorNames
++ (NSArray<NSString *> *)legacyConversationColorNames
 {
     return @[
              @"red",

SignalServiceKit/src/Contacts/Threads/TSContactThread.m

@@ -101,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
     if (contactThread) {
         return contactThread.conversationColorName;
     }
-    return [self stableConversationColorNameForString:recipientId];
+    return [self stableColorNameForNewConversationWithString:recipientId];
 }
 
 @end

SignalServiceKit/src/Contacts/Threads/TSGroupThread.m

@@ -246,7 +246,7 @@ NSString *const TSGroupThread_NotificationKey_UniqueId = @"TSGroupThread_Notific
 {
     OWSAssertDebug(groupId.length > 0);
 
-    return [self.class stableConversationColorNameForString:[self threadIdFromGroupId:groupId]];
+    return [self.class stableColorNameForNewConversationWithString:[self threadIdFromGroupId:groupId]];
 }
 
 @end

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m

@@ -105,7 +105,7 @@ NS_ASSUME_NONNULL_BEGIN
             conversationColorName = contactThread.conversationColorName;
             disappearingMessagesConfiguration = [contactThread disappearingMessagesConfigurationWithTransaction:transaction];
         } else {
-            conversationColorName = [TSThread stableConversationColorNameForString:signalAccount.recipientId];
+            conversationColorName = [TSThread stableColorNameForNewConversationWithString:signalAccount.recipientId];
         }
 
         [contactsOutputStream writeSignalAccount:signalAccount