fix(gui): remove tree children expansions as well (PR #630)

2019-04-24 18:45:36 +02:00
parent 172f7f7534
commit 58365a8907
1 changed files with 14 additions and 1 deletions
@@ -78,13 +78,26 @@ public class JadxProject {

 	public void removeTreeExpansion(String[] expansion) {
 		for (Iterator<String[]> it = treeExpansions.iterator(); it.hasNext(); ) {
-			if (Arrays.equals(it.next(), expansion)) {
+			if (isParentOfExpansion(expansion, it.next())) {
 				it.remove();
 			}
 		}
 		changed();
 	}

+	private boolean isParentOfExpansion(String[] parent, String[] child) {
+		if (Arrays.equals(parent, child)) {
+			return true;
+		}
+		for (int i = child.length - parent.length; i > 0; i--) {
+			String[] arr = Arrays.copyOfRange(child, i, child.length);
+			if (Arrays.equals(parent, arr)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private void changed() {
 		if (settings.isAutoSaveProject()) {
 			save();