From 71b804ba52d7ae1135fb4917a4ce709efb7dec03 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 22 Feb 2017 09:48:51 -0500
Subject: [PATCH 1/2] =?UTF-8?q?Add=20and=20honor=20the=20=E2=80=9CCallKit?=
 =?UTF-8?q?=20Privacy=E2=80=9D=20setting.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

// FREEBIE
---
 .../AxolotlStore/TSStorageManager+Calling.h   | 20 ++++++++++++++
 .../AxolotlStore/TSStorageManager+Calling.m   | 26 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/Storage/AxolotlStore/TSStorageManager+Calling.h
 create mode 100644 src/Storage/AxolotlStore/TSStorageManager+Calling.m

diff --git a/src/Storage/AxolotlStore/TSStorageManager+Calling.h b/src/Storage/AxolotlStore/TSStorageManager+Calling.h
new file mode 100644
index 000000000..fe323951c
--- /dev/null
+++ b/src/Storage/AxolotlStore/TSStorageManager+Calling.h
@@ -0,0 +1,20 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
+#import "TSStorageManager.h"
+
+@interface TSStorageManager (Calling)
+
+// phoneNumber is an e164 formatted phone number.
+//
+// callKitId is expected to have CallKitCallManager.kAnonymousCallHandlePrefix.
+- (void)setPhoneNumber:(NSString *)phoneNumber forCallKitId:(NSString *)callKitId;
+
+// returns an e164 formatted phone number or nil if no
+// record can be found.
+//
+// callKitId is expected to have CallKitCallManager.kAnonymousCallHandlePrefix.
+- (NSString *)phoneNumberForCallKitId:(NSString *)callKitId;
+
+@end
diff --git a/src/Storage/AxolotlStore/TSStorageManager+Calling.m b/src/Storage/AxolotlStore/TSStorageManager+Calling.m
new file mode 100644
index 000000000..4cd0d0e9b
--- /dev/null
+++ b/src/Storage/AxolotlStore/TSStorageManager+Calling.m
@@ -0,0 +1,26 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
+#import "TSStorageManager+Calling.h"
+
+#define TSStorageManagerCallKitIdToPhoneNumberCollection @"TSStorageManagerCallKitIdToPhoneNumberCollection"
+
+@implementation TSStorageManager (Calling)
+
+- (void)setPhoneNumber:(NSString *)phoneNumber forCallKitId:(NSString *)callKitId
+{
+    OWSAssert(phoneNumber.length > 0);
+    OWSAssert(callKitId.length > 0);
+
+    [self setObject:phoneNumber forKey:callKitId inCollection:TSStorageManagerCallKitIdToPhoneNumberCollection];
+}
+
+- (NSString *)phoneNumberForCallKitId:(NSString *)callKitId
+{
+    OWSAssert(callKitId.length > 0);
+
+    return [self objectForKey:callKitId inCollection:TSStorageManagerCallKitIdToPhoneNumberCollection];
+}
+
+@end

From 52bb939fc17649bc390f0db30274163b8ce23605 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 23 Feb 2017 07:01:24 -0800
Subject: [PATCH 2/2] Respond to CR.

// FREEBIE
---
 src/Storage/AxolotlStore/TSStorageManager+Calling.h | 4 ++++
 src/Storage/AxolotlStore/TSStorageManager+Calling.m | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Storage/AxolotlStore/TSStorageManager+Calling.h b/src/Storage/AxolotlStore/TSStorageManager+Calling.h
index fe323951c..f483ef441 100644
--- a/src/Storage/AxolotlStore/TSStorageManager+Calling.h
+++ b/src/Storage/AxolotlStore/TSStorageManager+Calling.h
@@ -4,6 +4,8 @@
 
 #import "TSStorageManager.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface TSStorageManager (Calling)
 
 // phoneNumber is an e164 formatted phone number.
@@ -18,3 +20,5 @@
 - (NSString *)phoneNumberForCallKitId:(NSString *)callKitId;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/src/Storage/AxolotlStore/TSStorageManager+Calling.m b/src/Storage/AxolotlStore/TSStorageManager+Calling.m
index 4cd0d0e9b..ce772e109 100644
--- a/src/Storage/AxolotlStore/TSStorageManager+Calling.m
+++ b/src/Storage/AxolotlStore/TSStorageManager+Calling.m
@@ -4,7 +4,9 @@
 
 #import "TSStorageManager+Calling.h"
 
-#define TSStorageManagerCallKitIdToPhoneNumberCollection @"TSStorageManagerCallKitIdToPhoneNumberCollection"
+NS_ASSUME_NONNULL_BEGIN
+
+NSString *const TSStorageManagerCallKitIdToPhoneNumberCollection = @"TSStorageManagerCallKitIdToPhoneNumberCollection";
 
 @implementation TSStorageManager (Calling)
 
@@ -24,3 +26,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END