Merge branch 'roothide:main' into main

bankm1 · Dec 8, 2024 · 59783bd · 59783bd
2 parents 945d10f + e5dfe4b
commit 59783bd
Show file tree

Hide file tree

Showing 30 changed files with 286 additions and 89 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,24 @@
+{
+    "files.associations": {
+        "__locale": "c",
+        "__tree": "c",
+        "bitset": "c",
+        "set": "c",
+        "syslimits.h": "c",
+        "mman.h": "c",
+        "fcntl.h": "c",
+        "_pthread_types.h": "c",
+        "_pthread_t.h": "c",
+        "signal.h": "c",
+        "algorithm": "cpp",
+        "__bit_reference": "c",
+        "chrono": "c",
+        "map": "c",
+        "unordered_map": "c",
+        "pwd.h": "c",
+        "libgen.h": "c",
+        "libproc.h": "c",
+        "proc_info.h": "c",
+        "libproc_private.h": "c"
+    }
+}
diff --git a/Bootstrap.xcodeproj/project.pbxproj b/Bootstrap.xcodeproj/project.pbxproj
@@ -22,7 +22,7 @@
 		84438D602B26546E00A1E407 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84438D5F2B26546E00A1E407 /* MobileCoreServices.framework */; };
 		84438D622B2654EB00A1E407 /* MobileContainerManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84438D612B2654EB00A1E407 /* MobileContainerManager.framework */; };
 		84438D652B27522400A1E407 /* envbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 84438D642B27522400A1E407 /* envbuf.c */; };
-		84438D6C2B2CDE0100A1E407 /* AppList.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D682B2CDE0100A1E407 /* AppList.m */; };
+		84438D6C2B2CDE0100A1E407 /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D682B2CDE0100A1E407 /* AppInfo.m */; };
 		84438D6D2B2CDE0100A1E407 /* AppViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D6B2B2CDE0100A1E407 /* AppViewController.m */; };
 		84438D6F2B2CE5A300A1E407 /* AppEnabler.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D6E2B2CE5A300A1E407 /* AppEnabler.m */; };
 		847099872B1D855D003FA4ED /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 847099862B1D855D003FA4ED /* AppDelegate.m */; };
@@ -83,8 +83,8 @@
 		84438D612B2654EB00A1E407 /* MobileContainerManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileContainerManager.framework; path = Bootstrap/Frameworks/MobileContainerManager.framework; sourceTree = "<group>"; };
 		84438D632B27522400A1E407 /* envbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = envbuf.h; sourceTree = "<group>"; };
 		84438D642B27522400A1E407 /* envbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = envbuf.c; sourceTree = "<group>"; };
-		84438D682B2CDE0100A1E407 /* AppList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppList.m; sourceTree = "<group>"; };
-		84438D692B2CDE0100A1E407 /* AppList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppList.h; sourceTree = "<group>"; };
+		84438D682B2CDE0100A1E407 /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
+		84438D692B2CDE0100A1E407 /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = "<group>"; };
 		84438D6A2B2CDE0100A1E407 /* AppViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppViewController.h; sourceTree = "<group>"; };
 		84438D6B2B2CDE0100A1E407 /* AppViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppViewController.m; sourceTree = "<group>"; };
 		84438D6E2B2CE5A300A1E407 /* AppEnabler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppEnabler.m; sourceTree = "<group>"; };
@@ -190,8 +190,8 @@
 				FE0633B52B41CF6600B94787 /* Views */,
 				FE0633B42B41CF5800B94787 /* Extensions */,
 				FE0633B32B41CF4D00B94787 /* Classes */,
-				84438D692B2CDE0100A1E407 /* AppList.h */,
-				84438D682B2CDE0100A1E407 /* AppList.m */,
+				84438D692B2CDE0100A1E407 /* AppInfo.h */,
+				84438D682B2CDE0100A1E407 /* AppInfo.m */,
 				847099852B1D855D003FA4ED /* AppDelegate.h */,
 				847099862B1D855D003FA4ED /* AppDelegate.m */,
 				847099882B1D855D003FA4ED /* SceneDelegate.h */,
@@ -378,7 +378,7 @@
 				847099982B1D855E003FA4ED /* main.m in Sources */,
 				84438D522B260FEB00A1E407 /* zstd_wrapper.m in Sources */,
 				8470998A2B1D855D003FA4ED /* SceneDelegate.m in Sources */,
-				84438D6C2B2CDE0100A1E407 /* AppList.m in Sources */,
+				84438D6C2B2CDE0100A1E407 /* AppInfo.m in Sources */,
 				84438D6D2B2CDE0100A1E407 /* AppViewController.m in Sources */,
 				84438D5D2B264A2800A1E407 /* NSUserDefaults+appDefaults.m in Sources */,
 			);
@@ -571,7 +571,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roothide.Bootstrap;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -609,7 +609,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roothide.Bootstrap;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Bootstrap/AppDelegate.m b/Bootstrap/AppDelegate.m
@@ -10,6 +10,7 @@ @implementation AppDelegate
 
 + (void)addLogText:(NSString*)text
 {
+    SYSLOG("addLogText: %@", text);
     [NSNotificationCenter.defaultCenter postNotificationName:@"LogMsgNotification" object:text];
 }
 

diff --git a/Bootstrap/AppEnabler.m b/Bootstrap/AppEnabler.m
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #include <sys/stat.h>
-#include "AppList.h"
+#include "AppInfo.h"
 #include "common.h"
 
 NSString * relativize(NSURL * to, NSURL * from, BOOL fromIsDir) {

diff --git a/Bootstrap/AppList.h → Bootstrap/AppInfo.h b/Bootstrap/AppList.h → Bootstrap/AppInfo.h
@@ -1,7 +1,7 @@
 #import <UIKit/UIKit.h>
 
 
-@interface AppList : NSObject
+@interface AppInfo : NSObject
 @property (nonatomic, strong) NSString *infoPlistPath;
 
 @property (nonatomic, readonly) NSString* bundleIdentifier;

diff --git a/Bootstrap/AppList.m → Bootstrap/AppInfo.m b/Bootstrap/AppList.m → Bootstrap/AppInfo.m
@@ -1,7 +1,7 @@
 // https://github.com/wujianguo/iOSAppsInfo
 // modified by Shadow-
 
-#import "AppList.h"
+#import "AppInfo.h"
 #import <dlfcn.h>
 
 @interface UIImage ()
@@ -42,7 +42,7 @@ + (instancetype)applicationProxyForIdentifier:(NSString*)identifier;
 @end
 
 
-@implementation AppList
+@implementation AppInfo
 {
     PrivateApi_LSApplicationProxy* _applicationProxy;
     UIImage* _icon;

diff --git a/Bootstrap/AppViewController.m b/Bootstrap/AppViewController.m
@@ -2,7 +2,7 @@
 
 #import "AppViewController.h"
 #include "AppDelegate.h"
-#import "AppList.h"
+#import "AppInfo.h"
 #include "common.h"
 #include "AppDelegate.h"
 #include <sys/stat.h>
@@ -54,7 +54,7 @@ -(void)reloadSearch {
         isFiltered = true;
         filteredApps = [[NSMutableArray alloc] init];
         searchText = searchText.lowercaseString;
-        for (AppList* app in appsArray) {
+        for (AppInfo* app in appsArray) {
             NSRange nameRange = [app.name.lowercaseString rangeOfString:searchText options:NSCaseInsensitiveSearch];
             NSRange bundleIdRange = [app.bundleIdentifier.lowercaseString rangeOfString:searchText options:NSCaseInsensitiveSearch];
             if(nameRange.location != NSNotFound || bundleIdRange.location != NSNotFound) {
@@ -127,7 +127,7 @@ - (void)viewWillAppear:(BOOL)animated {
     [self.tableView.refreshControl endRefreshing];
 }
 
--(BOOL)tweakEnabled:(AppList*)app {
+-(BOOL)tweakEnabled:(AppInfo*)app {
     struct stat st;
     if(lstat([app.bundleURL.path stringByAppendingPathComponent:@".jbroot"].fileSystemRepresentation, &st)==0) {
         return YES;
@@ -156,7 +156,7 @@ - (void)updateData:(BOOL)sort {
 
     for(id proxy in allInstalledApplications)
     {
-        AppList* app = [AppList appWithPrivateProxy:proxy];
+        AppInfo* app = [AppInfo appWithPrivateProxy:proxy];
 
 //        if(app.isHiddenApp) continue;
 
@@ -196,7 +196,7 @@ - (void)updateData:(BOOL)sort {
 
     if(sort)
     {
-        NSArray *appsSortedByName = [applications sortedArrayUsingComparator:^NSComparisonResult(AppList *app1, AppList *app2) {
+        NSArray *appsSortedByName = [applications sortedArrayUsingComparator:^NSComparisonResult(AppInfo *app1, AppInfo *app2) {
 
             BOOL enabled1 = [self tweakEnabled:app1];
             BOOL enabled2 = [self tweakEnabled:app2];
@@ -217,9 +217,9 @@ - (void)updateData:(BOOL)sort {
     else
     {
         NSMutableArray *newapps = [NSMutableArray array];
-        [applications enumerateObjectsUsingBlock:^(AppList *newobj, NSUInteger idx, BOOL * _Nonnull stop) {
+        [applications enumerateObjectsUsingBlock:^(AppInfo *newobj, NSUInteger idx, BOOL * _Nonnull stop) {
             __block BOOL hasBeenContained = NO;
-            [self->appsArray enumerateObjectsUsingBlock:^(AppList *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [self->appsArray enumerateObjectsUsingBlock:^(AppInfo *obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 if ([obj.bundleIdentifier isEqualToString:newobj.bundleIdentifier]) {
                     hasBeenContained = YES;
                     *stop = YES;
@@ -231,8 +231,8 @@ - (void)updateData:(BOOL)sort {
         }];
 
         NSMutableArray *tmpArray = [NSMutableArray array];
-        [self->appsArray enumerateObjectsUsingBlock:^(AppList *obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            [applications enumerateObjectsUsingBlock:^(AppList *newobj, NSUInteger idx, BOOL * _Nonnull stop) {
+        [self->appsArray enumerateObjectsUsingBlock:^(AppInfo *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [applications enumerateObjectsUsingBlock:^(AppInfo *newobj, NSUInteger idx, BOOL * _Nonnull stop) {
                 if ([obj.bundleIdentifier isEqualToString:newobj.bundleIdentifier]) {
                     [tmpArray addObject:newobj];
                     *stop = YES;
@@ -291,7 +291,7 @@ - (UIImage *)imageWithImage:(UIImage *)image scaledToSize:(CGSize)newSize {
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"Cell"];
 
-    AppList* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
+    AppInfo* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
 
     if(!app.isHiddenApp) {
         UIImage *image = app.icon;
@@ -328,7 +328,7 @@ - (void)switchChanged:(id)sender {
     CGPoint pos = [switchInCell convertPoint:switchInCell.bounds.origin toView:self.tableView];
     NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:pos];
     BOOL enabled = switchInCell.on;
-    AppList* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
+    AppInfo* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
 
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         [AppDelegate showHudMsg:Localized(@"Applying")];
@@ -365,7 +365,7 @@ - (void)cellLongPress:(UIGestureRecognizer *)recognizer
         long tag = recognizer.view.tag;
         NSIndexPath* indexPath = [NSIndexPath indexPathForRow:tag&0xFFFFFFFF inSection:tag>>32];
 
-        AppList* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
+        AppInfo* app = isFiltered? filteredApps[indexPath.row] : appsArray[indexPath.row];
 
         dispatch_async(dispatch_get_global_queue(0, 0), ^{
             PrivateApi_LSApplicationWorkspace* _workspace = [NSClassFromString(@"LSApplicationWorkspace") new];
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @implementation AppDelegate @@
     + (void)addLogText:(NSString*)text
     {
+        SYSLOG("addLogText: %@", text);
         [NSNotificationCenter.defaultCenter postNotificationName:@"LogMsgNotification" object:text];
     }
@@ Expand Down @@