oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hook up public key checking

This commit is contained in:
Niels Andriesse 2019-05-06 13:30:39 +10:00
parent 4ce9228afd
commit 4c7e653cef
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Signal/src/ViewControllers/NewContactThreadViewController.m
View File

@ -398,18 +398,24 @@ NS_ASSUME_NONNULL_BEGIN
// Loki:
// ========
NSString *publicKey = self.searchBar.text;
// TODO: Validate public key and show an error if something's wrong
OWSTableSection *newConversationSection = [OWSTableSection new];
[newConversationSection
addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"Start a Conversation", @"")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"start_conversation")
customRowHeight:UITableViewAutomaticDimension
actionBlock:^{
[weakSelf newConversationWithRecipientId:publicKey];
}]];
[contents addSection:newConversationSection];
BOOL isValid = [ECKeyPair isValidHexEncodedPublicKeyWithCandidate:publicKey];
if (!isValid) {
OWSTableSection *invalidPublicKeySection = [OWSTableSection new];
[invalidPublicKeySection
addItem:[OWSTableItem softCenterLabelItemWithText:NSLocalizedString(@"Invalid public key", @"")
customRowHeight:UITableViewAutomaticDimension]];
[contents addSection:invalidPublicKeySection];
} else {
OWSTableSection *newConversationSection = [OWSTableSection new];
[newConversationSection
addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"Start a Conversation", @"")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"start_conversation")
customRowHeight:UITableViewAutomaticDimension
actionBlock:^{
[weakSelf newConversationWithRecipientId:publicKey];
}]];
[contents addSection:newConversationSection];
}
// ========
for (OWSTableSection *section in [self contactsSectionsForSearch]) {
[contents addSection:section];
@ -728,13 +734,18 @@ NS_ASSUME_NONNULL_BEGIN
[sections addObject:inviteeSection];
}
// Loki:
// ========
NSString *publicKey = self.searchBar.text;
BOOL isValidPublicKey = [ECKeyPair isValidHexEncodedPublicKeyWithCandidate:publicKey];
// ========
if (!hasSearchResults) {
if (isValidPublicKey && !hasSearchResults) {
// No Search Results
OWSTableSection *noResultsSection = [OWSTableSection new];
[noResultsSection
addItem:[OWSTableItem softCenterLabelItemWithText:
NSLocalizedString(@"SETTINGS_BLOCK_LIST_NO_SEARCH_RESULTS",
NSLocalizedString(@"No search results",
@"A label that indicates the user's search has no matching results.")
customRowHeight:UITableViewAutomaticDimension]];

2
Signal/translations/en.lproj/Localizable.strings
View File

@ -2566,3 +2566,5 @@
"Your mnemonic couldn't be verified. Please check what you entered and try again." = "Your mnemonic couldn't be verified. Please check what you entered and try again.";
"Search by name or public key" = "Search by name or public key";
"Start a Conversation" = "Start a Conversation";
"Invalid public key" = "Invalid public key";
"No search results" = "No search results";