Merge iOS 8 compatible uicache code from limneos.

[uikittools.git] / uicache.mm

diff --git a/uicache.mm b/uicache.mm
index c7510d036c62dc912e75545ea957321024888537..2eafcddc9702062c8d0b4f77cd981ca66ac966f6 100644 (file)
--- a/uicache.mm
+++ b/uicache.mm
@@ -48,6 +48,8 @@
 
 #include <MobileCoreServices/LSApplicationWorkspace.h>
 
+#include "csstore.hpp"
+
 @interface NSMutableArray (Cydia)
 - (void) addInfoDictionary:(NSDictionary *)info;
 @end
@@ -58,6 +60,10 @@
     [self addObject:info];
 }
 
+- (NSArray *) allInfoDictionaries {
+    return self;
+}
+
 @end
 
 @interface NSMutableDictionary (Cydia)
@@ -71,11 +77,24 @@
     [self setObject:info forKey:bundle];
 }
 
+- (NSArray *) allInfoDictionaries {
+    return [self allValues];
+}
+
 @end
 
 int main(int argc, const char *argv[]) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
+    Class $LSApplicationWorkspace(objc_getClass("LSApplicationWorkspace"));
+    LSApplicationWorkspace *workspace($LSApplicationWorkspace == nil ? nil : [$LSApplicationWorkspace defaultWorkspace]);
+
+    if ([workspace respondsToSelector:@selector(_LSPrivateRebuildApplicationDatabasesForSystemApps:internal:user:)]) {
+        if (![workspace _LSPrivateRebuildApplicationDatabasesForSystemApps:YES internal:YES user:NO])
+            fprintf(stderr, "failed to rebuild application databases");
+        return 0;
+    }
+
     bool respring(false);
 
     NSString *home(NSHomeDirectory());
@@ -86,11 +105,13 @@ int main(int argc, const char *argv[]) {
 
     @try {
 
-    unlink([[NSString stringWithFormat:@"%@/Library/Caches/com.apple.LaunchServices-036.csstore", home] UTF8String]);
+    DeleteCSStores([home UTF8String]);
+
     system("killall lsd");
 
-    Class $LSApplicationWorkspace(objc_getClass("LSApplicationWorkspace"));
-    LSApplicationWorkspace *workspace($LSApplicationWorkspace == nil ? nil : [$LSApplicationWorkspace defaultWorkspace]);
+    if ([workspace respondsToSelector:@selector(invalidateIconCache:)])
+        while (![workspace invalidateIconCache:nil])
+            sleep(1);
 
     if (NSMutableDictionary *cache = [NSMutableDictionary dictionaryWithContentsOfFile:path]) {
         NSFileManager *manager = [NSFileManager defaultManager];
@@ -98,11 +119,21 @@ int main(int argc, const char *argv[]) {
 
         NSMutableDictionary *bundles([NSMutableDictionary dictionaryWithCapacity:16]);
 
-        id system = [cache objectForKey:@"System"];
-        if (system == nil)
-            goto error;
+        id after = [cache objectForKey:@"System"];
+        if (after == nil) { error:
+            fprintf(stderr, "%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]);
+            goto cached;
+        }
+
+        id before([[after copy] autorelease]);
+        [after removeAllObjects];
 
-        [system removeAllObjects];
+        NSArray *cached([cache objectForKey:@"InfoPlistCachedKeys"]);
+
+        NSMutableSet *removed([NSMutableSet set]);
+        for (NSDictionary *info in [before allInfoDictionaries])
+            if (NSString *path = [info objectForKey:@"Path"])
+                [removed addObject:path];
 
         if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) {
             for (NSString *app in apps)
@@ -113,9 +144,27 @@ int main(int argc, const char *argv[]) {
                     if (NSMutableDictionary *info = [NSMutableDictionary dictionaryWithContentsOfFile:plist]) {
                         if (NSString *identifier = [info objectForKey:@"CFBundleIdentifier"]) {
                             [bundles setObject:path forKey:identifier];
+                            [removed removeObject:path];
+
+                            if (cached != nil) {
+                                NSMutableDictionary *merged([before objectForKey:identifier]);
+                                if (merged == nil)
+                                    merged = [NSMutableDictionary dictionary];
+                                else
+                                    merged = [[merged mutableCopy] autorelease];
+
+                                for (NSString *key in cached)
+                                    if (NSObject *value = [info objectForKey:key])
+                                        [merged setObject:value forKey:key];
+                                    else
+                                        [merged removeObjectForKey:key];
+
+                                info = merged;
+                            }
+
                             [info setObject:path forKey:@"Path"];
                             [info setObject:@"System" forKey:@"ApplicationType"];
-                            [system addInfoDictionary:info];
+                            [after addInfoDictionary:info];
                         } else
                             fprintf(stderr, "%s missing CFBundleIdentifier", [app UTF8String]);
                     }
@@ -125,24 +174,29 @@ int main(int argc, const char *argv[]) {
         [cache writeToFile:path atomically:YES];
 
         if (workspace != nil) {
-            for (NSString *identifier in bundles) {
-                NSString *path([bundles objectForKey:identifier]);
-                [workspace unregisterApplication:[NSURL fileURLWithPath:path]];
-            }
-
-            for (NSString *identifier in bundles)
-                if ([workspace respondsToSelector:@selector(invalidateIconCache:)])
+            if ([workspace respondsToSelector:@selector(invalidateIconCache:)]) {
+                for (NSString *identifier in bundles)
                     [workspace invalidateIconCache:identifier];
+            } else {
+                for (NSString *identifier in bundles) {
+                    NSString *path([bundles objectForKey:identifier]);
+                    [workspace unregisterApplication:[NSURL fileURLWithPath:path]];
+                }
+            }
 
             for (NSString *identifier in bundles) {
                 NSString *path([bundles objectForKey:identifier]);
-                [workspace registerApplication:[NSURL fileURLWithPath:path]];
+                if (kCFCoreFoundationVersionNumber >= 800)
+                    [workspace registerApplicationDictionary:[after objectForKey:identifier]];
+                else
+                    [workspace registerApplication:[NSURL fileURLWithPath:path]];
             }
-        }
 
-        if (false) error:
-            fprintf(stderr, "%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]);
+            for (NSString *path in removed)
+                [workspace unregisterApplication:[NSURL fileURLWithPath:path]];
+        }
     } else fprintf(stderr, "cannot open cache file. incorrect user?\n");
+  cached:
 
     if (respring || kCFCoreFoundationVersionNumber >= 550.32) {
         unlink([[NSString stringWithFormat:@"%@/Library/Caches/com.apple.springboard-imagecache-icons", home] UTF8String]);