From 33aea5ae59661cdba43633a591b72cc75dba530b Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 17 Apr 2022 18:49:17 +0800 Subject: [PATCH] feat: v0.5.1, fix open blank window when decrypt fails --- .../hatter/tools/tinyencrypt/config/TinyEncryptConstant.java | 2 +- .../hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java index 1a6a1a7..aec7967 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java @@ -1,7 +1,7 @@ package me.hatter.tools.tinyencrypt.config; public class TinyEncryptConstant { - public static final String VERSION = "0.5.0"; + public static final String VERSION = "0.5.1"; public static final String ENC_FILE_EXT = ".tinyenc"; } diff --git a/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java index 61f1d77..bf243f6 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java @@ -112,7 +112,10 @@ public class EncryptedFileUtil { public static void decryptInWindow(TinyEncryptConfig config, File file, boolean pgp, boolean editable) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); AtomicReference metaRef = new AtomicReference<>(); - decryptToOutputStream(config, file, baos, pgp, metaRef); + boolean decryptSuccess = decryptToOutputStream(config, file, baos, pgp, metaRef); + if (!decryptSuccess) { + return; + } String decrypted = new String(baos.toByteArray(), StandardCharsets.UTF_8); String editResult = SwingWindow.create((editable ? "Edit" : "View") + " file: " + file.getName())