mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/installers

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-07-23 09:24:07 +02:00
parent 33a6158ed7 bd87defe29
commit fd4bd66ac4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
View File

@@ -188,9 +188,12 @@ public class FxApplication extends Application {
}
private void applySystemTheme() {
appearanceProvider.ifPresent(appearanceProvider -> {
systemInterfaceThemeChanged(appearanceProvider.getSystemTheme());
});
if (appearanceProvider.isPresent()) {
systemInterfaceThemeChanged(appearanceProvider.get().getSystemTheme());
} else {
LOG.warn("No UiAppearanceProvider present, assuming LIGHT theme...");
applyLightTheme();
}
}
private void applyLightTheme() {

2
src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
View File

@@ -224,7 +224,7 @@ public class GeneralPreferencesController implements FxController {
if (string == null) {
return null;
} else {
return keychainAccessProviders.stream().filter(provider -> provider.getClass().getName().equals(string)).findAny().orElseThrow();
return keychainAccessProviders.stream().filter(provider -> provider.getClass().getName().equals(string)).findAny().orElse(null);
}
}
}