Add warning on saving under Flatpak, typo fix

Author: kovzol

src/main/java/wprover/AnimateC.java

@@ -210,7 +210,7 @@ void Setstep(double step) {
             gap = step;
             step_time = (int) (1000 / step);
         }
-        this.reClaclulate();
+        this.reCalculate();
     }
 
     /**
@@ -261,14 +261,14 @@ public int getInitValue() {
         } else {
             CMisc.print("Error,undifined on type ");
         }
-        reClaclulate();
+        reCalculate();
 
     }
 
     /**
      * Recalculates the animation parameters based on the current settings.
      */
-    public void reClaclulate() {
+    public void reCalculate() {
         if (onType == 2) {
             Circle c = (Circle) onObj;
             CPoint pt = c.getSidePoint();
@@ -310,7 +310,7 @@ public void reClaclulate() {
      * Starts the animation by recalculating initial values and setting initial positions.
      */
     public void startAnimate() {
-        reClaclulate();
+        reCalculate();
 
         bx = pA.getx();
         by = pA.gety();

src/main/java/wprover/GExpert.java

@@ -2214,6 +2214,29 @@ else if (command.equalsIgnoreCase("Calculation")) {
         }
     }
 
+    /**
+     * Show a warning on saving file in an unsafe folder that will be removed after closing JGEX.
+     * In a Flathub sandbox, this is an important message for the user because the OS
+     * does not inform the user on saving a file in a temporary folder.
+     * @param file The user wants to use as the saved file.
+     */
+    private void showWarningUnsafeFolder(File file) {
+        // Linux Flathub related code.
+        String absolutePath = file.getAbsolutePath();
+        String documentsDir = System.getenv("XDG_DOCUMENTS_DIR");
+        String downloadDir = System.getenv("XDG_DOWNLOAD_DIR");
+        String flatpakId = System.getenv("FLATPAK_ID");
+        if (flatpakId != null && documentsDir != null && downloadDir != null
+                && !absolutePath.startsWith(documentsDir) && !absolutePath.startsWith(downloadDir)) {
+            JOptionPane.showMessageDialog(null,
+                    "The application is running in Flatpak's sandbox.\n" +
+                            "It is not possible to save data permanently in an arbitrary folder.\n" +
+                            "Please save your data in your Documents or Downloads folder\n" +
+                            "in order to avoid data loss after closing the program."
+            );
+        }
+    }
+
     /**
      * Saves the GDD proof as a GraphViz file.
      *
@@ -2252,6 +2275,7 @@ private void saveGDDProofAsGraphViz(Object src) {
         } catch (Exception ee) {
             ee.printStackTrace();
         }
+        showWarningUnsafeFolder(ff);
     }
 
     /**
@@ -2424,6 +2448,7 @@ public boolean saveAFile(boolean n) {
             }
             if (file != null)
                 try {
+                    showWarningUnsafeFolder(file);
                     String path = file.getPath();
                     if (!path.endsWith(".gex")) {
                         path += ".gex";
@@ -2583,6 +2608,8 @@ public void saveProofAsGIF() {
         chooser.setCurrentDirectory(new File(dr));
 
         File ff = chooser.getSelectedFile();
+        showWarningUnsafeFolder(ff);
+
         String p = ff.getPath();
         if (!p.endsWith("gif") && !p.endsWith("GIF")) {
             p = p + ".gif";
@@ -2657,14 +2684,16 @@ public void saveAsGIF() {
 
 
         File ff = chooser.getSelectedFile();
+        showWarningUnsafeFolder(ff);
+
         String p = ff.getPath();
         if (!p.endsWith("gif") && !p.endsWith("GIF")) {
             p = p + ".gif";
             ff = new File(p);
         }
 
 
-        am.reClaclulate();
+        am.reCalculate();
         int n = am.getRounds();
         if (n == 0) return;
 
@@ -2759,6 +2788,8 @@ public void saveAsImage() {
         }
 
         File ff = chooser.getSelectedFile();
+        showWarningUnsafeFolder(ff);
+
         FileFilter f = chooser.getFileFilter();
         String endfix = f.getDescription();
         if (endfix == null)

src/main/java/wprover/GIFProcessDialog.java

@@ -87,7 +87,7 @@ public void run() {
             am.width = rect.getX() + rect.getWidth() - 5;
             am.height = rect.getY() + rect.getHeight() - 5;
 
-            am.reClaclulate();
+            am.reCalculate();
             total = am.getRounds();
 
             GIFProcessDialog.this.setVisible(true);