Local database works now

Author: khanhduytran0

Makefile

@@ -31,9 +31,11 @@ $(APPLICATION_NAME)_CODESIGN_FLAGS = -Sentitlements.plist -Icom.apple.springboar
 
 include $(THEOS_MAKE_PATH)/application.mk
 
-before-package-sim::
+before-package::
 	@# can't use simforge now
-	@vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoard $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoard
-	@vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoardTweak.dylib $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoardTweak.dylib
-	@vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/Frameworks/CydiaSubstrate.framework/CydiaSubstrate $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/Frameworks/CydiaSubstrate.framework/CydiaSubstrate
-	@ldid -S -M $(THEOS_STAGING_DIR)/Applications/SpringBoard.app
+	@if [[ "$(SIMULATOR)" == 1 ]]; then \
+	vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoard $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoard; \
+	vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoardTweak.dylib $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/SpringBoardTweak.dylib; \
+	vtool -arch arm64 -set-build-version 7 14.0 14.0 -replace -output $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/Frameworks/CydiaSubstrate.framework/CydiaSubstrate $(THEOS_STAGING_DIR)/Applications/SpringBoard.app/Frameworks/CydiaSubstrate.framework/CydiaSubstrate; \
+	ldid -S -M $(THEOS_STAGING_DIR)/Applications/SpringBoard.app; \
+	fi

Tweak.x

@@ -292,6 +292,13 @@ typedef void (^LSBundleProxyHandler)(LSBundleProxy *proxy, BOOL *stop);
 - (void *)_perThreadContextsLock_createPerThreadContextForThisThread;
 @end
 %hook LSDBExecutionContext
+- (void *)_perThreadContextsLock_createPerThreadContextForThisThread {
+    void *context = self._perThreadContextsLock_findPerThreadContextForThisThreadIfExists;
+    if(context) {
+        return context;
+    }
+    return %orig;
+}
 - (void *)_perThreadContextsLock_findPerThreadContextForThisThread {
     void *context = self._perThreadContextsLock_findPerThreadContextForThisThreadIfExists;
     if(context) {

hook.m

@@ -71,7 +71,9 @@ @implementation _LSDefaultsHook
 - (NSURL *)databaseContainerDirectoryURL {
     static NSURL *dbContainerURL = nil;
     if(!dbContainerURL) {
-        NSURL *rootDocURL = [[NSClassFromString(@"LCSharedUtils") appGroupPath] URLByAppendingPathComponent:@"LiveContainer"];
+        // Use Documents dir for ease of access
+        NSURL *rootDocURL = nil;
+        //[[NSClassFromString(@"LCSharedUtils") appGroupPath] URLByAppendingPathComponent:@"LiveContainer"];
         if(!rootDocURL) {
             rootDocURL = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%s/Documents", getenv("LC_HOME_PATH")]];
         }
@@ -143,21 +145,57 @@ - (NSURL *)specialAppEligibilityStateURL {
 - (NSURL *)defaultAppQueryStateURL {
     return [self.databaseContainerDirectoryURL URLByAppendingPathComponent:@"DefaultAppQueryState.plist"];
 }
+@end
 
+@interface MIExecutableBundleHook : NSObject
+@end
+@implementation MIExecutableBundleHook
+- (BOOL)needsDataContainer {
+    // guest apps don't have entitlements so it will fail if we return YES
+    return NO;
+}
 @end
 
-__attribute__((constructor)) void SwizzleLSDDefaults(void) {
-    Class lsdClass = NSClassFromString(@"_LSDefaults");
+@interface MIGlobalConfiguration : NSObject
+@end
+@interface MIGlobalConfigurationHook : NSObject
+@end
+@implementation MIGlobalConfigurationHook
+/*
+- (BOOL)hasInternalContent {
+    return YES;
+}
+- (NSURL *)internalAppsDirectory {
+    // returns private apps directory
+    return [NSURL fileURLWithPath:[NSString stringWithFormat:@"%s/Documents/Applications", getenv("LC_HOME_PATH")]];
+}
+ */
+- (NSURL *)systemAppsDirectory {
+    NSURL *appGroupPath = [[NSClassFromString(@"LCSharedUtils") appGroupPath] URLByAppendingPathComponent:@"LiveContainer/Applications"];
+    if(appGroupPath) {
+        return appGroupPath;
+    }
+    return [NSURL fileURLWithPath:@"/Applications"];
+}
+@end
+
+static void ReplaceMethods(Class origClass, Class newClass) {
     uint32_t mc = 0;
-    Method *mlist = class_copyMethodList(_LSDefaultsHook.class, &mc);
+    Method *mlist = class_copyMethodList(newClass, &mc);
     for(uint32_t i = 0; i < mc; i++) {
         Method swizzledMethod = mlist[i];
-        Method originalMethod = class_getInstanceMethod(lsdClass, method_getName(swizzledMethod));
+        Method originalMethod = class_getInstanceMethod(origClass, method_getName(swizzledMethod));
         method_setImplementation(originalMethod, method_getImplementation(swizzledMethod));
     }
     free(mlist);
 }
 
+__attribute__((constructor)) void SwizzleLSDDefaults(void) {
+    ReplaceMethods(NSClassFromString(@"_LSDefaults"), _LSDefaultsHook.class);
+    ReplaceMethods(NSClassFromString(@"MIExecutableBundle"), MIExecutableBundleHook.class);
+    ReplaceMethods(NSClassFromString(@"MIGlobalConfiguration"), MIGlobalConfigurationHook.class);
+}
+
 #if 0
 
 @implementation _LSApplicationRecordEnumerator

main.m

@@ -23,49 +23,6 @@ bool hook_os_variant_has_internal_content(const char* subsystem) {
     return NULL;
 }
 
-void SBLCRegisterInstalledApps(void) {
-    static NSMutableArray *installedApps = nil;
-    installedApps = [NSMutableArray array];
-    NSURL *docPath = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%s/Documents/Applications", getenv("LC_HOME_PATH")]];
-    NSURL *appGroupPath = [[NSClassFromString(@"LCSharedUtils") appGroupPath] URLByAppendingPathComponent:@"LiveContainer/Applications"];
-    
-    LSApplicationWorkspace *workspace = [NSClassFromString(@"LSApplicationWorkspace") defaultWorkspace];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSMutableArray *apps = [fileManager contentsOfDirectoryAtURL:docPath includingPropertiesForKeys:@[NSURLIsDirectoryKey]
-                                                         options:NSDirectoryEnumerationSkipsHiddenFiles error:nil].mutableCopy;
-    if(appGroupPath) {
-        NSArray *sharedApps = [fileManager contentsOfDirectoryAtURL:appGroupPath includingPropertiesForKeys:@[NSURLIsDirectoryKey]
-                                                        options:NSDirectoryEnumerationSkipsHiddenFiles error:nil];
-        [apps addObjectsFromArray:sharedApps];
-    }
-    for (NSURL *url in apps) {
-        if (![url.pathExtension isEqualToString:@"app"]) continue;
-        // TODO: handle hidden apps?
-        NSDictionary *infoPlist = [NSDictionary dictionaryWithContentsOfURL:[url URLByAppendingPathComponent:@"Info.plist"]];
-        NSString *bundleID = infoPlist[@"CFBundleIdentifier"];
-        [workspace registerApplicationDictionary:@{
-            @"ApplicationType": @"System",
-            @"CFBundleIdentifier": bundleID,
-            @"CodeInfoIdentifier": bundleID,
-            @"CompatibilityState": @0,
-            @"IsContainerized": @(YES),
-            @"EnvironmentVariables": @{},
-            @"IsDeletable": @(NO),
-            @"Path": url.path,
-            @"SignerOrganization": @"Apple Inc.",
-            @"SignatureVersion": @0x20500,
-            @"SignerIdentity": @"Apple iPhone OS Application Signing",
-            @"IsAdHocSigned": @YES,
-            @"LSInstallType": @1,
-            @"HasMIDBasedSINF": @0,
-            @"MissingSINF": @0,
-            @"FamilyID": @0,
-            @"IsOnDemandInstallCapable": @0,
-            @"HasAppGroupContainers": @YES
-        }];
-    }
-}
-
 int (*SBSystemAppMain)(int argc, char *argv[], char *envp[]);
 int main(int argc, char *argv[], char *envp[]) {
     // initialize lsd
@@ -104,9 +61,6 @@ int main(int argc, char *argv[], char *envp[]) {
         abort();
     }
 
-    // register installed apps, can only be done after loading SpringBoardTweak
-    SBLCRegisterInstalledApps();
-    
     dlopen("/var/jb/usr/lib/TweakInject/FLEXing.dylib", RTLD_GLOBAL|RTLD_NOW);
     SBSystemAppMain = dlsym(handle, "SBSystemAppMain");
 	 return SBSystemAppMain(argc, argv, envp);