mirror of
https://github.com/SideStore/SideStore.git
synced 2026-04-03 17:25:40 +02:00
Merge branch 'develop' into merges
# Conflicts: # AltStore.xcodeproj/project.pbxproj # AltStore/Operations/InstallAppOperation.swift # AltStore/Operations/SendAppOperation.swift # Dependencies/minimuxer # SideStore/MinimuxerWrapper.swift
This commit is contained in:
@@ -214,13 +214,11 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
|
||||
alert.addAction(UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default, handler: { _ in
|
||||
print("Going home")
|
||||
// Cell Shortcut
|
||||
|
||||
DispatchQueue.main.async{
|
||||
// UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
||||
// print("Cell OFF Shortcut finished execution.")
|
||||
// }
|
||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||
if self.context.shouldTurnOffData {
|
||||
UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
||||
print("Cell OFF Shortcut finished execution.")}
|
||||
}
|
||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||
}))
|
||||
|
||||
DispatchQueue.main.async {
|
||||
@@ -236,14 +234,11 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DispatchQueue.main.async {
|
||||
// Cell Shortcut
|
||||
// UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
||||
// print("Cell OFF Shortcut finished execution.")
|
||||
// }
|
||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||
// Cell Shortcut
|
||||
if self.context.shouldTurnOffData {
|
||||
UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in print("Cell OFF Shortcut finished execution.")}
|
||||
}
|
||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -123,6 +123,8 @@ class InstallAppOperationContext: AppOperationContext
|
||||
|
||||
var alternateIconURL: URL?
|
||||
|
||||
var shouldTurnOffData: Bool = false
|
||||
|
||||
// Non-nil when installing from a source.
|
||||
@AsyncManaged
|
||||
var appVersion: AppVersion?
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
import Foundation
|
||||
import Network
|
||||
import AltStoreCore
|
||||
import Minimuxer
|
||||
|
||||
|
||||
@objc(SendAppOperation)
|
||||
final class SendAppOperation: ResultOperation<()>
|
||||
@@ -44,15 +42,28 @@ final class SendAppOperation: ResultOperation<()>
|
||||
let fileURL = InstalledApp.refreshedIPAURL(for: app)
|
||||
print("AFC App `fileURL`: \(fileURL.absoluteString)")
|
||||
|
||||
// Wait for Shortcut to Finish Before Proceeding
|
||||
DispatchQueue.main.async {
|
||||
// UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
|
||||
// print("Shortcut finished execution. Proceeding with file transfer.")
|
||||
// only when minimuxer is not ready and below 26.4 should we turn off data
|
||||
if #available(iOS 26.4, *) {
|
||||
context.shouldTurnOffData = false
|
||||
} else if !isMinimuxerReady {
|
||||
context.shouldTurnOffData = true
|
||||
} else {
|
||||
context.shouldTurnOffData = false
|
||||
}
|
||||
|
||||
if context.shouldTurnOffData {
|
||||
// Wait for Shortcut to Finish Before Proceeding
|
||||
UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
|
||||
print("Shortcut finished execution. Proceeding with file transfer.")
|
||||
|
||||
DispatchQueue.global().async {
|
||||
self.processFile(at: fileURL, for: app.bundleIdentifier)
|
||||
}
|
||||
// }
|
||||
}
|
||||
} else {
|
||||
DispatchQueue.global().async {
|
||||
self.processFile(at: fileURL, for: app.bundleIdentifier)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user