From e4108a82060dead26ec5e55ec29e809a8edc4ca0 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 14 Sep 2026 14:14:27 +0000
Subject: [PATCH] Rework hierarchy for network ports

---
 app/src/main/java/io/xpipe/app/storage/DataStorage.java    | 5 +++--
 app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 405977681..8bcce0d9c 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -745,6 +745,7 @@ public abstract class DataStorage {
         }
 
         var oldChildren = getStoreChildren(e);
+        var oldDeepChildren = getDeepStoreChildren(e);
         var toRemove = oldChildren.stream()
                 .filter(oc -> {
                     var oid = getFixedChildId(oc);
@@ -767,7 +768,7 @@ public abstract class DataStorage {
                         return false;
                     }
 
-                    return oldChildren.stream()
+                    return oldDeepChildren.stream()
                             .filter(oc -> oc.getStore() instanceof FixedChildStore)
                             .filter(oc -> getFixedChildId(oc).isPresent())
                             .noneMatch(oc -> {
@@ -775,7 +776,7 @@ public abstract class DataStorage {
                             });
                 })
                 .toList();
-        var toUpdate = new ArrayList<>(oldChildren.stream()
+        var toUpdate = new ArrayList<>(oldDeepChildren.stream()
                 .map(oc -> {
                     var oid = getFixedChildId(oc);
                     if (oid.isEmpty()) {
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
index 491cadee3..e45afe4d2 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
@@ -661,7 +661,7 @@ public class DataStoreEntry extends DataStorageElement {
         notifyUpdate(false, true);
     }
 
-    void setStoreInternal(DataStore store, boolean updateTime) {
+    public void setStoreInternal(DataStore store, boolean updateTime) {
         var changed = !Objects.equals(getStore(), store);
         if (!changed) {
             return;