Add an option to disable the sandboxing check

MineLittlePony · Jul 25, 2023 · cbaf353 · cbaf353
1 parent 5257a16
commit cbaf353
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/minelittlepony/hdskins/client/HDConfig.java b/src/main/java/com/minelittlepony/hdskins/client/HDConfig.java
@@ -6,11 +6,13 @@
 import com.minelittlepony.hdskins.client.gui.filesystem.FileSystemUtil;
 
 public class HDConfig extends Config {
-
     public final Setting<Path> lastChosenFile = value("lastChosenFile", FileSystemUtil.getUserContentDirectory(FileSystemUtil.CONTENT_TYPE_DOWNLOAD));
-    public final Setting<Boolean> useNativeFileChooser = value("useNativeFileChooser", false);
+    public final Setting<Boolean> useNativeFileChooser = value("filesystem", "useNativeFileChooser", false)
+            .addComment("When enable, will always use the native dialogue for opening and saving files");
+    public final Setting<Boolean> enableSandboxingCheck = value("filesystem", "enableSandboxingCheck", true)
+            .addComment("When enabled, will use the native dialogue for opening and saving files only when running inside a sandboxed environment (flatpaks)");
 
     public HDConfig(Path path) {
-        super(FLATTENED_JSON_ADAPTER, path);
+        super(HEIRARCHICAL_JSON_ADAPTER, path);
     }
 }
diff --git a/src/main/java/com/minelittlepony/hdskins/client/gui/SkinChooser.java b/src/main/java/com/minelittlepony/hdskins/client/gui/SkinChooser.java
@@ -2,6 +2,7 @@
 
 import com.minelittlepony.hdskins.client.HDSkins;
 import com.minelittlepony.hdskins.client.gui.filesystem.FileDialogs;
+import com.minelittlepony.hdskins.client.gui.filesystem.FileSystemUtil;
 import com.minelittlepony.hdskins.client.gui.filesystem.WatchedFile;
 import com.minelittlepony.hdskins.profile.SkinType;
 
@@ -72,10 +73,12 @@ public void addSkinChangedEventListener(Consumer<SkinType> listener) {
     }
 
     private FileDialogs getFileDialogs() {
-        if (HDSkins.getInstance().getConfig().useNativeFileChooser.get()) {
+        if ((FileSystemUtil.IS_SANDBOXED && !HDSkins.getInstance().getConfig().enableSandboxingCheck.get())
+            || HDSkins.getInstance().getConfig().useNativeFileChooser.get()) {
             return FileDialogs.NATIVE;
         }
-        return FileDialogs.DEFAULT;
+
+        return FileDialogs.INTEGRATED;
     }
 
     public void addImageValidation(Function<NativeImage, Text> validator) {

diff --git a/src/main/java/com/minelittlepony/hdskins/client/gui/filesystem/FileDialogs.java b/src/main/java/com/minelittlepony/hdskins/client/gui/filesystem/FileDialogs.java
@@ -7,8 +7,6 @@ public interface FileDialogs {
     FileDialogs INTEGRATED = new IntegratedFileDialogs();
     FileDialogs NATIVE = new NativeFileDialogs();
 
-    FileDialogs DEFAULT = FileSystemUtil.IS_SANDBOXED ? NATIVE : INTEGRATED;
-
     FileDialog open(String title);
 
     FileDialog save(String title, String filename);