From 252d489ba3f0eb30a0dab8108ea92e2170d1fb45 Mon Sep 17 00:00:00 2001 From: Halo-Michael Date: Wed, 29 Nov 2023 23:59:10 +0800 Subject: [PATCH 1/3] Fix Network for Chinese model --- Shared/TSUtil.m | 22 ++++++++++------------ TrollStore/Makefile | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Shared/TSUtil.m b/Shared/TSUtil.m index 05eb89c..0afba28 100644 --- a/Shared/TSUtil.m +++ b/Shared/TSUtil.m @@ -7,10 +7,8 @@ static EXPLOIT_TYPE gPlatformVulnerabilities; -@interface PSAppDataUsagePolicyCache : NSObject -+ (instancetype)sharedInstance; -- (void)setUsagePoliciesForBundle:(NSString*)bundleId cellular:(BOOL)cellular wifi:(BOOL)wifi; -@end +void* _CTServerConnectionCreate(CFAllocatorRef, void *, void *); +int64_t _CTServerConnectionSetCellularUsagePolicy(CFTypeRef* ct, NSString* identifier, NSDictionary* policies); #define POSIX_SPAWN_PERSONA_FLAGS_OVERRIDE 1 extern int posix_spawnattr_set_persona_np(const posix_spawnattr_t* __restrict, uid_t, uint32_t); @@ -19,14 +17,14 @@ extern int posix_spawnattr_set_persona_gid_np(const posix_spawnattr_t* __restric void chineseWifiFixup(void) { - NSBundle *bundle = [NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/SettingsCellular.framework"]; - [bundle load]; - - PSAppDataUsagePolicyCache* policyCache = [NSClassFromString(@"PSAppDataUsagePolicyCache") sharedInstance]; - if([policyCache respondsToSelector:@selector(setUsagePoliciesForBundle:cellular:wifi:)]) - { - [policyCache setUsagePoliciesForBundle:NSBundle.mainBundle.bundleIdentifier cellular:true wifi:true]; - } + _CTServerConnectionSetCellularUsagePolicy( + _CTServerConnectionCreate(kCFAllocatorDefault, NULL, NULL), + NSBundle.mainBundle.bundleIdentifier, + @{ + @"kCTCellularDataUsagePolicy" : @"kCTCellularDataUsagePolicyAlwaysAllow", + @"kCTWiFiDataUsagePolicy" : @"kCTCellularDataUsagePolicyAlwaysAllow" + } + ); } NSString *getExecutablePath(void) diff --git a/TrollStore/Makefile b/TrollStore/Makefile index d0c62e2..8bf3ab7 100644 --- a/TrollStore/Makefile +++ b/TrollStore/Makefile @@ -9,7 +9,7 @@ include $(THEOS)/makefiles/common.mk APPLICATION_NAME = TrollStore TrollStore_FILES = $(wildcard *.m) $(wildcard ../Shared/*.m) -TrollStore_FRAMEWORKS = UIKit CoreGraphics CoreServices +TrollStore_FRAMEWORKS = UIKit CoreGraphics CoreServices CoreTelephony TrollStore_PRIVATE_FRAMEWORKS = Preferences MobileIcons MobileContainerManager TrollStore_LIBRARIES = archive TrollStore_CFLAGS = -fobjc-arc -I../Shared From b90a540d1dbbe76c8515275c1345934383d8992b Mon Sep 17 00:00:00 2001 From: Halo-Michael Date: Thu, 30 Nov 2023 00:18:50 +0800 Subject: [PATCH 2/3] oops --- RootHelper/Makefile | 1 + TrollHelper/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RootHelper/Makefile b/RootHelper/Makefile index f53fb33..2aeb2fc 100644 --- a/RootHelper/Makefile +++ b/RootHelper/Makefile @@ -13,6 +13,7 @@ trollstorehelper_LDFLAGS = -Lexternal/lib -lcrypto -lchoma trollstorehelper_CODESIGN_FLAGS = --entitlements entitlements.plist trollstorehelper_INSTALL_PATH = /usr/local/bin trollstorehelper_LIBRARIES = archive +trollstorehelper_FRAMEWORKS = CoreTelephony trollstorehelper_PRIVATE_FRAMEWORKS = SpringBoardServices BackBoardServices MobileContainerManager include $(THEOS_MAKE_PATH)/tool.mk diff --git a/TrollHelper/Makefile b/TrollHelper/Makefile index 1ca41a3..0a01c68 100644 --- a/TrollHelper/Makefile +++ b/TrollHelper/Makefile @@ -19,7 +19,7 @@ include $(THEOS)/makefiles/common.mk APPLICATION_NAME = TrollStorePersistenceHelper TrollStorePersistenceHelper_FILES = $(wildcard *.m) $(wildcard ../Shared/*.m) -TrollStorePersistenceHelper_FRAMEWORKS = UIKit CoreGraphics CoreServices +TrollStorePersistenceHelper_FRAMEWORKS = UIKit CoreGraphics CoreServices CoreTelephony TrollStorePersistenceHelper_PRIVATE_FRAMEWORKS = Preferences MobileContainerManager TrollStorePersistenceHelper_CFLAGS = -fobjc-arc -I../Shared From c6ce29251e005511754bfd682793c4020678dab9 Mon Sep 17 00:00:00 2001 From: Halo-Michael Date: Thu, 30 Nov 2023 01:03:25 +0800 Subject: [PATCH 3/3] Remove unused entitlements --- RootHelper/Makefile | 1 - TrollHelper/entitlements.plist | 3 --- TrollStore/entitlements.plist | 3 --- 3 files changed, 7 deletions(-) diff --git a/RootHelper/Makefile b/RootHelper/Makefile index 2aeb2fc..f53fb33 100644 --- a/RootHelper/Makefile +++ b/RootHelper/Makefile @@ -13,7 +13,6 @@ trollstorehelper_LDFLAGS = -Lexternal/lib -lcrypto -lchoma trollstorehelper_CODESIGN_FLAGS = --entitlements entitlements.plist trollstorehelper_INSTALL_PATH = /usr/local/bin trollstorehelper_LIBRARIES = archive -trollstorehelper_FRAMEWORKS = CoreTelephony trollstorehelper_PRIVATE_FRAMEWORKS = SpringBoardServices BackBoardServices MobileContainerManager include $(THEOS_MAKE_PATH)/tool.mk diff --git a/TrollHelper/entitlements.plist b/TrollHelper/entitlements.plist index 8d8ff62..5925e11 100644 --- a/TrollHelper/entitlements.plist +++ b/TrollHelper/entitlements.plist @@ -6,10 +6,7 @@ com.opa334.trollstorepersistencehelper com.apple.CommCenter.fine-grained - cellular-plan - data-usage data-allowed-write - preferences-write com.apple.private.persona-mgmt diff --git a/TrollStore/entitlements.plist b/TrollStore/entitlements.plist index da67efb..abc5d7b 100644 --- a/TrollStore/entitlements.plist +++ b/TrollStore/entitlements.plist @@ -37,10 +37,7 @@ com.apple.CommCenter.fine-grained - cellular-plan - data-usage data-allowed-write - preferences-write com.apple.springboard.opensensitiveurl