|
|
|
@ -1025,6 +1025,11 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (nullable NSString *)profileNameForRecipientWithID:(NSString *)recipientID
|
|
|
|
|
{
|
|
|
|
|
return [self profileNameForRecipientWithID:recipientID avoidingWriteTransaction:NO];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (nullable NSString *)profileNameForRecipientWithID:(NSString *)recipientID avoidingWriteTransaction:(BOOL)avoidWriteTransaction
|
|
|
|
|
{
|
|
|
|
|
if ([self.tsAccountManager.localNumber isEqualToString:recipientID]) {
|
|
|
|
|
return self.localUserProfile.profileName;
|
|
|
|
@ -1047,6 +1052,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!avoidWriteTransaction) {
|
|
|
|
|
__block NSString *result;
|
|
|
|
|
|
|
|
|
|
[LKStorage writeSyncWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
|
|
|
@ -1060,6 +1066,9 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
|
|
|
|
|
} else {
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return recipientID;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (nullable NSString *)profileNameForRecipientWithID:(NSString *)recipientID transaction:(YapDatabaseReadWriteTransaction *)transaction
|
|
|
|
|