neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-20 12:13:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AltServer] Fixes enabling JIT on iOS 15 beta 2

Browse Source 
vAttachName sporadically fails on iOS 15 beta 2, so we now use vAttachOrWait and manually detect whether the app is already running or not.
This commit is contained in:
Riley Testut
2021-07-07 13:54:41 -07:00
parent d4b957db23
commit 7d93c64b5b
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
AltServer/Connections/ALTDebugConnection.mm
View File

@@ -116,7 +116,7 @@ char *bin2hex(const unsigned char *bin, size_t length)
if (processName) if (processName)
{ {
NSString *encodedName = @(bin2hex((const unsigned char *)processName.UTF8String, (size_t)strlen(processName.UTF8String))); NSString *encodedName = @(bin2hex((const unsigned char *)processName.UTF8String, (size_t)strlen(processName.UTF8String)));
attachCommand = [NSString stringWithFormat:@"vAttachName;%@", encodedName]; attachCommand = [NSString stringWithFormat:@"vAttachOrWait;%@", encodedName];
} }
else else
{ {
@@ -189,8 +189,9 @@ char *bin2hex(const unsigned char *bin, size_t length)
return NO; return NO;
} }
if (![self processResponse:@(response) error:error]) NSString *rawResponse = (response != nil) ? @(response) : nil;
if (![self processResponse:rawResponse error:error])
{ {
return NO; return NO;
} }
@@ -200,6 +201,15 @@ char *bin2hex(const unsigned char *bin, size_t length)
- (BOOL)processResponse:(NSString *)rawResponse error:(NSError **)error - (BOOL)processResponse:(NSString *)rawResponse error:(NSError **)error
{ {
if (rawResponse == nil)
{
if (error)
{
*error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorRequestedAppNotRunning userInfo:nil];
return NO;
}
}
if (rawResponse.length == 0 || [rawResponse isEqualToString:@"OK"]) if (rawResponse.length == 0 || [rawResponse isEqualToString:@"OK"])
{ {
return YES; return YES;
@@ -232,6 +242,33 @@ char *bin2hex(const unsigned char *bin, size_t length)
// Thread Information // Thread Information
NSLog(@"Thread stopped. Details:\n%s", response.UTF8String + 1); NSLog(@"Thread stopped. Details:\n%s", response.UTF8String + 1);
// Parse thread state to determine if app is running.
NSArray<NSString *> *components = [response componentsSeparatedByString:@";"];
if (components.count <= 1)
{
if (error)
{
*error = [NSError errorWithDomain:AltServerConnectionErrorDomain code:ALTServerConnectionErrorUnknown userInfo:@{NSLocalizedFailureReasonErrorKey: response}];
}
return NO;
}
NSString *mainThread = components[1];
NSString *threadState = [[mainThread componentsSeparatedByString:@":"] lastObject];
// If main thread state == 0, app is not running.
if ([threadState longLongValue] == 0)
{
if (error)
{
*error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorRequestedAppNotRunning userInfo:nil];
}
return NO;
}
return YES; return YES;
} }