Skip to content

Fix thread safety: dispatch native AppKit/NSUserDefaults reads to main thread #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karlvr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix thread safety: dispatch native AppKit/NSUserDefaults reads to main thread #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 29 additions & 18 deletions libvappearances/VAppearances.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,47 +387,54 @@ static void registerDefaultColor(NSMutableString *stream, NSString *name, CGFloa

jsize intCount = (*env)->GetArrayLength(env, jints);
jsize objectCount = (*env)->GetArrayLength(env, jobjects);
int *data = (*env)->GetIntArrayElements(env, jints, NULL);

// Read all native values on the main thread
__block NSString *appearanceName = nil;
__block NSString *hcs = nil;
__block NSInteger accentValue = -2;
__block NSInteger tintedOption = 0;
__block BOOL increaseContrastOption = NO;
__block BOOL reduceTransparencyOption = NO;

runOnMainThread(^() {
appearanceName = [getAppearanceName(getCurrentAppearanceMainThread()) retain];
hcs = [[NSUserDefaults.standardUserDefaults stringForKey:@"AppleHighlightColor"] retain];
id acv = [NSUserDefaults.standardUserDefaults objectForKey:@"AppleAccentColor"];
accentValue = (acv != nil) ? [acv integerValue] : -2;
tintedOption = [NSUserDefaults.standardUserDefaults integerForKey:@"NSGlassDiffusionSetting"];
increaseContrastOption = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
reduceTransparencyOption = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
});

if (objectCount > 0) {
NSString *appearanceName = getAppearanceName(getCurrentAppearance());
(*env)->SetObjectArrayElement(env, jobjects, 0, TO_JAVA_STRING(appearanceName));
}

if (objectCount > 1) {
NSString *hcs = [NSUserDefaults.standardUserDefaults stringForKey:@"AppleHighlightColor"];
(*env)->SetObjectArrayElement(env, jobjects, 1, TO_JAVA_STRING(hcs));
}
[appearanceName release];
[hcs release];

int *data = (*env)->GetIntArrayElements(env, jints, NULL);
if (data != NULL) {

if (intCount > 0) {
id acv = [NSUserDefaults.standardUserDefaults objectForKey:@"AppleAccentColor"];
// map null (multicolor) to -2
data[0] = (acv != nil) ? [acv integerValue] : -2;
data[0] = accentValue;
}

if (intCount > 1) {
NSInteger tintedOption = [NSUserDefaults.standardUserDefaults integerForKey:@"NSGlassDiffusionSetting"];
data[1] = tintedOption;
}

if (intCount > 2) {
BOOL increaseContrastOption = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
if (DEBUG_FLAG) {
NSLog(@"Increase contrast option: %@", increaseContrastOption ? @"YES" : @"NO");
}
data[2] = increaseContrastOption;
}

if (intCount > 3) {
BOOL reduceTransparencyOption = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
if (DEBUG_FLAG) {
NSLog(@"Reduce transparency option: %@", reduceTransparencyOption ? @"YES" : @"NO");
}
data[3] = reduceTransparencyOption;
}

(*env)->ReleaseIntArrayElements(env, jints, data, 0);
result = 0;
}
Expand Down Expand Up @@ -617,13 +624,17 @@ static void registerListeners(JNIEnv *env, jobject settingsListener, jobject eff

COCOA_ENTER();

NSAppearanceName appearanceName;
__block NSAppearanceName appearanceName;
if (@available(macOS 10.14, *)) {
appearanceName = [NSApp.appearance name];
runOnMainThread(^() {
appearanceName = [[NSApp.appearance name] retain];
});
result = TO_JAVA_STRING(appearanceName);
[appearanceName release];
} else {
appearanceName = NSAppearanceNameAqua;
result = TO_JAVA_STRING(appearanceName);
}
result = TO_JAVA_STRING(appearanceName);

COCOA_EXIT();

Expand Down