Merge branch 'charlesmchen/themeConcurrency'

This commit is contained in:
Matthew Chen 2018-10-10 09:10:24 -04:00
commit 1319116a61
2 changed files with 1 additions and 3 deletions

View File

@ -13,7 +13,7 @@ extern NSString *const ThemeDidChangeNotification;
- (instancetype)init NS_UNAVAILABLE;
@property (class, readonly, nonatomic) BOOL isDarkThemeEnabled;
@property (class, readonly, atomic) BOOL isDarkThemeEnabled;
+ (void)setIsDarkThemeEnabled:(BOOL)value;

View File

@ -20,8 +20,6 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
+ (BOOL)isDarkThemeEnabled
{
OWSAssertIsOnMainThread();
if (!CurrentAppContext().isMainApp) {
// Ignore theme in app extensions.
return NO;