diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index a9e8303c..ef1ce9e6 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ BF8CAE452489E772004D6CCE /* AnisetteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8CAE422489E772004D6CCE /* AnisetteDataManager.swift */; }; BF8CAE462489E772004D6CCE /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8CAE432489E772004D6CCE /* AppManager.swift */; }; BF8CAE472489E772004D6CCE /* DaemonRequestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8CAE442489E772004D6CCE /* DaemonRequestHandler.swift */; }; - BF8CAE4C2489F637004D6CCE /* AltDaemon.deb in Resources */ = {isa = PBXBuildFile; fileRef = BF8CAE4A2489F5A0004D6CCE /* AltDaemon.deb */; }; BF8CAE4E248AEABA004D6CCE /* UIDevice+Jailbreak.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8CAE4D248AEABA004D6CCE /* UIDevice+Jailbreak.swift */; }; BF8F69C222E659F700049BA1 /* AppContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8F69C122E659F700049BA1 /* AppContentViewController.swift */; }; BF8F69C422E662D300049BA1 /* AppViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8F69C322E662D300049BA1 /* AppViewController.swift */; }; @@ -638,7 +637,6 @@ BF8CAE422489E772004D6CCE /* AnisetteDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnisetteDataManager.swift; sourceTree = ""; }; BF8CAE432489E772004D6CCE /* AppManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; BF8CAE442489E772004D6CCE /* DaemonRequestHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DaemonRequestHandler.swift; sourceTree = ""; }; - BF8CAE4A2489F5A0004D6CCE /* AltDaemon.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = AltDaemon.deb; sourceTree = ""; }; BF8CAE4D248AEABA004D6CCE /* UIDevice+Jailbreak.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+Jailbreak.swift"; sourceTree = ""; }; BF8F69C122E659F700049BA1 /* AppContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppContentViewController.swift; sourceTree = ""; }; BF8F69C322E662D300049BA1 /* AppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppViewController.swift; sourceTree = ""; }; @@ -1484,7 +1482,6 @@ BFB1169C22932DB100BB457C /* apps.json */, BFD247762284B9A700981D42 /* Assets.xcassets */, BF770E6822BD57DD002A40FE /* Silence.m4a */, - BF8CAE4A2489F5A0004D6CCE /* AltDaemon.deb */, ); path = Resources; sourceTree = ""; @@ -1982,7 +1979,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - BF8CAE4C2489F637004D6CCE /* AltDaemon.deb in Resources */, BFC57A702416FC7600EB891E /* InstalledAppsCollectionHeaderView.xib in Resources */, BFB4323F22DE852000B7F8BC /* UpdateCollectionViewCell.xib in Resources */, BFE60738231ADF49002B0E8E /* Settings.storyboard in Resources */, diff --git a/AltStore/Resources/AltDaemon.deb b/AltStore/Resources/AltDaemon.deb deleted file mode 100644 index 931bfd93..00000000 Binary files a/AltStore/Resources/AltDaemon.deb and /dev/null differ diff --git a/AltStore/Settings/Settings.storyboard b/AltStore/Settings/Settings.storyboard index d215b64a..111f772b 100644 --- a/AltStore/Settings/Settings.storyboard +++ b/AltStore/Settings/Settings.storyboard @@ -1,9 +1,9 @@ - + - + @@ -265,36 +265,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AltStore/Settings/SettingsViewController.swift b/AltStore/Settings/SettingsViewController.swift index 524eabca..accc7c4d 100644 --- a/AltStore/Settings/SettingsViewController.swift +++ b/AltStore/Settings/SettingsViewController.swift @@ -22,7 +22,6 @@ extension SettingsViewController case account case patreon case appRefresh - case jailbreak case instructions case credits case debug @@ -192,16 +191,6 @@ private extension SettingsViewController settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("Enable Background Refresh to automatically refresh apps in the background when connected to the same WiFi as AltServer.", comment: "") } - case .jailbreak: - if isHeader - { - settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("JAILBREAK", comment: "") - } - else - { - settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("AltDaemon allows AltStore to install and refresh apps without a computer. You can install AltDaemon using Filza or another file manager.", comment: "") - } - case .instructions: break @@ -367,7 +356,6 @@ extension SettingsViewController case .signIn: return (self.activeTeam == nil) ? 1 : 0 case .account: return (self.activeTeam == nil) ? 0 : 3 case .appRefresh: return AppRefreshRow.allCases.count - case .jailbreak: return UIDevice.current.isJailbroken ? 1 : 0 default: return super.tableView(tableView, numberOfRowsInSection: section.rawValue) } } @@ -395,9 +383,7 @@ extension SettingsViewController { case .signIn where self.activeTeam != nil: return nil case .account where self.activeTeam == nil: return nil - case .jailbreak where !UIDevice.current.isJailbroken: return nil - - case .signIn, .account, .patreon, .appRefresh, .jailbreak, .credits, .debug: + case .signIn, .account, .patreon, .appRefresh, .credits, .debug: let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView self.prepare(headerView, for: section, isHeader: true) return headerView @@ -412,9 +398,7 @@ extension SettingsViewController switch section { case .signIn where self.activeTeam != nil: return nil - case .jailbreak where !UIDevice.current.isJailbroken: return nil - - case .signIn, .patreon, .appRefresh, .jailbreak: + case .signIn, .patreon, .appRefresh: let footerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView self.prepare(footerView, for: section, isHeader: false) return footerView @@ -430,9 +414,7 @@ extension SettingsViewController { case .signIn where self.activeTeam != nil: return 1.0 case .account where self.activeTeam == nil: return 1.0 - case .jailbreak where !UIDevice.current.isJailbroken: return 1.0 - - case .signIn, .account, .patreon, .appRefresh, .jailbreak, .credits, .debug: + case .signIn, .account, .patreon, .appRefresh, .credits, .debug: let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: true) return height @@ -446,10 +428,8 @@ extension SettingsViewController switch section { case .signIn where self.activeTeam != nil: return 1.0 - case .account where self.activeTeam == nil: return 1.0 - case .jailbreak where !UIDevice.current.isJailbroken: return 1.0 - - case .signIn, .patreon, .appRefresh, .jailbreak: + case .account where self.activeTeam == nil: return 1.0 + case .signIn, .patreon, .appRefresh: let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: false) return height @@ -477,14 +457,6 @@ extension SettingsViewController self.addRefreshAppsShortcut() } - case .jailbreak: - let fileURL = Bundle.main.url(forResource: "AltDaemon", withExtension: "deb")! - - let activityViewController = UIActivityViewController(activityItems: [fileURL], applicationActivities: nil) - self.present(activityViewController, animated: true, completion: nil) - - tableView.deselectRow(at: indexPath, animated: true) - case .credits: let row = CreditsRow.allCases[indexPath.row] switch row