1.1.1

2022-09-29 21:00:11 +02:00 · 2022-09-29 21:00:11 +02:00 · 2900226770
parent f89279b620
commit 2900226770
13 changed files with 79 additions and 43 deletions
--- a/Helper/control
+++ b/Helper/control
@ -1,6 +1,6 @@
 Package: com.opa334.trollstoreroothelper
 Name: trollstoreroothelper
-Version: 1.1
+Version: 1.1.1
 Architecture: iphoneos-arm
 Description: An awesome tool of some sort!!
 Maintainer: opa334
--- a/Helper/main.m
+++ b/Helper/main.m
@ -772,41 +772,44 @@ int installApp(NSString* appPath, BOOL sign, BOOL force)

 int uninstallApp(NSString* appPath, NSString* appId)
 {
-	BKSTerminateApplicationForReasonAndReportWithDescription(appId, 5, false, @"TrollStore - App uninstalled");
-
-	LSApplicationProxy* appProxy = [LSApplicationProxy applicationProxyForIdentifier:appId];
-	MCMContainer *appContainer = [objc_getClass("MCMAppDataContainer") containerWithIdentifier:appId createIfNecessary:NO existed:nil error:nil];
-	NSString *containerPath = [appContainer url].path;
-	if(containerPath)
+	if(appId)
 	{
-		NSLog(@"[uninstallApp] deleting %@", containerPath);
-		// delete app container path
-		[[NSFileManager defaultManager] removeItemAtPath:containerPath error:nil];
-	}
+		BKSTerminateApplicationForReasonAndReportWithDescription(appId, 5, false, @"TrollStore - App uninstalled");

-	// delete group container paths
-	[[appProxy groupContainerURLs] enumerateKeysAndObjectsUsingBlock:^(NSString* groupId, NSURL* groupURL, BOOL* stop)
-	{
-		// If another app still has this group, don't delete it
-		NSArray<LSApplicationProxy*>* appsWithGroup = applicationsWithGroupId(groupId);
-		if(appsWithGroup.count > 1)
+		LSApplicationProxy* appProxy = [LSApplicationProxy applicationProxyForIdentifier:appId];
+		MCMContainer *appContainer = [objc_getClass("MCMAppDataContainer") containerWithIdentifier:appId createIfNecessary:NO existed:nil error:nil];
+		NSString *containerPath = [appContainer url].path;
+		if(containerPath)
 		{
-			NSLog(@"[uninstallApp] not deleting %@, appsWithGroup.count:%lu", groupURL, appsWithGroup.count);
-			return;
+			NSLog(@"[uninstallApp] deleting %@", containerPath);
+			// delete app container path
+			[[NSFileManager defaultManager] removeItemAtPath:containerPath error:nil];
 		}

-		NSLog(@"[uninstallApp] deleting %@", groupURL);
-		[[NSFileManager defaultManager] removeItemAtURL:groupURL error:nil];
-	}];
-
-	// delete app plugin paths
-	for(LSPlugInKitProxy* pluginProxy in appProxy.plugInKitPlugins)
-	{
-		NSURL* pluginURL = pluginProxy.dataContainerURL;
-		if(pluginURL)
+		// delete group container paths
+		[[appProxy groupContainerURLs] enumerateKeysAndObjectsUsingBlock:^(NSString* groupId, NSURL* groupURL, BOOL* stop)
 		{
-			NSLog(@"[uninstallApp] deleting %@", pluginURL);
-			[[NSFileManager defaultManager] removeItemAtURL:pluginURL error:nil];
+			// If another app still has this group, don't delete it
+			NSArray<LSApplicationProxy*>* appsWithGroup = applicationsWithGroupId(groupId);
+			if(appsWithGroup.count > 1)
+			{
+				NSLog(@"[uninstallApp] not deleting %@, appsWithGroup.count:%lu", groupURL, appsWithGroup.count);
+				return;
+			}
+
+			NSLog(@"[uninstallApp] deleting %@", groupURL);
+			[[NSFileManager defaultManager] removeItemAtURL:groupURL error:nil];
+		}];
+
+		// delete app plugin paths
+		for(LSPlugInKitProxy* pluginProxy in appProxy.plugInKitPlugins)
+		{
+			NSURL* pluginURL = pluginProxy.dataContainerURL;
+			if(pluginURL)
+			{
+				NSLog(@"[uninstallApp] deleting %@", pluginURL);
+				[[NSFileManager defaultManager] removeItemAtURL:pluginURL error:nil];
+			}
 		}
 	}

@ -855,7 +858,6 @@ int uninstallAppByPath(NSString* appPath)
 {
 	if(!appPath) return 1;
 	NSString* appId = appIdForAppPath(appPath);
-	if(!appId) return 1;
 	return uninstallApp(appPath, appId);
 }

--- a/Helper/uicache.m
+++ b/Helper/uicache.m
@ -52,6 +52,7 @@ BOOL constructContainerizationForEntitlements(NSDictionary* entitlements)
 	{
 		if(noContainer.boolValue)
 		{
+			NSLog(@"constructContainerizationForEntitlements NO com.apple.private.security.no-container");
 			return NO;
 		}
 	}
@ -61,10 +62,12 @@ BOOL constructContainerizationForEntitlements(NSDictionary* entitlements)
 	{
 		if(!containerRequired.boolValue)
 		{
+			NSLog(@"constructContainerizationForEntitlements NO com.apple.private.security.container-required");
 			return NO;
 		}
 	}

+	NSLog(@"constructContainerizationForEntitlements YES");
 	return YES;
 }

--- a/PersistenceHelper/Resources/Info.plist
+++ b/PersistenceHelper/Resources/Info.plist
@ -52,7 +52,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIDeviceFamily</key>
--- a/PersistenceHelper/control
+++ b/PersistenceHelper/control
@ -1,6 +1,6 @@
 Package: com.opa334.trollstorehelper
 Name: TrollStore Helper
-Version: 1.1
+Version: 1.1.1
 Architecture: iphoneos-arm
 Description: Helper utility to install and manage TrollStore!
 Maintainer: opa334
--- a/PersistenceHelper/entitlements.plist
+++ b/PersistenceHelper/entitlements.plist
@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>application-identifier</key>
-    <string>com.opa334.TrollStore</string>
+	<string>com.opa334.TrollStore</string>
 	<key>platform-application</key>
 	<true/>
 	<key>com.apple.security.exception.files.absolute-path.read-write</key>
@ -18,17 +18,24 @@
 	<true/>
 	<key>com.apple.private.security.container-manager</key>
 	<true/>
-    <key>com.apple.private.coreservices.canmaplsdatabase</key>
-    <true/>
-    <key>com.apple.lsapplicationworkspace.rebuildappdatabases</key>
-    <true/>
-    <key>com.apple.private.MobileContainerManager.allowed</key>
+	<key>com.apple.private.coreservices.canmaplsdatabase</key>
 	<true/>
-    <key>com.apple.private.MobileInstallationHelperService.InstallDaemonOpsEnabled</key>
+	<key>com.apple.lsapplicationworkspace.rebuildappdatabases</key>
+	<true/>
+	<key>com.apple.private.MobileContainerManager.allowed</key>
+	<true/>
+	<key>com.apple.private.MobileInstallationHelperService.InstallDaemonOpsEnabled</key>
 	<true/>
 	<key>com.apple.private.MobileInstallationHelperService.allowed</key>
 	<true/>
-    <key>com.apple.private.uninstall.deletion</key>
+	<key>com.apple.private.uninstall.deletion</key>
 	<true/>
+	<key>com.apple.CommCenter.fine-grained</key>
+	<array>
+		<string>cellular-plan</string>
+		<string>data-usage</string>
+		<string>data-allowed-write</string>
+		<string>preferences-write</string>
+	</array>
 </dict>
 </plist>
--- a/PersistenceHelper/main.m
+++ b/PersistenceHelper/main.m
@ -1,10 +1,12 @@
 #import <Foundation/Foundation.h>
 #import "TSPHAppDelegate.h"
+#import "../Store/TSUtil.h"

 int main(int argc, char *argv[]) {
 	@autoreleasepool {
 		NSBundle* mcmBundle = [NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/MobileContainerManager.framework"];
        [mcmBundle load];
+		chineseWifiFixup();
 		return UIApplicationMain(argc, argv, nil, NSStringFromClass(TSPHAppDelegate.class));
 	}
 }
--- a/Store/Resources/Info.plist
+++ b/Store/Resources/Info.plist
@ -50,7 +50,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIDeviceFamily</key>
--- a/Store/TSUtil.h
+++ b/Store/TSUtil.h
@ -1,5 +1,6 @@
@import Foundation;

+extern void chineseWifiFixup(void);
 extern NSString* helperPath(void);
 extern void printMultilineNSString(NSString* stringToPrint);
 extern int spawnRoot(NSString* path, NSArray* args, NSString** stdOut, NSString** stdErr);
--- a/Store/TSUtil.m
+++ b/Store/TSUtil.m
@ -4,11 +4,23 @@
 #import <spawn.h>
 #import <sys/sysctl.h>

+@interface PSAppDataUsagePolicyCache : NSObject
+ (instancetype)sharedInstance;
+- (void)setUsagePoliciesForBundle:(NSString*)bundleId cellular:(BOOL)cellular wifi:(BOOL)wifi;
+@end
+
 #define POSIX_SPAWN_PERSONA_FLAGS_OVERRIDE 1
 extern int posix_spawnattr_set_persona_np(const posix_spawnattr_t* __restrict, uid_t, uint32_t);
 extern int posix_spawnattr_set_persona_uid_np(const posix_spawnattr_t* __restrict, uid_t);
 extern int posix_spawnattr_set_persona_gid_np(const posix_spawnattr_t* __restrict, uid_t);

+void chineseWifiFixup(void)
+{
+	Class K_PSAppDataUsagePolicyCache = NSClassFromString(@"PSAppDataUsagePolicyCache");
+	PSAppDataUsagePolicyCache* cache = [K_PSAppDataUsagePolicyCache sharedInstance];
+	[cache setUsagePoliciesForBundle:NSBundle.mainBundle.bundleIdentifier cellular:true wifi:true];
+}
+
 NSString* helperPath(void)
 {
 	return [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"trollstorehelper"];
--- a/Store/control
+++ b/Store/control
@ -1,6 +1,6 @@
 Package: com.opa334.trollstore
 Name: TrollStore
-Version: 1.1
+Version: 1.1.1
 Architecture: iphoneos-arm
 Description: An awesome application!
 Maintainer: opa334
--- a/Store/entitlements.plist
+++ b/Store/entitlements.plist
@ -32,5 +32,12 @@
 	<true/>
 	<key>com.apple.private.security.storage.MobileDocuments</key>
 	<true/>
+	<key>com.apple.CommCenter.fine-grained</key>
+	<array>
+		<string>cellular-plan</string>
+		<string>data-usage</string>
+		<string>data-allowed-write</string>
+		<string>preferences-write</string>
+	</array>
 </dict>
 </plist>
--- a/Store/main.m
+++ b/Store/main.m
@ -1,8 +1,10 @@
 #import <Foundation/Foundation.h>
 #import "TSAppDelegate.h"
+#import "TSUtil.h"

 int main(int argc, char *argv[]) {
 	@autoreleasepool {
+		chineseWifiFixup();
 		return UIApplicationMain(argc, argv, nil, NSStringFromClass(TSAppDelegate.class));
 	}
 }