From 3fe3e7f241e436bb8b3c35d94746057e280a9a4a Mon Sep 17 00:00:00 2001 From: opa334 Date: Tue, 28 Nov 2023 03:36:02 +0100 Subject: [PATCH] 2.0.5 --- RootHelper/control | 2 +- RootHelper/main.m | 18 +++++++++--------- TrollHelper/Resources/Info.plist | 2 +- TrollHelper/control | 2 +- TrollStore/Resources/Info.plist | 2 +- TrollStore/TSApplicationsManager.m | 10 +++++----- TrollStore/TSSceneDelegate.m | 4 ++-- TrollStore/TSSettingsListController.m | 8 ++++---- TrollStore/control | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/RootHelper/control b/RootHelper/control index 7ebde27..4e04f62 100644 --- a/RootHelper/control +++ b/RootHelper/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstoreroothelper Name: trollstoreroothelper -Version: 2.0.4 +Version: 2.0.5 Architecture: iphoneos-arm Description: An awesome tool of some sort!! Maintainer: opa334 diff --git a/RootHelper/main.m b/RootHelper/main.m index 61e0275..fe6a309 100644 --- a/RootHelper/main.m +++ b/RootHelper/main.m @@ -478,11 +478,11 @@ int signApp(NSString* appPath) #else int signAdhoc(NSString *filePath, NSDictionary *entitlements) { - if (@available(iOS 16, *)) { - return codesign_sign_adhoc(filePath.fileSystemRepresentation, true, entitlements); - } + //if (@available(iOS 16, *)) { + // return codesign_sign_adhoc(filePath.fileSystemRepresentation, true, entitlements); + //} // If iOS 14 is so great, how come there is no iOS 14 2????? - else { + //else { if(!isLdidInstalled()) return 173; NSString *entitlementsPath = nil; @@ -519,7 +519,7 @@ int signAdhoc(NSString *filePath, NSDictionary *entitlements) { return 175; } - } + //} } int signApp(NSString* appPath) @@ -1051,7 +1051,7 @@ int installTrollStore(NSString* pathToTar) NSString* tmpTrollStorePath = [tmpPayloadPath stringByAppendingPathComponent:@"TrollStore.app"]; if(![[NSFileManager defaultManager] fileExistsAtPath:tmpTrollStorePath]) return 1; - if (@available(iOS 16, *)) {} else { + //if (@available(iOS 16, *)) {} else { // Transfer existing ldid installation if it exists // But only if the to-be-installed version of TrollStore is 1.5.0 or above // This is to make it possible to downgrade to older versions still @@ -1084,7 +1084,7 @@ int installTrollStore(NSString* pathToTar) } } } - } + //} // Merge existing URL scheme settings value if(!getTSURLSchemeState(nil)) @@ -1367,12 +1367,12 @@ int MAIN_NAME(int argc, char *argv[], char *envp[]) } else if([cmd isEqualToString:@"install-ldid"]) { - if (@available(iOS 16, *)) {} else { + //if (@available(iOS 16, *)) {} else { if(args.count < 3) return -3; NSString* ldidPath = args[1]; NSString* ldidVersion = args[2]; installLdid(ldidPath, ldidVersion); - } + //} } else if([cmd isEqualToString:@"refresh"]) { diff --git a/TrollHelper/Resources/Info.plist b/TrollHelper/Resources/Info.plist index b033df1..4e04a7f 100644 --- a/TrollHelper/Resources/Info.plist +++ b/TrollHelper/Resources/Info.plist @@ -52,7 +52,7 @@ iPhoneOS CFBundleVersion - 2.0.4 + 2.0.5 LSRequiresIPhoneOS UIDeviceFamily diff --git a/TrollHelper/control b/TrollHelper/control index 339118f..ceb09ee 100644 --- a/TrollHelper/control +++ b/TrollHelper/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstorehelper Name: TrollStore Helper -Version: 2.0.4 +Version: 2.0.5 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 2d26f4c..63958a1 100644 --- a/TrollStore/Resources/Info.plist +++ b/TrollStore/Resources/Info.plist @@ -50,7 +50,7 @@ iPhoneOS CFBundleVersion - 2.0.4 + 2.0.5 LSRequiresIPhoneOS UIDeviceFamily diff --git a/TrollStore/TSApplicationsManager.m b/TrollStore/TSApplicationsManager.m index 5050756..5b77e9f 100644 --- a/TrollStore/TSApplicationsManager.m +++ b/TrollStore/TSApplicationsManager.m @@ -54,12 +54,12 @@ extern NSUserDefaults* trollStoreUserDefaults(); errorDescription = @"The app's main executable does not exist."; break; case 175: { - if (@available(iOS 16, *)) { - errorDescription = @"Failed to sign the app."; - } - else { + //if (@available(iOS 16, *)) { + // errorDescription = @"Failed to sign the app."; + //} + //else { errorDescription = @"Failed to sign the app. ldid returned a non zero status code."; - } + //} } break; case 176: diff --git a/TrollStore/TSSceneDelegate.m b/TrollStore/TSSceneDelegate.m index 102d499..f4b242b 100644 --- a/TrollStore/TSSceneDelegate.m +++ b/TrollStore/TSSceneDelegate.m @@ -76,7 +76,7 @@ // or if it's the one from an old TrollStore version that's no longer supported - (void)handleLdidCheck { - if (@available(iOS 16, *)) {} else { + //if (@available(iOS 16, *)) {} else { NSString* tsAppPath = [NSBundle mainBundle].bundlePath; NSString* ldidPath = [tsAppPath stringByAppendingPathComponent:@"ldid"]; @@ -86,7 +86,7 @@ { [TSInstallationController installLdid]; } - } + //} } - (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions { diff --git a/TrollStore/TSSettingsListController.m b/TrollStore/TSSettingsListController.m index 8618610..6a97299 100644 --- a/TrollStore/TSSettingsListController.m +++ b/TrollStore/TSSettingsListController.m @@ -34,7 +34,7 @@ extern NSUserDefaults* trollStoreUserDefaults(void); } }); - if (@available(iOS 16, *)) {} else { + //if (@available(iOS 16, *)) {} else { fetchLatestLdidVersion(^(NSString* latestVersion) { NSString* ldidVersionPath = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"ldid.version"]; @@ -54,7 +54,7 @@ extern NSUserDefaults* trollStoreUserDefaults(void); }); } }); - } + //} } - (NSMutableArray*)specifiers @@ -113,7 +113,7 @@ extern NSUserDefaults* trollStoreUserDefaults(void); [_specifiers addObject:rebuildIconCacheSpecifier]; - if (@available(iOS 16, *)) { } else { + //if (@available(iOS 16, *)) { } else { NSString* ldidPath = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"ldid"]; NSString* ldidVersionPath = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"ldid.version"]; BOOL ldidInstalled = [[NSFileManager defaultManager] fileExistsAtPath:ldidPath]; @@ -188,7 +188,7 @@ extern NSUserDefaults* trollStoreUserDefaults(void); installLdidSpecifier.buttonAction = @selector(installOrUpdateLdidPressed); [_specifiers addObject:installLdidSpecifier]; } - } + //} PSSpecifier* persistenceGroupSpecifier = [PSSpecifier emptyGroupSpecifier]; persistenceGroupSpecifier.name = @"Persistence"; diff --git a/TrollStore/control b/TrollStore/control index 6fb929d..14394e5 100644 --- a/TrollStore/control +++ b/TrollStore/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstore Name: TrollStore -Version: 2.0.4 +Version: 2.0.5 Architecture: iphoneos-arm Description: An awesome application! Maintainer: opa334