From acf193b3ce5fbf9bc6bf1560349ba3246fd41956 Mon Sep 17 00:00:00 2001
From: opa334 <opa334@users.noreply.github.com>
Date: Tue, 18 Oct 2022 21:38:43 +0200
Subject: [PATCH] 1.2.2

---
 RootHelper/control               |  2 +-
 RootHelper/main.m                | 21 +++++++++++++--------
 RootHelper/uicache.m             |  4 ++--
 TrollHelper/Resources/Info.plist |  2 +-
 TrollHelper/control              |  2 +-
 TrollStore/Resources/Info.plist  |  2 +-
 TrollStore/control               |  2 +-
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/RootHelper/control b/RootHelper/control
index 8799025..25219b2 100644
--- 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
index 32e3f77..b5f27b4 100644
--- a/RootHelper/main.m
+++ b/RootHelper/main.m
@@ -80,16 +80,21 @@ NSSet<NSString*>* appleURLSchemes(void)
 	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
index 636148e..f1554a9 100644
--- 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
index 2a6049b..857f246 100644
--- 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
index 9faecfb..17ddd9a 100644
--- 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
index 41602f5..adb7f9c 100644
--- 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
index 0b07353..d0661d1 100644
--- 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