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

Improves ALTServerError.maximumFreeAppLimitReached error message

Browse Source 
AltServer once again displays the list of installed sideloaded apps in error alert.
This commit is contained in:
Riley Testut
2021-10-04 15:21:57 -07:00
parent eac35ef8f4
commit c6b8f69ef2
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AltServer/AppDelegate.swift
View File

@@ -279,6 +279,13 @@ private extension AppDelegate
var messageComponents = [String]()
let separator: String
switch error
{
case ALTServerError.maximumFreeAppLimitReached: separator = "\n\n"
default: separator = " "
}
if let errorFailure = nsError.localizedFailure
{
if let failureReason = nsError.localizedFailureReason
@@ -322,7 +329,7 @@ private extension AppDelegate
messageComponents.append(recoverySuggestion)
}
let informativeText = messageComponents.joined(separator: " ")
let informativeText = messageComponents.joined(separator: separator)
alert.informativeText = informativeText
NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)

9
AltServer/Devices/ALTDeviceManager.mm
View File

@@ -1597,15 +1597,18 @@ void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *uuid)
void (^completionHandler)(NSError *) = ALTDeviceManager.sharedManager.installationCompletionHandlers[UUID];
if (completionHandler != nil)
{
NSString *localizedDescription = @(description ?: "");
if (code != 0 || name != NULL)
{
NSLog(@"Error installing app. %@ (%@). %@", @(code), @(name ?: ""), @(description ?: ""));
NSLog(@"Error installing app. %@ (%@). %@", @(code), @(name ?: ""), localizedDescription);
NSError *error = nil;
if (code == 3892346913)
{
error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorMaximumFreeAppLimitReached userInfo:nil];
NSDictionary *userInfo = (localizedDescription.length != 0) ? @{NSLocalizedDescriptionKey: localizedDescription} : nil;
error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorMaximumFreeAppLimitReached userInfo:userInfo];
}
else
{
@@ -1616,7 +1619,7 @@ void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *uuid)
}
else
{
NSError *underlyingError = [NSError errorWithDomain:AltServerInstallationErrorDomain code:code userInfo:@{NSLocalizedDescriptionKey: @(description ?: "")}];
NSError *underlyingError = [NSError errorWithDomain:AltServerInstallationErrorDomain code:code userInfo:@{NSLocalizedDescriptionKey: localizedDescription}];
error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorInstallationFailed userInfo:@{NSUnderlyingErrorKey: underlyingError}];
}
}