Respond to CR.

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

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;

SignalServiceKit/src/Util/AppContext.h

@@ -100,6 +100,8 @@ NSString *NSStringForUIApplicationState(UIApplicationState value);
 
 - (NSString *)appSharedDataDirectoryPath;
 
+- (NSUserDefaults *)appUserDefaults;
+
 @end
 
 id<AppContext> CurrentAppContext(void);

SignalServiceKit/src/Util/NSUserDefaults+OWS.m

@@ -12,11 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSUserDefaults *)appUserDefaults
 {
-    if (CurrentAppContext().isRunningTests) {
+    return CurrentAppContext().appUserDefaults;
-        return [[NSUserDefaults alloc] init];
-    }
-
-    return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup];
 }
 
 + (void)migrateToSharedUserDefaults

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