From 1a53005e086e0c651cfd7b08ac68f7f4baad7b71 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 22 Oct 2018 14:43:07 -0400
Subject: [PATCH] Respond to CR.

---
 Signal/src/util/MainAppContext.m                      | 5 +++++
 SignalServiceKit/src/TestUtils/TestAppContext.m       | 3 ++-
 SignalServiceKit/src/Util/AppContext.h                | 2 ++
 SignalServiceKit/src/Util/NSUserDefaults+OWS.m        | 6 +-----
 SignalShareExtension/utils/ShareAppExtensionContext.m | 5 +++++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m
index 160f6bd53..cda535adf 100644
--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@@ -293,6 +293,11 @@ NS_ASSUME_NONNULL_BEGIN
     return [groupContainerDirectoryURL path];
 }
 
+- (NSUserDefaults *)appUserDefaults
+{
+    return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m
index a04229119..0fc67f5fe 100644
--- a/SignalServiceKit/src/TestUtils/TestAppContext.m
+++ b/SignalServiceKit/src/TestUtils/TestAppContext.m
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) SSKTestKeychainStorage *testKeychainStorage;
 @property (nonatomic) NSString *mockAppDocumentDirectoryPath;
 @property (nonatomic) NSString *mockAppSharedDataDirectoryPath;
+@property (nonatomic) NSUserDefaults *appUserDefaults;
 
 @end
 
@@ -37,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *temporaryDirectory = OWSTemporaryDirectory();
     self.mockAppDocumentDirectoryPath = [temporaryDirectory stringByAppendingPathComponent:NSUUID.UUID.UUIDString];
     self.mockAppSharedDataDirectoryPath = [temporaryDirectory stringByAppendingPathComponent:NSUUID.UUID.UUIDString];
-
+    self.appUserDefaults = [[NSUserDefaults alloc] init];
     _appLaunchTime = [NSDate new];
 
     return self;
diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h
index b2dd7b73e..a00aeeadf 100755
--- a/SignalServiceKit/src/Util/AppContext.h
+++ b/SignalServiceKit/src/Util/AppContext.h
@@ -100,6 +100,8 @@ NSString *NSStringForUIApplicationState(UIApplicationState value);
 
 - (NSString *)appSharedDataDirectoryPath;
 
+- (NSUserDefaults *)appUserDefaults;
+
 @end
 
 id<AppContext> CurrentAppContext(void);
diff --git a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
index 11506d077..79ab359db 100644
--- a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
+++ b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
@@ -12,11 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSUserDefaults *)appUserDefaults
 {
-    if (CurrentAppContext().isRunningTests) {
-        return [[NSUserDefaults alloc] init];
-    }
-
-    return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup];
+    return CurrentAppContext().appUserDefaults;
 }
 
 + (void)migrateToSharedUserDefaults
diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m
index 733bb3bbc..0fd08c97a 100644
--- a/SignalShareExtension/utils/ShareAppExtensionContext.m
+++ b/SignalShareExtension/utils/ShareAppExtensionContext.m
@@ -229,6 +229,11 @@ NS_ASSUME_NONNULL_BEGIN
     return [groupContainerDirectoryURL path];
 }
 
+- (NSUserDefaults *)appUserDefaults
+{
+    return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END