neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-04-04 17:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

More attempts at fixing app limit issues

Browse Source
This commit is contained in:
ny
2024-10-24 00:41:29 -04:00
parent 1e969a0888
commit e5febcdc6c
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltStore/Managing Apps/AppManager.swift
View File

@@ -240,7 +240,7 @@ extension AppManager
func deactivateApps(for app: ALTApplication, presentingViewController: UIViewController, completion: @escaping (Result<Void, Error>) -> Void) func deactivateApps(for app: ALTApplication, presentingViewController: UIViewController, completion: @escaping (Result<Void, Error>) -> Void)
{ {
guard let activeAppsLimit = UserDefaults.standard.activeAppsLimit else { return completion(.success(())) } guard !UserDefaults.standard.isAppLimitDisabled, let activeAppsLimit = UserDefaults.standard.activeAppsLimit else { return completion(.success(())) }
DispatchQueue.main.async { DispatchQueue.main.async {
let activeApps = InstalledApp.fetchActiveApps(in: DatabaseManager.shared.viewContext) let activeApps = InstalledApp.fetchActiveApps(in: DatabaseManager.shared.viewContext)

7
AltStore/My Apps/MyAppsViewController.swift
View File

@@ -994,7 +994,7 @@ private extension MyAppsViewController
} }
} }
if UserDefaults.standard.activeAppsLimit != nil, #available(iOS 13, *) if !UserDefaults.standard.isAppLimitDisabled && UserDefaults.standard.activeAppsLimit != nil, #available(iOS 13, *)
{ {
// UserDefaults.standard.activeAppsLimit is only non-nil on iOS 13.3.1 or later, so the #available check is just so we can use Combine. // UserDefaults.standard.activeAppsLimit is only non-nil on iOS 13.3.1 or later, so the #available check is just so we can use Combine.
@@ -1354,7 +1354,7 @@ extension MyAppsViewController
headerView.layoutMargins.left = self.view.layoutMargins.left headerView.layoutMargins.left = self.view.layoutMargins.left
headerView.layoutMargins.right = self.view.layoutMargins.right headerView.layoutMargins.right = self.view.layoutMargins.right
if UserDefaults.standard.activeAppsLimit == nil if UserDefaults.standard.activeAppsLimit == nil || UserDefaults.standard.isAppLimitDisabled
{ {
headerView.textLabel.text = NSLocalizedString("Installed", comment: "") headerView.textLabel.text = NSLocalizedString("Installed", comment: "")
} }
@@ -1753,7 +1753,7 @@ extension MyAppsViewController: UICollectionViewDragDelegate
return [] return []
case .activeApps, .inactiveApps: case .activeApps, .inactiveApps:
guard UserDefaults.standard.activeAppsLimit != nil else { return [] } guard UserDefaults.standard.activeAppsLimit != nil && !UserDefaults.standard.isAppLimitDisabled else { return [] }
guard let cell = collectionView.cellForItem(at: indexPath as IndexPath) as? InstalledAppCollectionViewCell else { return [] } guard let cell = collectionView.cellForItem(at: indexPath as IndexPath) as? InstalledAppCollectionViewCell else { return [] }
let item = self.dataSource.item(at: indexPath) let item = self.dataSource.item(at: indexPath)
@@ -1808,6 +1808,7 @@ extension MyAppsViewController: UICollectionViewDropDelegate
func collectionView(_ collectionView: UICollectionView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal func collectionView(_ collectionView: UICollectionView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal
{ {
guard guard
!UserDefaults.standard.isAppLimitDisabled,
let activeAppsLimit = UserDefaults.standard.activeAppsLimit, let activeAppsLimit = UserDefaults.standard.activeAppsLimit,
let installedApp = session.items.first?.localObject as? InstalledApp let installedApp = session.items.first?.localObject as? InstalledApp
else { return UICollectionViewDropProposal(operation: .cancel) } else { return UICollectionViewDropProposal(operation: .cancel) }

2
AltStore/Settings/SettingsViewController.swift
View File

@@ -325,8 +325,6 @@ private extension SettingsViewController
@IBAction func toggleDisableAppLimit(_ sender: UISwitch) { @IBAction func toggleDisableAppLimit(_ sender: UISwitch) {
UserDefaults.standard.isAppLimitDisabled = sender.isOn UserDefaults.standard.isAppLimitDisabled = sender.isOn
UserDefaults.standard.activeAppsLimit = sender.isOn ? 10 : ALTActiveAppsLimit
UserDefaults.standard.activeAppLimitIncludesExtensions = !sender.isOn
} }
@IBAction func toggleIsBackgroundRefreshEnabled(_ sender: UISwitch) @IBAction func toggleIsBackgroundRefreshEnabled(_ sender: UISwitch)