From 4ce9228afd91768950651887ba6dcfa6f01a99f4 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 6 May 2019 11:50:24 +1000
Subject: [PATCH] WIP

---
 .../ViewControllers/NewContactThreadViewController.m   | 10 ++++++----
 SignalServiceKit/src/Loki/ECKeyPair.m                  |  1 -
 SignalServiceKit/src/Loki/ECKeyPair.swift              |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m
index 8b90f5392..10010a734 100644
--- a/Signal/src/ViewControllers/NewContactThreadViewController.m
+++ b/Signal/src/ViewControllers/NewContactThreadViewController.m
@@ -18,6 +18,7 @@
 #import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
 #import <SignalServiceKit/SignalAccount.h>
+#import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -396,16 +397,17 @@ NS_ASSUME_NONNULL_BEGIN
     if (hasSearchText) {
         // 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:^{
-                                              typeof(self) strongSelf = weakSelf;
-                                              if (!strongSelf) { return; }
-                                              NSString *publicKey = strongSelf.searchBar.text;
-                                              [strongSelf newConversationWithRecipientId:publicKey];
+                                              [weakSelf newConversationWithRecipientId:publicKey];
                                           }]];
         [contents addSection:newConversationSection];
         // ========
diff --git a/SignalServiceKit/src/Loki/ECKeyPair.m b/SignalServiceKit/src/Loki/ECKeyPair.m
index c58bccea2..bbf77f769 100644
--- a/SignalServiceKit/src/Loki/ECKeyPair.m
+++ b/SignalServiceKit/src/Loki/ECKeyPair.m
@@ -1,5 +1,4 @@
 #import "ECKeyPair.h"
-#import <SignalCoreKit/OWSAsserts.h>
 
 extern void curve25519_donna(unsigned char *output, const unsigned char *a, const unsigned char *b);
 
diff --git a/SignalServiceKit/src/Loki/ECKeyPair.swift b/SignalServiceKit/src/Loki/ECKeyPair.swift
index ceb59196f..a2581a5e5 100644
--- a/SignalServiceKit/src/Loki/ECKeyPair.swift
+++ b/SignalServiceKit/src/Loki/ECKeyPair.swift
@@ -10,7 +10,7 @@ public extension ECKeyPair {
         return "05" + publicKey.map { String(format: "%02hhx", $0) }.joined()
     }
     
-    static func isValidHexEncodedPublicKey(candidate: String) -> Bool {
+    @objc public static func isValidHexEncodedPublicKey(candidate: String) -> Bool {
         // Check that it's a valid hexadecimal encoding
         let allowedCharacters = CharacterSet(charactersIn: "0123456789ABCDEF")
         guard candidate.uppercased().unicodeScalars.allSatisfy({ allowedCharacters.contains($0) }) else { return false }