neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase issues

Browse Source
This commit is contained in:
Fabian Thies
2023-05-20 20:05:36 +02:00
parent f6252c3a8b
commit 38a1c7eef6
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AltStore/Views/Onboarding/OnboardingStepView.swift
View File

@@ -60,9 +60,6 @@ struct OnboardingStepView<Title: View, Hero: View, Content: View, Action: View>:
} }
struct OnboardingStepView_Previews: PreviewProvider { struct OnboardingStepView_Previews: PreviewProvider {
@State
static var isWireGuardAppStorePageVisible = false
static var previews: some View { static var previews: some View {
OnboardingStepView(title: { OnboardingStepView(title: {
VStack(alignment: .leading) { VStack(alignment: .leading) {

27
AltStore/Views/Onboarding/OnboardingView.swift
View File

@@ -298,24 +298,17 @@ extension OnboardingView {
} }
func start_minimuxer_threads(_ pairing_file: String) { func start_minimuxer_threads(_ pairing_file: String) {
set_usbmuxd_socket() target_minimuxer_address()
#if false // Retries let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
var res = start_minimuxer(pairing_file: pairing_file) do {
var attempts = 10 try start(pairing_file, documentsDirectory)
while (attempts != 0 && res != 0) { } catch {
print("start_minimuxer `res` != 0, retry #\(attempts)") try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)"))
res = start_minimuxer(pairing_file: pairing_file) NotificationManager.shared.reportError(error: error)
attempts -= 1 debugPrint("minimuxer failed to start, please restart SideStore.", error)
// displayError("minimuxer failed to start, please restart SideStore. \((error as? LocalizedError)?.failureReason ?? "UNKNOWN ERROR!!!!!! REPORT TO GITHUB ISSUES!")")
} }
#else start_auto_mounter(documentsDirectory)
let res = start_minimuxer(pairing_file: pairing_file)
#endif
if res != 0 {
// TODO: Show error message
debugPrint("minimuxer failed to start. Incorrect arguments were passed.")
// displayError("minimuxer failed to start. Incorrect arguments were passed.")
}
auto_mount_dev_image()
} }
} }