From eafae602b882f49a8fcefeab772f80395824799c Mon Sep 17 00:00:00 2001
From: gh0stkey <24655118+gh0stkey@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:02:07 +0800
Subject: [PATCH] Version: 2.5.4.1

---
 src/main/java/burp/BurpExtender.java        |  2 +-
 src/main/java/burp/rule/utils/RuleTool.java | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
index 212dc04..b4e9382 100644
--- a/src/main/java/burp/BurpExtender.java
+++ b/src/main/java/burp/BurpExtender.java
@@ -38,7 +38,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         new ConfigLoader();
 
-        String version = "2.5.4";
+        String version = "2.5.4.1";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出
diff --git a/src/main/java/burp/rule/utils/RuleTool.java b/src/main/java/burp/rule/utils/RuleTool.java
index e55a81e..cb0363d 100644
--- a/src/main/java/burp/rule/utils/RuleTool.java
+++ b/src/main/java/burp/rule/utils/RuleTool.java
@@ -13,6 +13,7 @@ import javax.swing.JOptionPane;
  */
 public class RuleTool {
     private String rulesFilePath;
+    private boolean isSuccess;
 
     public RuleTool(String rulesFilePath) {
         this.rulesFilePath = rulesFilePath;
@@ -32,18 +33,22 @@ public class RuleTool {
                 FileOutputStream fileOutputStream = new FileOutputStream(this.rulesFilePath);
                 fileOutputStream.write(responseBodyByte);
                 fileOutputStream.close();
-                JOptionPane.showMessageDialog(null, "Rules update successfully!", "Info",
-                        JOptionPane.INFORMATION_MESSAGE);
+                isSuccess = true;
             } catch (Exception e) {
-                JOptionPane.showMessageDialog(null, e, "Error",
-                        JOptionPane.ERROR_MESSAGE);
+                isSuccess = false;
             }
         });
         t.start();
         try {
-            t.join();
+            t.join(10000);
         } catch (Exception e) {
-            e.printStackTrace();
+            isSuccess = false;
+        }
+
+        if (isSuccess) {
+            JOptionPane.showMessageDialog(null, "Rules update successfully!", "Info", JOptionPane.INFORMATION_MESSAGE);
+        } else {
+            JOptionPane.showMessageDialog(null, "Rule update failed, please check the network!", "Error", JOptionPane.ERROR_MESSAGE);
         }
     }
 }