upgrade gradlew; fix button colour; add info to about panel

Lamisedaxeh · May 19, 2023 · 075d7a9 · 075d7a9
1 parent 6f22727
commit 075d7a9
Show file tree

Hide file tree

Showing 8 changed files with 223 additions and 67 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/lib/src/main/java/burp/MyBurpExtension.java b/lib/src/main/java/burp/MyBurpExtension.java
@@ -19,7 +19,7 @@ public class MyBurpExtension implements BurpExtension, PropertyChangeListener {
     public static final Boolean DEBUG = false;
 
     public static final String EXTENSION = "BurpGPT";
-    public static final String VERSION = "0.1";
+    public static final String VERSION = "0.1.1";
 
     private PropertyChangeSupport propertyChangeSupport;
     @Getter

diff --git a/lib/src/main/java/burpgpt/gui/views/AboutView.java b/lib/src/main/java/burpgpt/gui/views/AboutView.java
@@ -1,41 +1,69 @@
 package burpgpt.gui.views;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.Font;
-import java.text.MessageFormat;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Calendar;
 
 import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.ToolTipManager;
+import javax.swing.UIManager;
 
 import burp.MyBurpExtension;
 import burpgpt.utilities.HtmlResourceLoader;
 
 public class AboutView extends JPanel {
 
     private static final int COPYRIGHT_FONT_SIZE = 12;
+    private static final String WEBSITE = "https://burpgpt.app/#pricing";
 
     public AboutView() {
-        setLayout(new BorderLayout());
-        setBorder(BorderFactory.createEmptyBorder(16, 16, 16, 16)); // add 16-pixel padding to the root panel
-        add(initComponents(), BorderLayout.WEST);
+        setLayout(new GroupLayout(this));
+        setBorder(BorderFactory.createEmptyBorder(16, 16, 16, 16));
+        initComponents();
+        enableTooltips();
     }
 
-    private JPanel initComponents() {
-        JPanel contentPanel = new JPanel();
-        contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.PAGE_AXIS));
+    public void initComponents() {
+        JLabel titleLabel = createTitleLabel();
+        JLabel copyRightLabel = createCopyRightLabel();
+        JLabel descriptionLabel = createDescriptionLabel();
+        JScrollPane descriptionScrollPane = new JScrollPane(descriptionLabel);
+        descriptionScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
+        descriptionScrollPane.setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
+        descriptionScrollPane.setBorder(BorderFactory.createEmptyBorder());
+        JButton upgradeButton = createUpgradeButton();
 
-        contentPanel.add(createTitleLabel());
-        contentPanel.add(createCopyRightLabel());
-        contentPanel.add(Box.createRigidArea(new Dimension(0, 16)));
-        contentPanel.add(createDescriptionLabel());
+        GroupLayout layout = (GroupLayout) getLayout();
 
-        return contentPanel;
+        GroupLayout.Group horizontalGroup = layout.createParallelGroup(GroupLayout.Alignment.CENTER)
+                .addComponent(titleLabel)
+                .addComponent(copyRightLabel)
+                .addComponent(descriptionScrollPane)
+                .addComponent(upgradeButton);
+        layout.setHorizontalGroup(horizontalGroup);
+
+        GroupLayout.Group verticalGroup = layout.createSequentialGroup()
+                .addComponent(titleLabel)
+                .addComponent(copyRightLabel)
+                .addGap(16)
+                .addComponent(descriptionScrollPane)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(upgradeButton);
+        layout.setVerticalGroup(verticalGroup);
     }
 
     private JLabel createTitleLabel() {
@@ -46,16 +74,6 @@ private JLabel createTitleLabel() {
         return titleLabel;
     }
 
-    private JLabel createDescriptionLabel() {
-        String description = HtmlResourceLoader.loadHtmlContent("aboutDescription.html");
-        String formattedDescription = MessageFormat.format(description, MyBurpExtension.EXTENSION);
-        // HACK: Need to get the width programatically
-        JLabel descriptionLabel = new JLabel("<html><div id='descriptionDiv' style='width: 800px;'>"
-                + formattedDescription + "</div></html>");
-        descriptionLabel.putClientProperty("html.disable", null);
-        return descriptionLabel;
-    }
-
     private JLabel createCopyRightLabel() {
         String year = String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
         String copyRight = String.format(
@@ -67,4 +85,34 @@ private JLabel createCopyRightLabel() {
         copyRightLabel.putClientProperty("html.disable", null);
         return copyRightLabel;
     }
+
+    private JLabel createDescriptionLabel() {
+        String description = HtmlResourceLoader.loadHtmlContent("aboutDescription.html");
+        JLabel descriptionLabel = new JLabel(description);
+        descriptionLabel.putClientProperty("html.disable", null);
+        return descriptionLabel;
+    }
+
+    private JButton createUpgradeButton() {
+        JButton upgradeButton = new JButton("Upgrade to the Pro edition");
+        upgradeButton.setToolTipText("Upgrade to the Pro edition by visiting our official website");
+        upgradeButton.setBackground(UIManager.getColor("Burp.burpOrange"));
+        upgradeButton.setForeground(Color.WHITE);
+        upgradeButton.setFont(upgradeButton.getFont().deriveFont(Font.BOLD));
+        upgradeButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    Desktop.getDesktop().browse(new URI(WEBSITE));
+                } catch (IOException | URISyntaxException e1) {
+                    // pass
+                }
+            }
+        });
+        return upgradeButton;
+    }
+
+    private void enableTooltips() {
+        ToolTipManager.sharedInstance().setInitialDelay(0);
+    }
 }
diff --git a/lib/src/main/java/burpgpt/gui/views/SettingsView.java b/lib/src/main/java/burpgpt/gui/views/SettingsView.java
@@ -1,5 +1,6 @@
 package burpgpt.gui.views;
 
+import java.awt.Color;
 import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -105,7 +106,8 @@ private void createApplyButton(int y) {
         JButton applyButton = new JButton("Apply");
         applyButton.addActionListener(e -> applySettings());
         applyButton.setBackground(UIManager.getColor("Burp.burpOrange"));
-        applyButton.setFont(new Font(applyButton.getFont().getName(), Font.BOLD, applyButton.getFont().getSize()));
+        applyButton.setForeground(Color.WHITE);
+        applyButton.setFont(applyButton.getFont().deriveFont(Font.BOLD));
         add(applyButton, createGridBagConstraints(1, y));
     }