Respond to CR.
This commit is contained in:
parent
5c7b98e5c4
commit
e6dceffdbd
|
@ -857,7 +857,7 @@
|
|||
/* No comment provided by engineer. */
|
||||
"ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Safety number changed. Tap to verify.";
|
||||
|
||||
/* Format string for 'unregistered user' error. Embeds {{the unregistered user's signal id}}. */
|
||||
/* Format string for 'unregistered user' error. Embeds {{the unregistered user's name or signal id}}. */
|
||||
"ERROR_UNREGISTERED_USER_FORMAT" = "Unregistered User: %@";
|
||||
|
||||
/* action sheet header when re-sending message which failed because of too many attempts */
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
//
|
||||
|
||||
#import "TSInfoMessage.h"
|
||||
#import "ContactsManagerProtocol.h"
|
||||
#import "NSDate+OWS.h"
|
||||
#import "TextSecureKitEnv.h"
|
||||
#import <YapDatabase/YapDatabaseConnection.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
@ -118,10 +120,12 @@ NSUInteger TSInfoMessageSchemaVersion = 1;
|
|||
return NSLocalizedString(@"UNSUPPORTED_ATTACHMENT", nil);
|
||||
case TSInfoMessageUserNotRegistered:
|
||||
if (self.unregisteredRecipientId.length > 0) {
|
||||
id<ContactsManagerProtocol> contactsManager = [TextSecureKitEnv sharedEnv].contactsManager;
|
||||
NSString *recipientName = [contactsManager displayNameForPhoneIdentifier:self.unregisteredRecipientId];
|
||||
return [NSString stringWithFormat:NSLocalizedString(@"ERROR_UNREGISTERED_USER_FORMAT",
|
||||
@"Format string for 'unregistered user' error. Embeds {{the "
|
||||
@"unregistered user's signal id}}."),
|
||||
self.unregisteredRecipientId];
|
||||
@"unregistered user's name or signal id}}."),
|
||||
recipientName];
|
||||
} else {
|
||||
return NSLocalizedString(@"CONTACT_DETAIL_COMM_TYPE_INSECURE", nil);
|
||||
}
|
||||
|
|
|
@ -29,5 +29,4 @@ extern NSString *const kNSNotificationName_BlockedPhoneNumbersDidChange;
|
|||
|
||||
@end
|
||||
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class Contact;
|
||||
@class PhoneNumber;
|
||||
@class SignalAccount;
|
||||
|
@ -9,10 +11,12 @@
|
|||
|
||||
@protocol ContactsManagerProtocol <NSObject>
|
||||
|
||||
- (NSString * _Nonnull)displayNameForPhoneIdentifier:(NSString * _Nullable)phoneNumber;
|
||||
- (NSArray<SignalAccount *> * _Nonnull)signalAccounts;
|
||||
- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber;
|
||||
- (NSArray<SignalAccount *> *)signalAccounts;
|
||||
|
||||
- (BOOL)isSystemContact:(NSString *)recipientId;
|
||||
- (BOOL)isSystemContactWithSignalAccount:(NSString *)recipientId;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
Loading…
Reference in New Issue