jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gui): exclusion disablement should be exact package match (PR #500)

Browse Source
This commit is contained in:
Ahmed Ashour
2019-03-23 08:32:24 +01:00
committed by skylot
parent d3dbdb24af
commit eed762df44
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
+7 -2
View File
@@ -88,7 +88,8 @@ public class JadxWrapper {
return classList.stream().filter(cls -> {
for (String exclude : excludedPackages) {
if (cls.getFullName().startsWith(exclude)) {
if (cls.getFullName().equals(exclude)
|| cls.getFullName().startsWith(exclude + '.')) {
return false;
}
}
@@ -98,11 +99,15 @@ public class JadxWrapper {
public List<String> getExcludedPackages() {
String excludedPackages = settings.getExcludedPackages().trim();
if (excludedPackages.isEmpty()) {
return Collections.emptyList();
}
return Arrays.asList(excludedPackages.split("[ ]+"));
}
public void addExcludedPackage(String packageToExclude) {
settings.setExcludedPackages(settings.getExcludedPackages() + ' ' + packageToExclude);
String newExclusion = settings.getExcludedPackages() + ' ' + packageToExclude;
settings.setExcludedPackages(newExclusion.trim());
settings.sync();
}
jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
+2 -1
View File
@@ -46,7 +46,8 @@ public class JPackage extends JNode implements Comparable<JPackage> {
private void setEnabled(JadxWrapper wrapper) {
List<String> excludedPackages = wrapper.getExcludedPackages();
this.enabled = excludedPackages.isEmpty()
|| excludedPackages.stream().filter(p -> !p.isEmpty()).noneMatch(p -> name.startsWith(p));
|| excludedPackages.stream().filter(p -> !p.isEmpty())
.noneMatch(p -> name.equals(p) || name.startsWith(p + '.'));
}
public final void update() {