some fixes

f1shy-dev · Aug 7, 2023 · 7348125 · 7348125
1 parent 279367d
commit 7348125
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/ControlConfig.xcodeproj/project.pbxproj b/ControlConfig.xcodeproj/project.pbxproj
@@ -951,7 +951,7 @@
 				CODE_SIGN_ENTITLEMENTS = ControlConfig/ControlConfig.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "KfdExploit-Testing-8";
+				CURRENT_PROJECT_VERSION = "KfdExploit-Testing-9";
 				DEVELOPMENT_ASSET_PATHS = "\"ControlConfig/Preview Content\"";
 				DEVELOPMENT_TEAM = ZV2PLXMRSB;
 				ENABLE_PREVIEWS = YES;
@@ -996,7 +996,7 @@
 				CODE_SIGN_ENTITLEMENTS = ControlConfig/ControlConfig.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "KfdExploit-Testing-8";
+				CURRENT_PROJECT_VERSION = "KfdExploit-Testing-9";
 				DEVELOPMENT_ASSET_PATHS = "\"ControlConfig/Preview Content\"";
 				DEVELOPMENT_TEAM = ZV2PLXMRSB;
 				ENABLE_PREVIEWS = YES;

diff --git a/ControlConfig/ControlConfigApp.swift b/ControlConfig/ControlConfigApp.swift
@@ -69,13 +69,13 @@ struct ControlConfigApp: App {
                     switch localPatchState {
                     case .LoadingBackups:
                         BareLoading(animateRotate: true, title: "Loading Backups", msg: "Please wait patiently, this can take upto a minute, depending on your device...").onAppear {
-                            #if targetEnvironment(simulator)
-                            DispatchQueue.main.async {
-                                withAnimation {
-                                    localPatchState = .Escaped
-                                }
-                            }
-                            #else
+//                            #if targetEnvironment(simulator)
+//                            DispatchQueue.main.async {
+//                                withAnimation {
+//                                    localPatchState = .Escaped
+//                                }
+//                            }
+//                            #else
                             DispatchQueue.global(qos: .userInitiated).async {
                                 BackupManager.shared.loadBackupList()
                                 if BackupManager.shared.backups.count == 0 {
@@ -100,7 +100,7 @@ struct ControlConfigApp: App {
                                     }
                                 }
                             }
-                            #endif
+//                            #endif
                         }
                     case .Detecting:
                         BareLoading(animateRotate: true, title: "Patching", msg: "Please wait patiently, this can take a second. Also, please accept any access popups...")
@@ -144,6 +144,7 @@ struct ControlConfigApp: App {
                     let appVersion = ((Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown") + " (" + (Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "Unknown") + ")")
                     print("🚀 ControlConfig - v\(appVersion)")
                     #if targetEnvironment(simulator)
+                    print("📱 Simulator mode - running as KFD")
                     localPatchState = .LoadingBackups
                     activeExploit = .KFD
                     #else

diff --git a/ControlConfig/Models/BackupManager.swift b/ControlConfig/Models/BackupManager.swift
@@ -199,9 +199,7 @@ class BackupManager {
             dictionary["cm_moduleFill"] = cm_moduleFill != nil
             dictionary["cm_moduleStroke"] = cm_moduleStroke != nil
 
-            // print the dictionary
-            print("bss", dictionary)
-
+
         if let moduleConfiguration = moduleConfiguration,
            let moduleAllowedList = moduleAllowedList,
            let defaultModuleSettings = defaultModuleSettings,

diff --git a/Makefile b/Makefile
@@ -5,12 +5,12 @@ WORKING_LOCATION := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 TARGET = ControlConfig
 CONFIGURATION = Release
 SDK = iphoneos
-
+XCPRETTY = $(shell command -v xcpretty 2> /dev/null)
 build:
 	echo "Building $(TARGET) for $(SDK)..."
-#	xcodebuild -project $(PROJECT) -scheme $(TARGET) -configuration $(CONFIGURATION) -sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO SYMROOT=$(PWD)/build clean 
-#	xcodebuild -project $(PROJECT) -scheme $(TARGET) -configuration $(CONFIGURATION) -sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO SYMROOT=$(PWD)/build -resolvePackageDependencies 
-	xcodebuild -project $(PROJECT) -scheme $(TARGET) -configuration $(CONFIGURATION) -sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO SYMROOT=$(PWD)/build build 
+
+	time xcodebuild -project $(PROJECT) -scheme $(TARGET) -configuration $(CONFIGURATION) -sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO SYMROOT=$(PWD)/build clean build | $(XCPRETTY) -c
+# xcodebuild -project $(PROJECT) -scheme $(TARGET) -configuration $(CONFIGURATION) -sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO SYMROOT=$(PWD)/build build 
 	echo "Build finished!"
 
 entitlements: