mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-22 07:29:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make storage cat find more resilient

Browse Source
This commit is contained in:
crschnick
2025-08-26 12:11:42 +00:00
parent 6c9977e28a
commit 2ebe773f11
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/io/xpipe/app/storage/DataStorage.java
View File

@@ -1000,23 +1000,30 @@ public abstract class DataStorage {
return true;
}
var parentCat =
getStoreCategoryIfPresent(parent.get().getCategoryUuid()).orElseThrow();
var parentCatHierarchy = getCategoryParentHierarchy(parentCat);
var cat = getStoreCategoryIfPresent(entry.getCategoryUuid()).orElseThrow();
var catHierarchy = getCategoryParentHierarchy(cat);
var parentCat = getStoreCategoryIfPresent(parent.get().getCategoryUuid());
if (parentCat.isEmpty()) {
return true;
}
var parentCatHierarchy = getCategoryParentHierarchy(parentCat.get());
var cat = getStoreCategoryIfPresent(entry.getCategoryUuid());
if (cat.isEmpty()) {
return true;
}
var catHierarchy = getCategoryParentHierarchy(cat.get());
var currentContainsBoth = catHierarchy.contains(current) && parentCatHierarchy.contains(current);
if (currentContainsBoth) {
return false;
}
var diffParentCategoryHierarchy = !catHierarchy.contains(parentCat);
var diffParentCategoryHierarchy = !catHierarchy.contains(parentCat.get());
if (diffParentCategoryHierarchy) {
return true;
}
var subParent = catHierarchy.indexOf(current) > catHierarchy.indexOf(parentCat);
var subParent = catHierarchy.indexOf(current) > catHierarchy.indexOf(parentCat.get());
if (subParent) {
return true;
}