Merge pull request #262 from hxhlb/main

Fix MobileGestalt duplicate section and unsafe VFS fallback

Author: rooootdev

lara/classes/laramgr.swift

@@ -351,7 +351,7 @@ final class laramgr: ObservableObject {
     }
 
     @discardableResult
-    func lara_overwritefile(target: String, source: String) -> (ok: Bool, message: String) {
+    func lara_overwritefile(target: String, source: String, fallback_vfs: Bool = true) -> (ok: Bool, message: String) {
         guard FileManager.default.fileExists(atPath: source) else {
             return (false, "source file not found: \(source)")
         }
@@ -371,6 +371,10 @@ final class laramgr: ObservableObject {
         if result.ok {
             return result
         }
+
+        guard fallback_vfs else {
+            return result
+        }
 
         guard vfsready else {
             return (false, result.message + " | vfs not ready")
@@ -381,11 +385,15 @@ final class laramgr: ObservableObject {
     }
 
     @discardableResult
-    func lara_overwritefile(target: String, data: Data) -> (ok: Bool, message: String) {
+    func lara_overwritefile(target: String, data: Data, fallback_vfs: Bool = true) -> (ok: Bool, message: String) {
         let result = sbxready ? sbxoverwrite(path: target, data: data) : (false, "sbx not ready")
         if result.0 {
             return result
         }
+
+        guard fallback_vfs else {
+            return result
+        }
 
         guard vfsready else {
             return (false, result.1 + ", vfs not ready")

lara/views/tweaks/mobilegestalt/GestaltView.swift

@@ -287,56 +287,7 @@ struct GestaltView: View {
                 } header: {
                     HeaderLabel(text: "SpringBoard", icon: "gear")
                 }
-                
-                Section {
-                    PlainToggle(
-                        text: "Disable Lock After Respring",
-                        icon: "lock.open",
-                        isOn: nuggetbinding(
-                            "SBDontLockAfterCrash",
-                            path: fileloc.springboard.rawValue
-                        )
-                    )
-
-                    PlainToggle(
-                        text: "Disable Low Battery Alerts",
-                        icon: "battery.25",
-                        isOn: nuggetbinding(
-                            "SBHideLowPowerAlerts",
-                            path: fileloc.springboard.rawValue
-                        )
-                    )
-
-                    PlainToggle(
-                        text: "Show Dynamic Island in Screenshots",
-                        icon: "camera",
-                        isOn: nuggetbinding(
-                            "SBAlwaysShowSystemApertureInSnapshots",
-                            path: fileloc.springboard.rawValue
-                        )
-                    )
-
-                    PlainToggle(
-                        text: "Play Sound on Paste",
-                        icon: "speaker.wave.2",
-                        isOn: nuggetbinding(
-                            "PlaySoundOnPaste",
-                            path: fileloc.pasteboard.rawValue
-                        )
-                    )
 
-                    PlainToggle(
-                        text: "System Paste Notifications",
-                        icon: "doc.on.clipboard",
-                        isOn: nuggetbinding(
-                            "AnnounceAllPastes",
-                            path: fileloc.pasteboard.rawValue
-                        )
-                    )
-                } header: {
-                    HeaderLabel(text: "Internal", icon: "ant")
-                }
-                
                 Section {
                     PlainToggle(
                         text: "Metal HUD Debug",
@@ -482,7 +433,7 @@ struct GestaltView: View {
 
             // bro please dont bootloop
             let mgData = try verifyPlist(mgCurrentDict, targetPath: mgCurrentPath)
-            let result = mgr.lara_overwritefile(target: mgCurrentPath, data: mgData)
+            let result = mgr.lara_overwritefile(target: mgCurrentPath, data: mgData, fallback_vfs: false)
 
             if result.ok {
                 Alertinator.shared.alert(title: "Successfully applied MobileGestalt!", body: "Respring to see any changes", actionLabel: "Respring", action: { mgr.respring() })