From 66f5704a8b46b7b2d77a8b38465e861188bd5834 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 9 Jun 2024 18:43:14 +0800 Subject: [PATCH] update --- .../src/forge/adventure/scene/StartScene.java | 6 +++--- forge-gui/src/main/java/forge/util/ZipUtil.java | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java index da00bfc4c20..1ec49076a85 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java @@ -156,9 +156,9 @@ public class StartScene extends UIScene { try { File source = new FileHandle(ForgeProfileProperties.getUserDir() + "/adventure/Shandalar").file(); File target = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir()).file(); - ZipUtil.zip(source, target); + ZipUtil.zip(source, target, ZipUtil.backupAdvFile); zipDialog = createGenericDialog("", - Forge.getLocalizer().getMessage("lblSaveLocation") + "\n" + target.getAbsolutePath() + File.separator + ZipUtil.backupFile, + Forge.getLocalizer().getMessage("lblSaveLocation") + "\n" + target.getAbsolutePath() + File.separator + ZipUtil.backupAdvFile, Forge.getLocalizer().getMessage("lblOK"), null, this::removeDialog, null); } catch (IOException e) { zipDialog = createGenericDialog("", @@ -170,7 +170,7 @@ public class StartScene extends UIScene { return true; } public boolean restoreBackup() { - File source = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir() + ZipUtil.backupFile).file(); + File source = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir() + ZipUtil.backupAdvFile).file(); File target = new FileHandle(ForgeProfileProperties.getUserDir() + "/adventure/Shandalar").file().getParentFile(); if (unzipDialog == null) { unzipDialog = createGenericDialog("", diff --git a/forge-gui/src/main/java/forge/util/ZipUtil.java b/forge-gui/src/main/java/forge/util/ZipUtil.java index 16f5f76ffc8..9018d8ebd02 100644 --- a/forge-gui/src/main/java/forge/util/ZipUtil.java +++ b/forge-gui/src/main/java/forge/util/ZipUtil.java @@ -1,7 +1,6 @@ package forge.util; import java.io.*; -//import java.time.Instant; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; @@ -10,13 +9,10 @@ import java.util.zip.ZipOutputStream; * https://www.baeldung.com/java-compress-and-uncompress */ public class ZipUtil { - public static String backupFile = "forge.adv"; - public static void zip(File source, File dest) throws IOException { - //String now = Instant.now().toString() + "-"; - FileOutputStream fos = new FileOutputStream(dest.getAbsolutePath() + File.separator /*+ now*/ + backupFile); + public static String backupAdvFile = "forge.adv"; + public static void zip(File source, File dest, String name) throws IOException { + FileOutputStream fos = new FileOutputStream(dest.getAbsolutePath() + File.separator + name); ZipOutputStream zipOut = new ZipOutputStream(fos); - - //File fileToZip = new File(sourceFile); zipFile(source, source.getName(), zipOut); zipOut.close(); fos.close();