From 4c31d994984f453226aee368829ed6e7724c82a1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 30 Nov 2017 10:10:30 -0500
Subject: [PATCH] Respond to CR.

---
 Signal/src/util/MainAppContext.h       | 4 ++++
 Signal/src/util/MainAppContext.m       | 4 ++++
 SignalServiceKit/src/Util/AppContext.h | 4 ++++
 SignalServiceKit/src/Util/AppContext.m | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/Signal/src/util/MainAppContext.h b/Signal/src/util/MainAppContext.h
index fb147d389..5800a48f4 100644
--- a/Signal/src/util/MainAppContext.h
+++ b/Signal/src/util/MainAppContext.h
@@ -4,6 +4,10 @@
 
 #import <SignalServiceKit/AppContext.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface MainAppContext : NSObject <AppContext>
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m
index 6040a8f49..ca2e96d39 100644
--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@@ -4,6 +4,8 @@
 
 #import "MainAppContext.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation MainAppContext
 
 - (BOOL)isMainApp
@@ -23,3 +25,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h
index 705c4272e..70b4f3ed0 100755
--- a/SignalServiceKit/src/Util/AppContext.h
+++ b/SignalServiceKit/src/Util/AppContext.h
@@ -2,6 +2,8 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef void (^BackgroundTaskExpirationHandler)(void);
 
 @protocol AppContext <NSObject>
@@ -16,3 +18,5 @@ typedef void (^BackgroundTaskExpirationHandler)(void);
 
 id<AppContext> CurrentAppContext();
 void SetCurrentAppContext(id<AppContext> appContext);
+
+NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Util/AppContext.m b/SignalServiceKit/src/Util/AppContext.m
index 816eec5c4..0216d1c7f 100755
--- a/SignalServiceKit/src/Util/AppContext.m
+++ b/SignalServiceKit/src/Util/AppContext.m
@@ -4,6 +4,8 @@
 
 #import "AppContext.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 static id<AppContext> currentAppContext = nil;
 
 id<AppContext> CurrentAppContext()
@@ -19,3 +21,5 @@ void SetCurrentAppContext(id<AppContext> appContext)
 
     currentAppContext = appContext;
 }
+
+NS_ASSUME_NONNULL_END