Merge branch 'charlesmchen/padEmptyProfileName'

This commit is contained in:
Matthew Chen 2017-08-21 17:49:10 -04:00
commit 673c44e131

View File

@ -1178,11 +1178,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
- (nullable NSData *)encryptProfileNameWithUnpaddedName:(NSString *)name
{
// TODO: Should this be nil or a padded-out empty string?
// if (name.length == 0) {
// return nil;
// }
NSData *nameData = [name dataUsingEncoding:NSUTF8StringEncoding];
if (nameData.length > kOWSProfileManager_NameDataLength) {
OWSFail(@"%@ name data is too long with length:%lu", self.tag, (unsigned long)nameData.length);