Merge pull request #14 from CRKatri/ck/uicache-/p/p/p/-support

/p/p/p/Applications support and App Store warning

Author: Diatrus

Makefile

@@ -11,6 +11,8 @@ MAN := gssc.1 ldrestart.1 sbdidlaunch.1 sbreload.1 uicache.1 uiopen.1 deviceinfo
 ALLMAC := gssc deviceinfo
 MANMAC := gssc.1 deviceinfo.1
 
+APP_PATH ?= $(MEMO_PREFIX)/Applications
+
 sign: $(ALL)
 	$(STRIP) $(ALL)
 	$(LDID) -Sent.plist ldrestart sbdidlaunch deviceinfo
@@ -34,7 +36,7 @@ sbreload: sbreload.m sbreload-launchd.c sbreload.plist
 	$(CC) -fobjc-arc -O3 $(CFLAGS) sbreload.m sbreload-launchd.c -o sbreload $(LDFLAGS) -framework Foundation
 
 uicache: uicache.m uicache.plist
-	$(CC) -fobjc-arc -O3 $(CFLAGS) uicache.m -o uicache -framework Foundation $(LDFLAGS) -framework MobileCoreServices
+	$(CC) -fobjc-arc -O3 $(CFLAGS) uicache.m -o uicache -framework Foundation $(LDFLAGS) -framework MobileCoreServices -DAPP_PATH="@\"$(APP_PATH)\""
 
 uiopen: uiopen.m ent.plist
 	$(CC) -fobjc-arc -O3 $(CFLAGS) uiopen.m -o uiopen $(LDFLAGS) -framework Foundation -framework MobileCoreServices

uicache.1

@@ -31,6 +31,12 @@ rather than just the changes.
 This option will make
 .Fl a
 significantly slower.
+When used with
+.Fl p
+or
+.Fl u ,
+.Nm
+will operate on apps installed from the App Store.
 .It Fl h , -help
 Prints a help text
 .It Fl r , -respring
@@ -74,3 +80,9 @@ and
 .Fl i
 flags were added to uikittools-ng on April 4, 2021, by
 .An Cameron Katri .
+.Sh CAVEATS
+The
+.Nm
+utility does not work on any applications that were installed from the App Store.
+There is a check to prevent any modifications to them which will be overwritten by
+.Fl f .

uicache.m

@@ -6,6 +6,10 @@
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <Foundation/NSURL.h>
 
+#ifndef APP_PATH
+#define APP_PATH @"/private/preboot/procursus/Applications
+#endif
+
 @interface _LSApplicationState : NSObject
 -(BOOL)isValid;
 @end
@@ -79,10 +83,11 @@ void help(char *name) {
 		"  -a, --all                Update all system and internal applications\n"
 		"                              (replicates the old uicache behavior)\n"
 		"  -f, --force              Force -a to reregister all Applications\n"
+		"                              and modify App Store apps\n"
 		"  -p, --path <path>        Update application bundle at the specified path\n"
 		"  -u, --unregister <path>  Unregister application bundle at the specified path\n"
 		"  -r, --respring           Restart SpringBoard and backboardd after\n"
-		"                              updating applications.\n"
+		"                              updating applications\n"
 		"  -l, --list               List the bundle ids of installed apps\n"
 		"  -i, --info <bundleid>    Give information about given bundle id\n"
 		"  -h, --help               Give this help list.\n\n"
@@ -98,6 +103,15 @@ void registerPath(char *path, int unregister) {
 		LSApplicationProxy *app = [LSApplicationProxy applicationProxyForIdentifier:[NSString stringWithUTF8String:path]];
 		path = (char *)[[app bundleURL] fileSystemRepresentation];
 	}
+
+	if ([[NSString stringWithUTF8String:path] hasPrefix:@"/private/var/containers/Bundle/Application"] || [[NSString stringWithUTF8String:path] hasPrefix:@"/var/containers/Bundle/Application"]) {
+		printf("uicache does not support App Store apps.\n");
+		if (force)
+			printf("Continuing anyway...\n");
+		else
+			return;
+	}
+
 	NSString *rawPath = [NSString stringWithUTF8String:path];
 	rawPath = [rawPath stringByResolvingSymlinksInPath];
 
@@ -210,6 +224,7 @@ void registerAll() {
 	}
 
 	NSArray<NSString *> *files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/Applications" error:nil];
+	NSArray<NSString *> *filesSecondary = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:APP_PATH error:nil];
 
 	NSMutableSet<NSString*> *installed = [[NSMutableSet alloc] init];
 
@@ -228,11 +243,26 @@ void registerAll() {
 		}
 	}
 
+	for (NSString *file in filesSecondary) {
+		if ([file hasSuffix:@".app"] &&
+		    [[NSFileManager defaultManager]
+		        fileExistsAtPath:[NSString
+		        stringWithFormat:@"%@/%@/Info.plist", APP_PATH, file]] &&
+		    [[NSFileManager defaultManager]
+		        fileExistsAtPath:[NSString stringWithFormat:@"%@/%@/%@",
+		        APP_PATH, file, [[NSDictionary dictionaryWithContentsOfURL:[NSURL
+		        fileURLWithPath:[NSString stringWithFormat:@"%@/%@/Info.plist", APP_PATH, file]] error:nil]
+		        valueForKey:@"CFBundleExecutable"]]])
+		{
+			[installed addObject:[NSString stringWithFormat:@"%@/%@", APP_PATH, file]];
+		}
+	}
+
 	NSMutableSet<NSString*> *registered = [[NSMutableSet alloc] init];
 
 	LSApplicationWorkspace *workspace = [LSApplicationWorkspace defaultWorkspace];
 	for (LSApplicationProxy *app in [workspace allApplications]) {
-		if ([[NSString stringWithUTF8String:[[app bundleURL] fileSystemRepresentation]] hasPrefix:@"/Applications"]) {
+		if ([[NSString stringWithUTF8String:[[app bundleURL] fileSystemRepresentation]] hasPrefix:@"/Applications"] || [[NSString stringWithUTF8String:[[app bundleURL] fileSystemRepresentation]] hasPrefix:APP_PATH]) {
 			[registered addObject:[NSString stringWithUTF8String:[[app bundleURL] fileSystemRepresentation]]];
 		}
 	}