Skip to content

Commit 71cd92b

Browse files
author
isayan
committed
fix unload
1 parent 3a028c5 commit 71cd92b

File tree

13 files changed

+41
-22
lines changed

13 files changed

+41
-22
lines changed

Readme-ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ gradlew release
3030
* v2020以上 (http://www.portswigger.net/burp/)
3131

3232
### 開発環境
33-
* NetBean 12.2 (https://netbeans.apache.org/)
34-
* Gradle 6.8.1 (https://gradle.org/)
33+
* NetBean 12.4 (https://netbeans.apache.org/)
34+
* Gradle 7.0.2 (https://gradle.org/)
3535
* asciidoc (http://asciidoc.org/)
3636

3737
## 必須ライブラリ

Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ gradlew release
3030
* v2020 or higher (http://www.portswigger.net/burp/)
3131

3232
### Development environment
33-
* NetBean 12.2 (https://netbeans.apache.org/)
34-
* Gradle 6.8.1 (https://gradle.org/)
33+
* NetBean 12.4 (https://netbeans.apache.org/)
34+
* Gradle 7.0.2 (https://gradle.org/)
3535
* asciidoc (http://asciidoc.org/)
3636

3737
## Required library

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ targetCompatibility = '11' // -target
2020
mainClassName = 'yagura.view.MainFrame'
2121

2222
repositories {
23-
jcenter()
23+
mavenCentral()
2424
}
2525

2626
tasks.withType(JavaCompile) {
@@ -97,7 +97,8 @@ dependencies {
9797
implementation 'commons-codec:commons-codec:1.15'
9898
// https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea
9999
implementation 'com.fifesoft:rsyntaxtextarea:3.1.3'
100-
// https://mvnrepository.com/artifact/org.jsoup/jsoup
100+
// https://mvnrepository.com/artifact/com.squareup.okhttp
101+
implementation 'com.squareup.okhttp3:okhttp:3.14.9'
101102

102103
implementation 'org.jsoup:jsoup:1.13.1'
103104
// Unit Test

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
22
release_version_major=2.2
3-
release_version_minor=6.0
3+
release_version_minor=7.0
Binary file not shown.

release/YaguraExtender-v2.2.jar

506 KB
Binary file not shown.

src/main/java/aspx/viewstate/ViewStateParser.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import java.util.ArrayList;
1414
import java.util.Base64;
1515
import java.util.logging.Logger;
16-
import java.util.regex.Matcher;
17-
import java.util.regex.Pattern;
1816

1917
/**
2018
* Base Code

src/main/java/burp/BurpExtender.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* @author isayan
7373
*/
7474
public class BurpExtender extends BurpExtenderImpl
75-
implements IHttpListener, IProxyListener, IExtensionStateListener {
75+
implements IHttpListener, IProxyListener {
7676
private final static Logger logger = Logger.getLogger(BurpExtender.class.getName());
7777

7878

@@ -224,9 +224,9 @@ public void uncaughtException(Thread t, Throwable ex) {
224224

225225
callbacks.registerHttpListener(this);
226226
callbacks.registerProxyListener(this);
227-
callbacks.registerExtensionStateListener(this);
228227
SwingUtilities.invokeLater(() -> {
229228
callbacks.addSuiteTab(this.tabbetOption);
229+
callbacks.registerExtensionStateListener(this.tabbetOption);
230230
setSendToMenu(new SendToMenu(callbacks, this.option.getSendToProperty()));
231231
callbacks.registerContextMenuFactory(this.getSendToMenu());
232232
});
@@ -236,12 +236,6 @@ public void uncaughtException(Thread t, Throwable ex) {
236236
this.registerView();
237237
}
238238

239-
@Override
240-
public void extensionUnloaded() {
241-
System.gc();
242-
// DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventPostProcessor(dispatcher);
243-
}
244-
245239
public void registerView() {
246240
IBurpExtenderCallbacks cb = getCallbacks();
247241
cb.registerMessageEditorTabFactory(this.requestRawTab);

src/main/java/extend/util/external/ThemeUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package extend.util.external;
22

3+
import java.awt.Color;
34
import javax.swing.SwingUtilities;
45
import javax.swing.UIManager;
56
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
67
import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
78
import org.fife.ui.rtextarea.Gutter;
8-
import yagura.model.SendToMenu;
99

1010
/**
1111
*

src/main/java/yagura/view/JTransCoderTab.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package yagura.view;
22

3+
import burp.IExtensionStateListener;
34
import burp.ITab;
45
import extend.util.external.TransUtil;
56
import java.awt.BorderLayout;
@@ -63,7 +64,7 @@
6364
*
6465
* @author isayan
6566
*/
66-
public class JTransCoderTab extends javax.swing.JPanel implements ITab {
67+
public class JTransCoderTab extends javax.swing.JPanel implements ITab, IExtensionStateListener {
6768

6869
private final static Logger logger = Logger.getLogger(JTransCoderTab.class.getName());
6970

@@ -3626,4 +3627,9 @@ public void setProperty(JTransCoderProperty transcoderProp) {
36263627
chkViewLineWrapActionPerformed(null);
36273628
}
36283629

3630+
@Override
3631+
public void extensionUnloaded() {
3632+
UIManager.removePropertyChangeListener(listener);
3633+
}
3634+
36293635
}

0 commit comments

Comments
 (0)