fix domain sorting error

This commit is contained in:
leminlimez 2025-03-30 15:28:51 -04:00
parent fa325c0281
commit 9c915002e2
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ from pymobiledevice3.services.installation_proxy import InstallationProxyService
import os
class FileToRestore:
def __init__(self, contents: str, restore_path: str, contents_path: str = None, domain: str = None, owner: int = 501, group: int = 501):
def __init__(self, contents: str, restore_path: str, contents_path: str = None, domain: str = "", owner: int = 501, group: int = 501):
self.contents = contents
self.contents_path = contents_path
self.restore_path = restore_path
@ -95,7 +95,7 @@ def restore_files(files: list[FileToRestore], reboot: bool = False, lockdown_cli
last_path = ""
exploit_only = True
for file in sorted_files:
if file.domain == None:
if file.domain == "":
last_domain = concat_exploit_file(file, files_list, last_domain)
else:
last_domain, last_path = concat_regular_file(file, files_list, last_domain, last_path)

View File

@ -246,7 +246,7 @@ class DeviceManager:
# returns Domain: str?, Path: str
if self.get_current_device_supported() and not path.startswith("/var/mobile/") and not owner == 0:
# don't do anything on sparserestore versions
return path, None
return path, ""
fully_patched = self.get_current_device_patched()
# just make the Sys Containers to use the regular way (won't work for mga)
sysSharedContainer = "SysSharedContainerDomain-"
@ -274,7 +274,7 @@ class DeviceManager:
new_domain += parts[0]
new_path = new_path.replace(parts[0] + "/", "")
return new_path, new_domain
return path, None
return path, ""
def concat_file(self, contents: str, path: str, files_to_restore: list[FileToRestore], owner: int = 501, group: int = 501):
# TODO: try using inodes here instead