beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix possible NPE

Browse source
This commit is contained in:
crschnick 2024-03-11 12:08:10 +00:00
parent cd0c8a1649
commit 1a29d14a79
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/io/xpipe/app/core/AppTheme.java
View file

@ -74,7 +74,7 @@ public class AppTheme {
try {
if (AppPrefs.get().theme.getValue() == null) {
setDefault(Platform.getPreferences().getColorScheme());
setDefault();
}
Platform.getPreferences().colorSchemeProperty().addListener((observableValue, colorScheme, t1) -> {
@ -105,10 +105,16 @@ public class AppTheme {
init = true;
}
private static void setDefault(ColorScheme colorScheme) {
if (colorScheme == ColorScheme.DARK) {
AppPrefs.get().theme.setValue(Theme.getDefaultDarkTheme());
} else {
private static void setDefault() {
try {
var colorScheme = Platform.getPreferences().getColorScheme();
if (colorScheme == ColorScheme.DARK) {
AppPrefs.get().theme.setValue(Theme.getDefaultDarkTheme());
} else {
AppPrefs.get().theme.setValue(Theme.getDefaultLightTheme());
}
} catch (Exception ex) {
// The color scheme query can fail if the toolkit is not initialized properly
AppPrefs.get().theme.setValue(Theme.getDefaultLightTheme());
}
}