From da949ec85f25a7c1523a03223899f74bbf65420c Mon Sep 17 00:00:00 2001
From: Magesh K <47920326+mahee96@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:51:59 +0530
Subject: [PATCH] [settings]: restore missing rows (anisette etc) from rebase
under "debug" section
---
AltStore/Settings/Settings.storyboard | 289 ++++++++++++++----
.../Settings/SettingsViewController.swift | 62 ++--
2 files changed, 256 insertions(+), 95 deletions(-)
diff --git a/AltStore/Settings/Settings.storyboard b/AltStore/Settings/Settings.storyboard
index b8c91aac..2b7e5f6a 100644
--- a/AltStore/Settings/Settings.storyboard
+++ b/AltStore/Settings/Settings.storyboard
@@ -15,13 +15,13 @@
-
+
-
+
-
+
+
+
+
@@ -130,10 +133,14 @@
+
+
+
+
-
+
@@ -164,8 +171,10 @@
+
+
-
+
@@ -196,8 +205,10 @@
+
+
-
+
@@ -230,10 +241,14 @@
+
+
+
+
-
+
@@ -270,10 +285,14 @@
+
+
+
+
-
+
@@ -304,13 +323,21 @@
+
+
+
+
+
+
+
+
-
+
@@ -345,8 +372,10 @@
+
+
-
+
@@ -381,8 +410,10 @@
+
+
-
+
@@ -409,8 +440,10 @@
+
+
-
+
@@ -445,12 +478,16 @@
+
+
+
+
-
+
@@ -487,10 +524,13 @@
+
+
+
-
+
@@ -525,8 +565,10 @@
+
+
-
+
@@ -555,10 +597,13 @@
+
+
+
-
+
@@ -601,8 +646,10 @@
+
+
-
+
@@ -645,8 +692,10 @@
+
+
-
+
@@ -689,8 +738,10 @@
+
+
-
+
@@ -727,50 +778,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
@@ -802,8 +816,10 @@
+
+
-
+
@@ -838,8 +854,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+¬
+
-
+
@@ -876,6 +999,7 @@
+
@@ -883,7 +1007,7 @@
-
+
@@ -903,6 +1027,7 @@
+
@@ -934,6 +1059,7 @@
+
@@ -1003,6 +1129,7 @@
+
@@ -1115,6 +1242,34 @@ Settings by i cons from the Noun Project
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1168,6 +1323,7 @@ Settings by i cons from the Noun Project
+
@@ -1176,6 +1332,7 @@ Settings by i cons from the Noun Project
+
@@ -1311,6 +1468,7 @@ Settings by i cons from the Noun Project
+
@@ -1352,6 +1510,7 @@ Settings by i cons from the Noun Project
+
@@ -1371,6 +1530,8 @@ Settings by i cons from the Noun Project
+
+
diff --git a/AltStore/Settings/SettingsViewController.swift b/AltStore/Settings/SettingsViewController.swift
index 75fc1492..37df21f4 100644
--- a/AltStore/Settings/SettingsViewController.swift
+++ b/AltStore/Settings/SettingsViewController.swift
@@ -27,8 +27,8 @@ extension SettingsViewController
case instructions
case techyThings
case credits
- case macDirtyCow
case debug
+ // case macDirtyCow
}
fileprivate enum AppRefreshRow: Int, CaseIterable
@@ -40,7 +40,7 @@ extension SettingsViewController
case disableAppLimit
static var allCases: [AppRefreshRow] {
- var c: [AppRefreshRow] = [.backgroundRefresh, .noIdleTimeout]
+ var c: [AppRefreshRow] = [.backgroundRefresh, .noIdleTimeout, .addToSiri]
guard #available(iOS 14, *) else { return c }
c.append(.addToSiri)
@@ -68,9 +68,7 @@ extension SettingsViewController
{
case sendFeedback
case refreshAttempts
- case errorLog
case refreshSideJITServer
- case clearCache
case resetPairingFile
case anisetteServers
case advancedSettings
@@ -126,12 +124,12 @@ final class SettingsViewController: UITableViewController
self.prototypeHeaderFooterView = nib.instantiate(withOwner: nil, options: nil)[0] as? SettingsHeaderFooterView
self.tableView.register(nib, forHeaderFooterViewReuseIdentifier: "HeaderFooterView")
-
- let debugModeGestureRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(SettingsViewController.handleDebugModeGesture(_:)))
- debugModeGestureRecognizer.delegate = self
- debugModeGestureRecognizer.direction = .up
- debugModeGestureRecognizer.numberOfTouchesRequired = 3
- self.tableView.addGestureRecognizer(debugModeGestureRecognizer)
+
+ let debugModeGestureRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(SettingsViewController.handleDebugModeGesture(_:)))
+ debugModeGestureRecognizer.delegate = self
+ debugModeGestureRecognizer.direction = .up
+ debugModeGestureRecognizer.numberOfTouchesRequired = 3
+ self.tableView.addGestureRecognizer(debugModeGestureRecognizer)
var versionString: String = ""
if let installedApp = InstalledApp.fetchAltStore(in: DatabaseManager.shared.viewContext)
@@ -329,15 +327,15 @@ private extension SettingsViewController
case .credits:
settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("CREDITS", comment: "")
- case .macDirtyCow:
- if isHeader
- {
- settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("MACDIRTYCOW", comment: "")
- }
- else
- {
- settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("If you've removed the 3-sideloaded app limit via the MacDirtyCow exploit, disable this setting to sideload more than 3 apps at a time.", comment: "")
- }
+ // case .macDirtyCow:
+ // if isHeader
+ // {
+ // settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("MACDIRTYCOW", comment: "")
+ // }
+ // else
+ // {
+ // settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("If you've removed the 3-sideloaded app limit via the MacDirtyCow exploit, disable this setting to sideload more than 3 apps at a time.", comment: "")
+ // }
case .debug:
settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("DEBUG", comment: "")
@@ -360,9 +358,9 @@ private extension SettingsViewController
{
switch section
{
- case .macDirtyCow:
- let isHidden = !(UserDefaults.standard.isCowExploitSupported && UserDefaults.standard.isDebugModeEnabled)
- return isHidden
+ // case .macDirtyCow:
+ // let isHidden = !(UserDefaults.standard.isCowExploitSupported && UserDefaults.standard.isDebugModeEnabled)
+ // return isHidden
default: return false
}
@@ -663,7 +661,8 @@ extension SettingsViewController
case _ where isSectionHidden(section): return nil
case .signIn where self.activeTeam != nil: return nil
case .account where self.activeTeam == nil: return nil
- case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .macDirtyCow, .debug:
+ // case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .macDirtyCow, .debug:
+ case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .debug:
let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView
self.prepare(headerView, for: section, isHeader: true)
return headerView
@@ -679,7 +678,8 @@ extension SettingsViewController
{
case _ where isSectionHidden(section): return nil
case .signIn where self.activeTeam != nil: return nil
- case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
+ // case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
+ case .signIn, .patreon, .display, .appRefresh, .techyThings:
let footerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView
self.prepare(footerView, for: section, isHeader: false)
return footerView
@@ -696,7 +696,8 @@ extension SettingsViewController
case _ where isSectionHidden(section): return 1.0
case .signIn where self.activeTeam != nil: return 1.0
case .account where self.activeTeam == nil: return 1.0
- case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .macDirtyCow, .debug:
+ // case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .macDirtyCow, .debug:
+ case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .debug:
let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: true)
return height
@@ -712,7 +713,8 @@ extension SettingsViewController
case _ where isSectionHidden(section): return 1.0
case .signIn where self.activeTeam != nil: return 1.0
case .account where self.activeTeam == nil: return 1.0
- case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
+ // case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
+ case .signIn, .patreon, .display, .appRefresh, .techyThings:
let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: false)
return height
@@ -911,9 +913,6 @@ extension SettingsViewController
self.present(alertController, animated: true)
self.tableView.deselectRow(at: indexPath, animated: true)
}
-
-
- case .clearCache: self.clearCache()
case .resetPairingFile:
@@ -957,11 +956,12 @@ extension SettingsViewController
} else {
ELOG("UIApplication.openSettingsURLString invalid")
}
- case .refreshAttempts, .errorLog, .responseCaching: break
+ case .refreshAttempts, .responseCaching: break
}
- case .account, .patreon, .display, .instructions, .macDirtyCow: break
+ // case .account, .patreon, .display, .instructions, .macDirtyCow: break
+ case .account, .patreon, .display, .instructions: break
}
}
}