From bc1b2fe4739218889950449b9af4305fc14637cf Mon Sep 17 00:00:00 2001
From: Kevin Beaulieu <kevinmbeaulieu@gmail.com>
Date: Mon, 13 Mar 2017 20:27:30 -0400
Subject: [PATCH] Restrict default avatars to alphanumeric initials (#1519)
 (#1563)

---
 Signal/src/Models/OWSContactAvatarBuilder.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Signal/src/Models/OWSContactAvatarBuilder.m b/Signal/src/Models/OWSContactAvatarBuilder.m
index e93d427fd..35b232f6e 100644
--- a/Signal/src/Models/OWSContactAvatarBuilder.m
+++ b/Signal/src/Models/OWSContactAvatarBuilder.m
@@ -62,11 +62,13 @@ NS_ASSUME_NONNULL_BEGIN
     if (rangeOfLetters.location != NSNotFound) {
         // Contact name contains letters, so it's probably not just a phone number.
         // Make an image from the contact's initials
+        NSCharacterSet *excludeAlphanumeric = [NSCharacterSet alphanumericCharacterSet].invertedSet;
         NSArray *words =
             [self.contactName componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
         for (NSString *word in words) {
-            if (word.length > 0) {
-                NSString *firstLetter = [word substringToIndex:1];
+            NSString *trimmedWord = [word stringByTrimmingCharactersInSet:excludeAlphanumeric];
+            if (trimmedWord.length > 0) {
+                NSString *firstLetter = [trimmedWord substringToIndex:1];
                 [initials appendString:[firstLetter uppercaseString]];
             }
         }