mirror of
https://github.com/SideStore/SideStore.git
synced 2026-04-03 01:05:39 +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
|
alert.addAction(UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default, handler: { _ in
|
||||||
print("Going home")
|
print("Going home")
|
||||||
// Cell Shortcut
|
// Cell Shortcut
|
||||||
|
if self.context.shouldTurnOffData {
|
||||||
DispatchQueue.main.async{
|
UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
||||||
// UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
print("Cell OFF Shortcut finished execution.")}
|
||||||
// print("Cell OFF Shortcut finished execution.")
|
|
||||||
// }
|
|
||||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
|
||||||
}
|
}
|
||||||
|
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||||
}))
|
}))
|
||||||
|
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
@@ -236,14 +234,11 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DispatchQueue.main.async {
|
|
||||||
// Cell Shortcut
|
// Cell Shortcut
|
||||||
// UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
|
if self.context.shouldTurnOffData {
|
||||||
// print("Cell OFF Shortcut finished execution.")
|
UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in print("Cell OFF Shortcut finished execution.")}
|
||||||
// }
|
|
||||||
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
|
||||||
}
|
}
|
||||||
|
UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -123,6 +123,8 @@ class InstallAppOperationContext: AppOperationContext
|
|||||||
|
|
||||||
var alternateIconURL: URL?
|
var alternateIconURL: URL?
|
||||||
|
|
||||||
|
var shouldTurnOffData: Bool = false
|
||||||
|
|
||||||
// Non-nil when installing from a source.
|
// Non-nil when installing from a source.
|
||||||
@AsyncManaged
|
@AsyncManaged
|
||||||
var appVersion: AppVersion?
|
var appVersion: AppVersion?
|
||||||
|
|||||||
@@ -8,8 +8,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import Network
|
import Network
|
||||||
import AltStoreCore
|
import AltStoreCore
|
||||||
import Minimuxer
|
|
||||||
|
|
||||||
|
|
||||||
@objc(SendAppOperation)
|
@objc(SendAppOperation)
|
||||||
final class SendAppOperation: ResultOperation<()>
|
final class SendAppOperation: ResultOperation<()>
|
||||||
@@ -44,15 +42,28 @@ final class SendAppOperation: ResultOperation<()>
|
|||||||
let fileURL = InstalledApp.refreshedIPAURL(for: app)
|
let fileURL = InstalledApp.refreshedIPAURL(for: app)
|
||||||
print("AFC App `fileURL`: \(fileURL.absoluteString)")
|
print("AFC App `fileURL`: \(fileURL.absoluteString)")
|
||||||
|
|
||||||
|
// 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
|
// Wait for Shortcut to Finish Before Proceeding
|
||||||
DispatchQueue.main.async {
|
UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
|
||||||
// UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
|
print("Shortcut finished execution. Proceeding with file transfer.")
|
||||||
// print("Shortcut finished execution. Proceeding with file transfer.")
|
|
||||||
|
|
||||||
DispatchQueue.global().async {
|
DispatchQueue.global().async {
|
||||||
self.processFile(at: fileURL, for: app.bundleIdentifier)
|
self.processFile(at: fileURL, for: app.bundleIdentifier)
|
||||||
}
|
}
|
||||||
// }
|
}
|
||||||
|
} else {
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
self.processFile(at: fileURL, for: app.bundleIdentifier)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
1
AltStore/Resources/AltBackup.ipa
Symbolic link
1
AltStore/Resources/AltBackup.ipa
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../build/AltBackup.ipa
|
||||||
3
Makefile
3
Makefile
@@ -374,8 +374,7 @@ ipa-altbackup: checkPaths copy-altbackup
|
|||||||
@echo " Copying from $(ALT_APP_SRC) into $(ALT_APP_PAYLOAD_DST)"
|
@echo " Copying from $(ALT_APP_SRC) into $(ALT_APP_PAYLOAD_DST)"
|
||||||
@cp -R -f "$(ALT_APP_SRC)/." "$(ALT_APP_PAYLOAD_DST)/$(TARGET_NAME)"
|
@cp -R -f "$(ALT_APP_SRC)/." "$(ALT_APP_PAYLOAD_DST)/$(TARGET_NAME)"
|
||||||
@pushd "$(ALT_APP_DST_ARCHIVE)" && zip -r "../../$(ALT_APP_IPA_DST)" Payload || popd
|
@pushd "$(ALT_APP_DST_ARCHIVE)" && zip -r "../../$(ALT_APP_IPA_DST)" Payload || popd
|
||||||
@cp -f "$(ALT_APP_IPA_DST)" AltStore/Resources
|
@echo " IPA created: build/AltBackup.ipa"
|
||||||
@echo " IPA created: AltStore/Resources/AltBackup.ipa"
|
|
||||||
|
|
||||||
clean-altbackup:
|
clean-altbackup:
|
||||||
@echo ""
|
@echo ""
|
||||||
|
|||||||
@@ -75,6 +75,10 @@
|
|||||||
{
|
{
|
||||||
"identifier": "thatstel.la.altsource",
|
"identifier": "thatstel.la.altsource",
|
||||||
"sourceURL": "https://alt.thatstel.la/"
|
"sourceURL": "https://alt.thatstel.la/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identifier": "com.deliacheminot.mona",
|
||||||
|
"sourceURL": "https://raw.githubusercontent.com/delia-cheminot/mona-hrt/refs/heads/main/ios_source.json"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"sources": [
|
"sources": [
|
||||||
@@ -148,6 +152,10 @@
|
|||||||
{
|
{
|
||||||
"identifier": "thatstel.la.altsource",
|
"identifier": "thatstel.la.altsource",
|
||||||
"sourceURL": "https://alt.thatstel.la/"
|
"sourceURL": "https://alt.thatstel.la/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identifier": "com.deliacheminot.mona",
|
||||||
|
"sourceURL": "https://raw.githubusercontent.com/delia-cheminot/mona-hrt/refs/heads/main/ios_source.json"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user