1.2.2

opa334 · opa334 · commit acf193b3ce5f · 2022-10-18T21:38:43.000+02:00
diff --git a/RootHelper/control b/RootHelper/control
@@ -1,6 +1,6 @@
 Package: com.opa334.trollstoreroothelper
 Name: trollstoreroothelper
-Version: 1.2.1
+Version: 1.2.2
 Architecture: iphoneos-arm
 Description: An awesome tool of some sort!!
 Maintainer: opa334
diff --git a/RootHelper/main.m b/RootHelper/main.m
@@ -80,16 +80,21 @@ typedef CF_OPTIONS(uint32_t, SecCSFlags) {
 	return systemURLSchemes.copy;
 }
 
-NSSet<NSString*>* appleAppBundleIdentifiers(void)
+NSSet<NSString*>* immutableAppBundleIdentifiers(void)
 {
-	LSEnumerator* enumerator = [LSEnumerator enumeratorForApplicationProxiesWithOptions:0];
-	enumerator.predicate = [NSPredicate predicateWithFormat:@"bundleIdentifier BEGINSWITH 'com.apple'"];
-
 	NSMutableSet* systemAppIdentifiers = [NSMutableSet new];
-	LSApplicationProxy* proxy;
-	while(proxy = [enumerator nextObject])
+
+	LSEnumerator* enumerator = [LSEnumerator enumeratorForApplicationProxiesWithOptions:0];
+	LSApplicationProxy* appProxy;
+	while(appProxy = [enumerator nextObject])
 	{
-		[systemAppIdentifiers addObject:proxy.bundleIdentifier.lowercaseString];
+		if(appProxy.installed)
+		{
+			if(![appProxy.bundleURL.path hasPrefix:@"/private/var/containers"])
+			{
+				[systemAppIdentifiers addObject:appProxy.bundleIdentifier.lowercaseString];
+			}
+		}
 	}
 
 	return systemAppIdentifiers.copy;
@@ -597,7 +602,7 @@ int installApp(NSString* appPath, BOOL sign, BOOL force)
 
 	NSString* appId = appIdForAppPath(appPath);
 	if(!appId) return 176;
-	if([appleAppBundleIdentifiers() containsObject:appId.lowercaseString])
+	if([immutableAppBundleIdentifiers() containsObject:appId.lowercaseString])
 	{
 		return 179;
 	}
diff --git a/RootHelper/uicache.m b/RootHelper/uicache.m
@@ -6,7 +6,7 @@
 
 // uicache on steroids
 
-extern NSSet<NSString*>* appleAppBundleIdentifiers(void);
+extern NSSet<NSString*>* immutableAppBundleIdentifiers(void);
 extern NSDictionary* dumpEntitlementsFromBinaryAtPath(NSString* binaryPath);
 
 NSDictionary* constructGroupsContainersForEntitlements(NSDictionary* entitlements, BOOL systemGroups)
@@ -109,7 +109,7 @@ void registerPath(char* cPath, int unregister)
 	NSDictionary* appInfoPlist = [NSDictionary dictionaryWithContentsOfFile:[path stringByAppendingPathComponent:@"Info.plist"]];
 	NSString* appBundleID = [appInfoPlist objectForKey:@"CFBundleIdentifier"];
 
-	if([appleAppBundleIdentifiers() containsObject:appBundleID.lowercaseString]) return;
+	if([immutableAppBundleIdentifiers() containsObject:appBundleID.lowercaseString]) return;
 
 	if(appBundleID && !unregister)
 	{
diff --git a/TrollHelper/Resources/Info.plist b/TrollHelper/Resources/Info.plist
@@ -52,7 +52,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIDeviceFamily</key>
diff --git a/TrollHelper/control b/TrollHelper/control
@@ -1,6 +1,6 @@
 Package: com.opa334.trollstorehelper
 Name: TrollStore Helper
-Version: 1.2.1
+Version: 1.2.2
 Architecture: iphoneos-arm
 Description: Helper utility to install and manage TrollStore!
 Maintainer: opa334
diff --git a/TrollStore/Resources/Info.plist b/TrollStore/Resources/Info.plist
@@ -50,7 +50,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIDeviceFamily</key>
diff --git a/TrollStore/control b/TrollStore/control
@@ -1,6 +1,6 @@
 Package: com.opa334.trollstore
 Name: TrollStore
-Version: 1.2.1
+Version: 1.2.2
 Architecture: iphoneos-arm
 Description: An awesome application!
 Maintainer: opa334

Original file line number	Diff line number	Diff line change
`@@ -80,16 +80,21 @@ typedef CF_OPTIONS(uint32_t, SecCSFlags) {`
`80`	`80`	`return systemURLSchemes.copy;`
`81`	`81`	`}`
`82`	`82`
`83`		`-NSSet<NSString> appleAppBundleIdentifiers(void)`
	`83`	`+NSSet<NSString> immutableAppBundleIdentifiers(void)`
`84`	`84`	`{`
`85`		`- LSEnumerator* enumerator = [LSEnumerator enumeratorForApplicationProxiesWithOptions:0];`
`86`		`- enumerator.predicate = [NSPredicate predicateWithFormat:@"bundleIdentifier BEGINSWITH 'com.apple'"];`
`87`		`-`
`88`	`85`	`NSMutableSet* systemAppIdentifiers = [NSMutableSet new];`
`89`		`- LSApplicationProxy* proxy;`
`90`		`- while(proxy = [enumerator nextObject])`
	`86`	`+`
	`87`	`+ LSEnumerator* enumerator = [LSEnumerator enumeratorForApplicationProxiesWithOptions:0];`
	`88`	`+ LSApplicationProxy* appProxy;`
	`89`	`+ while(appProxy = [enumerator nextObject])`
`91`	`90`	`{`
`92`		`- [systemAppIdentifiers addObject:proxy.bundleIdentifier.lowercaseString];`
	`91`	`+ if(appProxy.installed)`
	`92`	`+ {`
	`93`	`+ if(![appProxy.bundleURL.path hasPrefix:@"/private/var/containers"])`
	`94`	`+ {`
	`95`	`+ [systemAppIdentifiers addObject:appProxy.bundleIdentifier.lowercaseString];`
	`96`	`+ }`
	`97`	`+ }`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`return systemAppIdentifiers.copy;`
`@@ -597,7 +602,7 @@ int installApp(NSString* appPath, BOOL sign, BOOL force)`
`597`	`602`
`598`	`603`	`NSString* appId = appIdForAppPath(appPath);`
`599`	`604`	`if(!appId) return 176;`
`600`		`- if([appleAppBundleIdentifiers() containsObject:appId.lowercaseString])`
	`605`	`+ if([immutableAppBundleIdentifiers() containsObject:appId.lowercaseString])`
`601`	`606`	`{`
`602`	`607`	`return 179;`
`603`	`608`	`}`