Enable building for connect branch.

Signed-off-by: Spidy123222 <64176728+Spidy123222@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,6 @@ body:
   - type: markdown
     attributes:
       value: |
-        ## Please note that the issue tracker is not for support
         Thanks for taking the time to fill out this bug report! Before you continue filling out the report, please **[search in GitHub Issues](https://github.com/SideStore/SideStore/issues?q=is%3Aissue+is%3Aopen) for the bug you are experiencing** in case it has already been reported.
         
         **Please use [Discord](https://discord.gg/sidestore-949183273383395328) or [GitHub Discussions](https://github.com/SideStore/SideStore/discussions) for support.**

.github/pull_request_template.md

@@ -10,3 +10,6 @@
 <!-- Example: -->
 - [x] Finish UI changes
 - [ ] Test
+
+<!-- If your PR doesn't close an issue, you can remove the next line. -->
+Closes #1234

.github/workflows/attach_build_products.yml

@@ -20,58 +20,3 @@ jobs:
             format: name
             addTo: pull
             # addTo: pullandissues
-  nightly-link-comment:
-    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          # This snippet is public-domain, taken from
-          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
-          script: |
-            async function upsertComment(owner, repo, issue_number, purpose, body) {
-              const {data: comments} = await github.rest.issues.listComments(
-                {owner, repo, issue_number});
-
-              const marker = `<!-- bot: ${purpose} -->`;
-              body = marker + "\n" + body;
-
-              const existing = comments.filter((c) => c.body.includes(marker));
-              if (existing.length > 0) {
-                const last = existing[existing.length - 1];
-                core.info(`Updating comment ${last.id}`);
-                await github.rest.issues.updateComment({
-                  owner, repo,
-                  body,
-                  comment_id: last.id,
-                });
-              } else {
-                core.info(`Creating a comment in issue / PR #${issue_number}`);
-                await github.rest.issues.createComment({issue_number, body, owner, repo});
-              }
-            }
-
-            const {owner, repo} = context.repo;
-            const run_id = ${{github.event.workflow_run.id}};
-
-            const pull_requests = ${{ toJSON(github.event.workflow_run.pull_requests) }};
-            if (!pull_requests.length) {
-              return core.error("This workflow doesn't match any pull requests!");
-            }
-
-            const artifacts = await github.paginate(
-              github.rest.actions.listWorkflowRunArtifacts, {owner, repo, run_id});
-            if (!artifacts.length) {
-              return core.error(`No artifacts found`);
-            }
-            let body = `Download the artifacts for this pull request (nightly.link):\n`;
-            for (const art of artifacts) {
-              body += `\n* [${art.name}.zip](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-            }
-
-            core.info("Review thread message body:", body);
-
-            for (const pr of pull_requests) {
-              await upsertComment(owner, repo, pr.number,
-                "nightly-link", body);
-            }

.github/workflows/beta.yml

@@ -11,13 +11,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 'macos-14'
-            version: '15.4'
+          - os: 'macos-12'
+            version: '14.2'
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
@@ -35,17 +35,10 @@ jobs:
         run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: maxim-lobanov/setup-xcode@v1.4.1
         with:
           xcode-version: ${{ matrix.version }}
 
-      
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata
-
       - name: Build SideStore
         run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
@@ -91,13 +84,13 @@ jobs:
         run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
           path: ./*.dSYM/

.github/workflows/nightly.yml

@@ -2,7 +2,7 @@ name: Nightly SideStore build
 on:
   push:
     branches:
-      - develop
+      - connect-develop
 
 jobs:
   build:
@@ -14,24 +14,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 'macos-14'
-            version: '15.4'
+          - os: 'macos-12'
+            version: '14.2'
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Install xcbeautify
-        run: brew install xcbeautify
-
       - name: Cache .nightly-build-num
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: .nightly-build-num
           key: nightly-build-num
@@ -47,21 +44,12 @@ jobs:
         run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.4.1
         with:
           xcode-version: ${{ matrix.version }}
 
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-
-          swiftpm-cache-key: xcode-cache-sourcedata-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-
-
       - name: Build SideStore
-        run: NSUnbufferedIO=YES make build 2>&1 | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
         run: make fakesign
@@ -103,13 +91,16 @@ jobs:
         run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
           path: ./*.dSYM/
+
+      - name: Reset cache for apps.sidestore.io/nightly
+        run: sleep 10 && curl https://apps.sidestore.io/reset-cache/nightly/${{ secrets.SIDESOURCE_KEY }}

.github/workflows/pr.yml

@@ -9,13 +9,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 'macos-14'
-            version: '15.4'
+          - os: 'macos-12'
+            version: '14.2'
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
@@ -35,18 +35,12 @@ jobs:
         run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.4.1
         with:
           xcode-version: ${{ matrix.version }}
 
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-
-
       - name: Build SideStore
-        run: NSUnbufferedIO=YES make build | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
         run: make fakesign
@@ -58,13 +52,13 @@ jobs:
         run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
           path: ./*.dSYM/

.github/workflows/stable.yml

@@ -3,7 +3,6 @@ on:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0
-  workflow_dispatch:
 
 jobs:
   build:
@@ -12,13 +11,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 'macos-14'
-            version: '15.4'
+          - os: 'macos-12'
+            version: '14.2'
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
@@ -36,21 +35,12 @@ jobs:
         run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.4.1
         with:
           xcode-version: ${{ matrix.version }}
 
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-
-          swiftpm-cache-key: xcode-cache-sourcedata-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-
-
       - name: Build SideStore
-        run: NSUnbufferedIO=YES make build | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
         run: make fakesign
@@ -91,13 +81,13 @@ jobs:
         run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
           path: ./*.dSYM/

.gitignore

@@ -19,6 +19,7 @@ archive.xcarchive
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
 ## Other
 *.xccheckout
 *.moved-aside

AltServer/ErrorDetailsViewController.swift

@@ -1,48 +0,0 @@
-//
-//  ErrorDetailsViewController.swift
-//  AltServer
-//
-//  Created by Riley Testut on 10/4/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import AppKit
-
-class ErrorDetailsViewController: NSViewController
-{
-    var error: NSError? {
-        didSet {
-            self.update()
-        }
-    }
-    
-    @IBOutlet private var errorCodeLabel: NSTextField!
-    @IBOutlet private var detailedDescriptionLabel: NSTextField!
-    
-    override func viewDidLoad()
-    {
-        super.viewDidLoad()
-        
-        self.detailedDescriptionLabel.preferredMaxLayoutWidth = 800
-    }
-}
-
-private extension ErrorDetailsViewController
-{
-    func update()
-    {
-        if !self.isViewLoaded
-        {
-            self.loadView()
-        }
-        
-        guard let error = self.error else { return }
-        
-        self.errorCodeLabel.stringValue = error.localizedErrorCode
-        
-        let font = self.detailedDescriptionLabel.font ?? NSFont.systemFont(ofSize: 12)
-        let detailedDescription = error.formattedDetailedDescription(with: font)
-        self.detailedDescriptionLabel.attributedStringValue = detailedDescription
-    }
-}
-

AltStore.xcodeproj/project.pbxproj

@@ -3,14 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		03F06CD52942C27E001C4D68 /* Bundle+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1E314122A05D4C00370A3C /* Bundle+AltStore.swift */; };
-		0E05025A2BEC83C500879B5C /* OperatingSystemVersion+Comparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0502592BEC83C500879B5C /* OperatingSystemVersion+Comparable.swift */; };
-		0E05025C2BEC947000879B5C /* String+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E05025B2BEC947000879B5C /* String+SideStore.swift */; };
-		0E13E5862CC8F55900E9C0DF /* ProcessInfo+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E13E5852CC8F55900E9C0DF /* ProcessInfo+SideStore.swift */; };
 		0E1A1F912AE36A9700364CAD /* bytearray.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E1A1F902AE36A9600364CAD /* bytearray.c */; };
 		0E764E172ADFF5740043DD4E /* AltBackup.ipa in Resources */ = {isa = PBXBuildFile; fileRef = 0E764E162ADFF5740043DD4E /* AltBackup.ipa */; };
 		0EA1665B2ADFE0D2003015C1 /* out-limd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0EA166472ADFE0D1003015C1 /* out-limd.c */; };
@@ -38,20 +35,13 @@
 		0EA1667B2ADFE140003015C1 /* Structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EA1665A2ADFE0D2003015C1 /* Structure.cpp */; };
 		0EA1667D2ADFE140003015C1 /* xplist.c in Sources */ = {isa = PBXBuildFile; fileRef = 0EA166592ADFE0D2003015C1 /* xplist.c */; };
 		0EA1667E2ADFE140003015C1 /* time64.c in Sources */ = {isa = PBXBuildFile; fileRef = 0EA1664C2ADFE0D1003015C1 /* time64.c */; };
-		0EA4263A2C2230150026D7FB /* AnisetteServerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EA426392C2230150026D7FB /* AnisetteServerList.swift */; };
 		0EA4B9BC2AE4A414009209CE /* plist.c in Sources */ = {isa = PBXBuildFile; fileRef = 0EA4B9BB2AE4A3F6009209CE /* plist.c */; };
-		0EE7FDC42BE8BC7900D1E390 /* ALTLocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */; };
-		0EE7FDC62BE8CEA300D1E390 /* ALTLocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */; };
-		0EE7FDC72BE8CF4100D1E390 /* ALTWrappedError.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDC02BE8BC2100D1E390 /* ALTWrappedError.m */; };
-		0EE7FDC82BE8CF4800D1E390 /* ALTWrappedError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EE7FDC22BE8BC4200D1E390 /* ALTWrappedError.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0EE7FDC92BE8D07400D1E390 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C336124197D700034FD24 /* NSError+AltStore.swift */; };
-		0EE7FDCB2BE8D12B00D1E390 /* ALTLocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */; };
-		0EE7FDCD2BE9124400D1E390 /* ErrorDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */; };
 		19104D952909BAEA00C49C7B /* libimobiledevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF45872B2298D31600BD7491 /* libimobiledevice.a */; };
 		19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */; };
 		19104DBC2909C4E500C49C7B /* libEmotionalDamage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */; };
 		191E5FB4290A5DA0001A3B7C /* libminimuxer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 191E5FAB290A5D92001A3B7C /* libminimuxer.a */; };
 		191E5FDC290AFA5C001A3B7C /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 191E5FDB290AFA5C001A3B7C /* OpenSSL */; };
+		1920B04F2924AC8300744F60 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1920B04E2924AC8300744F60 /* Settings.bundle */; };
 		19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; };
 		4879A95F2861046500FC1BBD /* AltSign in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A95E2861046500FC1BBD /* AltSign */; };
 		4879A9622861049C00FC1BBD /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A9612861049C00FC1BBD /* OpenSSL */; };
@@ -60,7 +50,6 @@
 		99F87D0529D8B4E200B40039 /* minimuxer-helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9961EC2D29BE9F2E00AF2C6F /* minimuxer-helpers.swift */; };
 		99F87D1829D8E4C900B40039 /* SwiftBridgeCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99F87D1629D8E4C900B40039 /* SwiftBridgeCore.swift */; };
 		99F87D1929D8E4C900B40039 /* minimuxer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99F87D1729D8E4C900B40039 /* minimuxer.swift */; };
-		A800F7042CE28E3800208744 /* View+AltWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = A800F7032CE28E2F00208744 /* View+AltWidget.swift */; };
 		B3146ED2284F581E00BBC3FD /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3146ECD284F580500BBC3FD /* Roxas.framework */; };
 		B33FFBA8295F8E98002259E6 /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B343F894295F7F9B002B1159 /* libfragmentzip.a */; };
 		B33FFBAA295F8F78002259E6 /* preboard.c in Sources */ = {isa = PBXBuildFile; fileRef = B33FFBA9295F8F78002259E6 /* preboard.c */; };
@@ -86,7 +75,6 @@
 		B3C395F7284F362400DA9E2F /* AppCenterAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F6284F362400DA9E2F /* AppCenterAnalytics */; };
 		B3C395F9284F362400DA9E2F /* AppCenterCrashes in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F8284F362400DA9E2F /* AppCenterCrashes */; };
 		B3EE16B62925E27D00B3B1F5 /* AnisetteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3EE16B52925E27D00B3B1F5 /* AnisetteManager.swift */; };
-		BD4513AB2C6FA98C0052BCC0 /* AppExtensionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD4513AA2C6FA98C0052BCC0 /* AppExtensionView.swift */; };
 		BF02419622F2199300129732 /* RefreshAttemptsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF02419522F2199300129732 /* RefreshAttemptsViewController.swift */; };
 		BF08858322DE795100DE9F1E /* MyAppsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF08858222DE795100DE9F1E /* MyAppsViewController.swift */; };
 		BF08858522DE7EC800DE9F1E /* UpdateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF08858422DE7EC800DE9F1E /* UpdateCollectionViewCell.swift */; };
@@ -174,6 +162,7 @@
 		BF58048A246A28F9008AE704 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF580488246A28F9008AE704 /* LaunchScreen.storyboard */; };
 		BF580496246A3CB5008AE704 /* UIColor+AltBackup.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF580495246A3CB5008AE704 /* UIColor+AltBackup.swift */; };
 		BF580498246A3D19008AE704 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF580497246A3D19008AE704 /* UIKit.framework */; };
+		BF58049B246A432D008AE704 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C336124197D700034FD24 /* NSError+AltStore.swift */; };
 		BF663C4F2433ED8200DAA738 /* FileManager+DirectorySize.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF663C4E2433ED8200DAA738 /* FileManager+DirectorySize.swift */; };
 		BF66EE822501AE50007EE018 /* AltStoreCore.h in Headers */ = {isa = PBXBuildFile; fileRef = BF66EE802501AE50007EE018 /* AltStoreCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BF66EE852501AE50007EE018 /* AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF66EE7E2501AE50007EE018 /* AltStoreCore.framework */; };
@@ -219,6 +208,7 @@
 		BF66EEE92501AED0007EE018 /* JSONDecoder+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF66EEE52501AED0007EE018 /* JSONDecoder+Properties.swift */; };
 		BF66EEEA2501AED0007EE018 /* UIColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF66EEE62501AED0007EE018 /* UIColor+Hex.swift */; };
 		BF66EEEB2501AED0007EE018 /* UIApplication+AppExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF66EEE72501AED0007EE018 /* UIApplication+AppExtension.swift */; };
+		BF6C336224197D700034FD24 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C336124197D700034FD24 /* NSError+AltStore.swift */; };
 		BF6C8FAC242935ED00125131 /* NSAttributedString+Markdown.m in Sources */ = {isa = PBXBuildFile; fileRef = BF6C8FAA242935ED00125131 /* NSAttributedString+Markdown.m */; };
 		BF6C8FAE2429597900125131 /* BannerCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C8FAD2429597900125131 /* BannerCollectionViewCell.swift */; };
 		BF6C8FB02429599900125131 /* TextCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C8FAF2429599900125131 /* TextCollectionReusableView.swift */; };
@@ -249,7 +239,7 @@
 		BF9ABA4B22DD1380008935CF /* NavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF9ABA4A22DD137F008935CF /* NavigationBar.swift */; };
 		BF9ABA4D22DD16DE008935CF /* PillButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF9ABA4C22DD16DE008935CF /* PillButton.swift */; };
 		BFA8172B23C5633D001B5953 /* FetchAnisetteDataOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA8172A23C5633D001B5953 /* FetchAnisetteDataOperation.swift */; };
-		BFAECC522501B0A400528F27 /* CodableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD44605241188C300EAB90A /* CodableError.swift */; };
+		BFAECC522501B0A400528F27 /* CodableServerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD44605241188C300EAB90A /* CodableServerError.swift */; };
 		BFAECC532501B0A400528F27 /* ServerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1E3128229F474900370A3C /* ServerProtocol.swift */; };
 		BFAECC542501B0A400528F27 /* NSError+ALTServerError.m in Sources */ = {isa = PBXBuildFile; fileRef = BF1E314922A060F400370A3C /* NSError+ALTServerError.m */; };
 		BFAECC552501B0A400528F27 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF18BFF624858BDE00DD5981 /* Connection.swift */; };
@@ -308,7 +298,7 @@
 		BFE60742231B07E6002B0E8E /* SettingsHeaderFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE60741231B07E6002B0E8E /* SettingsHeaderFooterView.swift */; };
 		BFE6325A22A83BEB00F30809 /* Authentication.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BFE6325922A83BEB00F30809 /* Authentication.storyboard */; };
 		BFE6326C22A86FF300F30809 /* AuthenticationOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE6326B22A86FF300F30809 /* AuthenticationOperation.swift */; };
-		BFECAC8824FD950E0077C41F /* CodableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD44605241188C300EAB90A /* CodableError.swift */; };
+		BFECAC8824FD950E0077C41F /* CodableServerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD44605241188C300EAB90A /* CodableServerError.swift */; };
 		BFECAC8924FD950E0077C41F /* ConnectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF18BFF22485828200DD5981 /* ConnectionManager.swift */; };
 		BFECAC8A24FD950E0077C41F /* ALTServerError+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF767CB2489AB5C0097E58C /* ALTServerError+Conveniences.swift */; };
 		BFECAC8B24FD950E0077C41F /* ServerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1E3128229F474900370A3C /* ServerProtocol.swift */; };
@@ -509,9 +499,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0E0502592BEC83C500879B5C /* OperatingSystemVersion+Comparable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OperatingSystemVersion+Comparable.swift"; sourceTree = "<group>"; };
-		0E05025B2BEC947000879B5C /* String+SideStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+SideStore.swift"; sourceTree = "<group>"; };
-		0E13E5852CC8F55900E9C0DF /* ProcessInfo+SideStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProcessInfo+SideStore.swift"; sourceTree = "<group>"; };
 		0E1A1F902AE36A9600364CAD /* bytearray.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = bytearray.c; path = src/bytearray.c; sourceTree = "<group>"; };
 		0E764E162ADFF5740043DD4E /* AltBackup.ipa */ = {isa = PBXFileReference; lastKnownFileType = file; name = AltBackup.ipa; path = AltStore/Resources/AltBackup.ipa; sourceTree = SOURCE_ROOT; };
 		0EA166412ADFE0D1003015C1 /* jplist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jplist.c; path = Dependencies/libplist/src/jplist.c; sourceTree = SOURCE_ROOT; };
@@ -547,20 +534,15 @@
 		0EA166652ADFE122003015C1 /* hashtable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = hashtable.h; path = Dependencies/libplist/src/hashtable.h; sourceTree = SOURCE_ROOT; };
 		0EA166662ADFE122003015C1 /* base64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Dependencies/libplist/src/base64.h; sourceTree = SOURCE_ROOT; };
 		0EA166672ADFE122003015C1 /* strbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = Dependencies/libplist/src/strbuf.h; sourceTree = SOURCE_ROOT; };
-		0EA426392C2230150026D7FB /* AnisetteServerList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnisetteServerList.swift; sourceTree = "<group>"; };
 		0EA4B9BB2AE4A3F6009209CE /* plist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = plist.c; path = Dependencies/libplist/src/plist.c; sourceTree = SOURCE_ROOT; };
-		0EE7FDC02BE8BC2100D1E390 /* ALTWrappedError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALTWrappedError.m; sourceTree = "<group>"; };
-		0EE7FDC22BE8BC4200D1E390 /* ALTWrappedError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALTWrappedError.h; sourceTree = "<group>"; };
-		0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ALTLocalizedError.swift; sourceTree = "<group>"; };
-		0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorDetailsViewController.swift; sourceTree = "<group>"; };
 		19104DB22909C06C00C49C7B /* libEmotionalDamage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEmotionalDamage.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = "<group>"; };
 		191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		1920B04E2924AC8300744F60 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = "<group>"; };
 		9961EC2D29BE9F2E00AF2C6F /* minimuxer-helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "minimuxer-helpers.swift"; path = "Dependencies/minimuxer/minimuxer-helpers.swift"; sourceTree = SOURCE_ROOT; };
 		99F87D1629D8E4C900B40039 /* SwiftBridgeCore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftBridgeCore.swift; path = Dependencies/minimuxer/SwiftBridgeCore.swift; sourceTree = SOURCE_ROOT; };
 		99F87D1729D8E4C900B40039 /* minimuxer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = minimuxer.swift; path = Dependencies/minimuxer/minimuxer.swift; sourceTree = SOURCE_ROOT; };
-		A800F7032CE28E2F00208744 /* View+AltWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+AltWidget.swift"; sourceTree = "<group>"; };
 		B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Roxas.xcodeproj; path = Dependencies/Roxas/Roxas.xcodeproj; sourceTree = "<group>"; };
 		B33FFBA9295F8F78002259E6 /* preboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = preboard.c; path = src/preboard.c; sourceTree = "<group>"; };
 		B33FFBAB295F8F98002259E6 /* companion_proxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = companion_proxy.c; path = src/companion_proxy.c; sourceTree = "<group>"; };
@@ -589,7 +571,6 @@
 		B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltStoreCore.xcconfig; sourceTree = "<group>"; };
 		B3C3960F284F53E900DA9E2F /* AltBackup.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltBackup.xcconfig; sourceTree = "<group>"; };
 		B3EE16B52925E27D00B3B1F5 /* AnisetteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnisetteManager.swift; sourceTree = "<group>"; };
-		BD4513AA2C6FA98C0052BCC0 /* AppExtensionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppExtensionView.swift; sourceTree = "<group>"; };
 		BF02419522F2199300129732 /* RefreshAttemptsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshAttemptsViewController.swift; sourceTree = "<group>"; };
 		BF08858222DE795100DE9F1E /* MyAppsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAppsViewController.swift; sourceTree = "<group>"; };
 		BF08858422DE7EC800DE9F1E /* UpdateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -804,7 +785,7 @@
 		BFD2478B2284C4C300981D42 /* AppIconImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconImageView.swift; sourceTree = "<group>"; };
 		BFD2478E2284C8F900981D42 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
 		BFD2479E2284FBD000981D42 /* UIColor+AltStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+AltStore.swift"; sourceTree = "<group>"; };
-		BFD44605241188C300EAB90A /* CodableError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableError.swift; sourceTree = "<group>"; };
+		BFD44605241188C300EAB90A /* CodableServerError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableServerError.swift; sourceTree = "<group>"; };
 		BFD52BD222A06EFB000B7ED1 /* ALTConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALTConstants.h; sourceTree = "<group>"; };
 		BFD52C1D22A1A9EC000B7ED1 /* node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = node.c; path = Dependencies/libplist/libcnary/node.c; sourceTree = SOURCE_ROOT; };
 		BFD52C1E22A1A9EC000B7ED1 /* node_list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = node_list.c; path = Dependencies/libplist/libcnary/node_list.c; sourceTree = SOURCE_ROOT; };
@@ -955,16 +936,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0EE7FDBF2BE8BBBF00D1E390 /* Errors */ = {
-			isa = PBXGroup;
-			children = (
-				0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */,
-				0EE7FDC02BE8BC2100D1E390 /* ALTWrappedError.m */,
-				0EE7FDC22BE8BC4200D1E390 /* ALTWrappedError.h */,
-			);
-			path = Errors;
-			sourceTree = "<group>";
-		};
 		19104DB32909C06D00C49C7B /* EmotionalDamage */ = {
 			isa = PBXGroup;
 			children = (
@@ -1010,14 +981,6 @@
 			name = Generated;
 			sourceTree = "<group>";
 		};
-		A800F6FE2CE28DE300208744 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				A800F7032CE28E2F00208744 /* View+AltWidget.swift */,
-			);
-			path = Extensions;
-			sourceTree = "<group>";
-		};
 		B3146EC7284F580500BBC3FD /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1098,7 +1061,7 @@
 			isa = PBXGroup;
 			children = (
 				BF1E3128229F474900370A3C /* ServerProtocol.swift */,
-				BFD44605241188C300EAB90A /* CodableError.swift */,
+				BFD44605241188C300EAB90A /* CodableServerError.swift */,
 			);
 			path = "Server Protocol";
 			sourceTree = "<group>";
@@ -1111,7 +1074,6 @@
 				BF18BFFF2485A75F00DD5981 /* Server Protocol */,
 				BFF767CF2489AC240097E58C /* Connections */,
 				BFF7C92D2578464D00E55F36 /* XPC */,
-				0EE7FDBF2BE8BBBF00D1E390 /* Errors */,
 				BFF767C32489A6800097E58C /* Extensions */,
 				BFF767C42489A6980097E58C /* Categories */,
 			);
@@ -1434,8 +1396,6 @@
 				BF66EEE62501AED0007EE018 /* UIColor+Hex.swift */,
 				BF66EEE42501AED0007EE018 /* UserDefaults+AltStore.swift */,
 				BF6A531F246DC1B0004F59C8 /* FileManager+SharedDirectories.swift */,
-				0E0502592BEC83C500879B5C /* OperatingSystemVersion+Comparable.swift */,
-				0E05025B2BEC947000879B5C /* String+SideStore.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1475,7 +1435,6 @@
 		BF98916C250AABF3002ACF50 /* AltWidget */ = {
 			isa = PBXGroup;
 			children = (
-				A800F6FE2CE28DE300208744 /* Extensions */,
 				BF8B17F0250AC62400F8157F /* AltWidgetExtension.entitlements */,
 				BF98917D250AAC4F002ACF50 /* AltWidget.swift */,
 				BF42345825101C1D006D1EB2 /* WidgetView.swift */,
@@ -1616,6 +1575,7 @@
 				BFD247962284D7C100981D42 /* Resources */,
 				BF6C8FA8242935CA00125131 /* Dependencies */,
 				BFD247972284D7D800981D42 /* Supporting Files */,
+				1920B04E2924AC8300744F60 /* Settings.bundle */,
 			);
 			path = AltStore;
 			sourceTree = "<group>";
@@ -1638,7 +1598,6 @@
 			children = (
 				BF0C4EBC22A1BD8B009A2DD7 /* AppManager.swift */,
 				BF88F97124F8727D00BB75DF /* AppManagerErrors.swift */,
-				BD4513AA2C6FA98C0052BCC0 /* AppExtensionView.swift */,
 			);
 			path = "Managing Apps";
 			sourceTree = "<group>";
@@ -1691,7 +1650,6 @@
 				BFE00A1F2503097F00EB4D0C /* INInteraction+AltStore.swift */,
 				D57F2C9326E01BC700B9FA39 /* UIDevice+Vibration.swift */,
 				B376FE3D29258C8900E18883 /* OSLog+SideStore.swift */,
-				0E13E5852CC8F55900E9C0DF /* ProcessInfo+SideStore.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1701,7 +1659,6 @@
 			children = (
 				BFE60737231ADF49002B0E8E /* Settings.storyboard */,
 				BFE60739231ADF82002B0E8E /* SettingsViewController.swift */,
-				0EA426392C2230150026D7FB /* AnisetteServerList.swift */,
 				BFE6073F231AFD2A002B0E8E /* InsetGroupTableViewCell.swift */,
 				BFE60741231B07E6002B0E8E /* SettingsHeaderFooterView.swift */,
 				BFE6073B231AE1E7002B0E8E /* SettingsHeaderFooterView.xib */,
@@ -1818,7 +1775,6 @@
 			children = (
 				D57FE84328C7DB7100216002 /* ErrorLogViewController.swift */,
 				D54DED1328CBC44B008B27A0 /* ErrorLogTableViewCell.swift */,
-				0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */,
 			);
 			path = "Error Log";
 			sourceTree = "<group>";
@@ -1871,7 +1827,6 @@
 				BFAECC5D2501B0BF00528F27 /* ALTConnection.h in Headers */,
 				BF66EE942501AEBC007EE018 /* ALTAppPermission.h in Headers */,
 				BFAECC602501B0BF00528F27 /* NSError+ALTServerError.h in Headers */,
-				0EE7FDC82BE8CF4800D1E390 /* ALTWrappedError.h in Headers */,
 				BFAECC5E2501B0BF00528F27 /* CFNotificationName+AltStore.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2255,6 +2210,7 @@
 				BFD2477A2284B9A700981D42 /* LaunchScreen.storyboard in Resources */,
 				BF770E6922BD57DD002A40FE /* Silence.m4a in Resources */,
 				BFD247772284B9A700981D42 /* Assets.xcassets in Resources */,
+				1920B04F2924AC8300744F60 /* Settings.bundle in Resources */,
 				BFF0B6922321A305007A79E1 /* AboutPatreonHeaderView.xib in Resources */,
 				BFB6B22423187A3D0022A802 /* NewsCollectionViewCell.xib in Resources */,
 				BFD247752284B9A500981D42 /* Main.storyboard in Resources */,
@@ -2315,7 +2271,7 @@
 				BF1FE358251A9FB000C3CE09 /* NSXPCConnection+MachServices.swift in Sources */,
 				BFECAC8F24FD950E0077C41F /* Result+Conveniences.swift in Sources */,
 				BF8CAE472489E772004D6CCE /* DaemonRequestHandler.swift in Sources */,
-				BFECAC8824FD950E0077C41F /* CodableError.swift in Sources */,
+				BFECAC8824FD950E0077C41F /* CodableServerError.swift in Sources */,
 				BFC712C32512D5F100AB5EBE /* XPCConnection.swift in Sources */,
 				BFC712C52512D5F100AB5EBE /* XPCConnectionHandler.swift in Sources */,
 				BFECAC8A24FD950E0077C41F /* ALTServerError+Conveniences.swift in Sources */,
@@ -2412,8 +2368,8 @@
 				BF580496246A3CB5008AE704 /* UIColor+AltBackup.swift in Sources */,
 				BF580482246A28F7008AE704 /* ViewController.swift in Sources */,
 				BF44EEF0246B08BA002A52F2 /* BackupController.swift in Sources */,
-				0EE7FDC62BE8CEA300D1E390 /* ALTLocalizedError.swift in Sources */,
 				03F06CD52942C27E001C4D68 /* Bundle+AltStore.swift in Sources */,
+				BF58049B246A432D008AE704 /* NSError+AltStore.swift in Sources */,
 				BF58047E246A28F7008AE704 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2429,7 +2385,7 @@
 				BF66EECD2501AECA007EE018 /* StoreAppPolicy.swift in Sources */,
 				BF66EEE82501AED0007EE018 /* UserDefaults+AltStore.swift in Sources */,
 				BF340E9A250AD39500A192CB /* ViewApp.intentdefinition in Sources */,
-				BFAECC522501B0A400528F27 /* CodableError.swift in Sources */,
+				BFAECC522501B0A400528F27 /* CodableServerError.swift in Sources */,
 				BF66EE9E2501AEC1007EE018 /* Fetchable.swift in Sources */,
 				BF66EEDF2501AECA007EE018 /* PatreonAccount.swift in Sources */,
 				BFAECC532501B0A400528F27 /* ServerProtocol.swift in Sources */,
@@ -2437,14 +2393,11 @@
 				BF66EE9D2501AEC1007EE018 /* AppProtocol.swift in Sources */,
 				BFC712C42512D5F100AB5EBE /* XPCConnection.swift in Sources */,
 				D5CA0C4B280E141900469595 /* ManagedPatron.swift in Sources */,
-				0E05025A2BEC83C500879B5C /* OperatingSystemVersion+Comparable.swift in Sources */,
 				BF66EE8C2501AEB2007EE018 /* Keychain.swift in Sources */,
 				BF66EED42501AECA007EE018 /* AltStore5ToAltStore6.xcmappingmodel in Sources */,
 				BF66EE972501AEBC007EE018 /* ALTAppPermission.m in Sources */,
 				BFAECC552501B0A400528F27 /* Connection.swift in Sources */,
 				BF66EEDA2501AECA007EE018 /* RefreshAttempt.swift in Sources */,
-				0E05025C2BEC947000879B5C /* String+SideStore.swift in Sources */,
-				0EE7FDCB2BE8D12B00D1E390 /* ALTLocalizedError.swift in Sources */,
 				BF66EEA92501AEC5007EE018 /* Tier.swift in Sources */,
 				BF66EEDB2501AECA007EE018 /* StoreApp.swift in Sources */,
 				BF66EEDE2501AECA007EE018 /* AppID.swift in Sources */,
@@ -2453,7 +2406,6 @@
 				BF66EEDD2501AECA007EE018 /* AppPermission.swift in Sources */,
 				D58916FE28C7C55C00E39C8B /* LoggedError.swift in Sources */,
 				BFBF331B2526762200B7B8C9 /* AltStore8ToAltStore9.xcmappingmodel in Sources */,
-				0EE7FDC72BE8CF4100D1E390 /* ALTWrappedError.m in Sources */,
 				D5CA0C4E280E249E00469595 /* AltStore9ToAltStore10.xcmappingmodel in Sources */,
 				BF989184250AACFC002ACF50 /* Date+RelativeDate.swift in Sources */,
 				BF66EE962501AEBC007EE018 /* ALTPatreonBenefitType.m in Sources */,
@@ -2478,7 +2430,6 @@
 				BF66EEEA2501AED0007EE018 /* UIColor+Hex.swift in Sources */,
 				BF66EECC2501AECA007EE018 /* Source.swift in Sources */,
 				BF66EED72501AECA007EE018 /* InstalledApp.swift in Sources */,
-				0EE7FDC92BE8D07400D1E390 /* NSError+AltStore.swift in Sources */,
 				BF66EECE2501AECA007EE018 /* InstalledAppPolicy.swift in Sources */,
 				BF1FE359251A9FB000C3CE09 /* NSXPCConnection+MachServices.swift in Sources */,
 				BF66EEA62501AEC5007EE018 /* PatreonAPI.swift in Sources */,
@@ -2500,7 +2451,6 @@
 				BF42345A25101C35006D1EB2 /* WidgetView.swift in Sources */,
 				D55E163728776CB700A627A1 /* ComplicationView.swift in Sources */,
 				BF98917F250AAC4F002ACF50 /* AltWidget.swift in Sources */,
-				A800F7042CE28E3800208744 /* View+AltWidget.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2535,6 +2485,7 @@
 				BF8F69C422E662D300049BA1 /* AppViewController.swift in Sources */,
 				BFF0B68E23219520007A79E1 /* PatreonViewController.swift in Sources */,
 				BFF00D302501BD7D00746320 /* Intents.intentdefinition in Sources */,
+				BF6C336224197D700034FD24 /* NSError+AltStore.swift in Sources */,
 				D5DAE0942804B0B80034D8D4 /* ScreenshotProcessor.swift in Sources */,
 				BFD2476E2284B9A500981D42 /* AppDelegate.swift in Sources */,
 				BF41B806233423AE00C593A3 /* TabBarController.swift in Sources */,
@@ -2550,7 +2501,6 @@
 				BF6C8FAE2429597900125131 /* BannerCollectionViewCell.swift in Sources */,
 				BF6F439223644C6E00A0B879 /* RefreshAltStoreViewController.swift in Sources */,
 				BFE60742231B07E6002B0E8E /* SettingsHeaderFooterView.swift in Sources */,
-				BD4513AB2C6FA98C0052BCC0 /* AppExtensionView.swift in Sources */,
 				BFE338E822F10E56002E24B9 /* LaunchViewController.swift in Sources */,
 				BFA8172B23C5633D001B5953 /* FetchAnisetteDataOperation.swift in Sources */,
 				BF9ABA4722DD0638008935CF /* BrowseCollectionViewCell.swift in Sources */,
@@ -2558,7 +2508,6 @@
 				BF41B808233433C100C593A3 /* LoadingState.swift in Sources */,
 				BFF0B69A2322D7D0007A79E1 /* UIScreen+CompactHeight.swift in Sources */,
 				D5ACE84528E3B8450021CAB9 /* ClearAppCacheOperation.swift in Sources */,
-				0EA4263A2C2230150026D7FB /* AnisetteServerList.swift in Sources */,
 				D5F2F6A92720B7C20081CCF5 /* PatchViewController.swift in Sources */,
 				B39F16132918D7C5002E9404 /* Consts.swift in Sources */,
 				BF8F69C222E659F700049BA1 /* AppContentViewController.swift in Sources */,
@@ -2567,7 +2516,6 @@
 				BF770E5822BC3D0F002A40FE /* RefreshGroup.swift in Sources */,
 				19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */,
 				99F87D0529D8B4E200B40039 /* minimuxer-helpers.swift in Sources */,
-				0E13E5862CC8F55900E9C0DF /* ProcessInfo+SideStore.swift in Sources */,
 				BF18B0F122E25DF9005C4CF5 /* ToastView.swift in Sources */,
 				BF3D649F22E7B24C00E9056B /* CollapsingTextView.swift in Sources */,
 				BF02419622F2199300129732 /* RefreshAttemptsViewController.swift in Sources */,
@@ -2585,11 +2533,9 @@
 				BFF00D322501BDA100746320 /* BackgroundRefreshAppsOperation.swift in Sources */,
 				BF0C4EBD22A1BD8B009A2DD7 /* AppManager.swift in Sources */,
 				BF2901312318F7A800D88A45 /* AppBannerView.swift in Sources */,
-				0EE7FDC42BE8BC7900D1E390 /* ALTLocalizedError.swift in Sources */,
 				BFF00D342501BDCF00746320 /* IntentHandler.swift in Sources */,
 				BFDBBD80246CB84F004ED2F3 /* RemoveAppBackupOperation.swift in Sources */,
 				BFF0B6942321CB85007A79E1 /* AuthenticationViewController.swift in Sources */,
-				0EE7FDCD2BE9124400D1E390 /* ErrorDetailsViewController.swift in Sources */,
 				BF3432FB246B894F0052F4A1 /* BackupAppOperation.swift in Sources */,
 				BF9ABA4922DD0742008935CF /* ScreenshotCollectionViewCell.swift in Sources */,
 				BF9ABA4D22DD16DE008935CF /* PillButton.swift in Sources */,
@@ -3019,7 +2965,6 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LLVM_LTO = YES_THIN;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3048,7 +2993,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_OPTIMIZATION_LEVEL = fast;
 				INFOPLIST_FILE = AltStoreCore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -3057,7 +3001,6 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LLVM_LTO = YES_THIN;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3085,7 +3028,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
-				ENABLE_DEBUG_DYLIB = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = AltWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -3116,7 +3058,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
-				ENABLE_DEBUG_DYLIB = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = AltWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -3169,7 +3110,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EAGER_LINKING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3187,7 +3127,6 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				LLVM_LTO = YES_THIN;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3198,7 +3137,6 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG BETA";
-				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SYSTEM_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Dependencies/AltSign/Dependencies\"";
 			};
@@ -3240,12 +3178,10 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EAGER_LINKING = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -3253,7 +3189,6 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				LLVM_LTO = YES_THIN;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_CPLUSPLUSFLAGS = (
@@ -3263,9 +3198,8 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG BETA";
-				SWIFT_COMPILATION_MODE = singlefile;
-				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
-				SWIFT_OPTIMIZATION_LEVEL = "-Osize";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SYSTEM_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Dependencies/AltSign/Dependencies\"";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -3275,7 +3209,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AltStore/AltStore.entitlements;
@@ -3283,11 +3217,8 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_BITCODE = NO;
-				ENABLE_DEBUG_DYLIB = NO;
-				GCC_UNROLL_LOOPS = YES;
 				INFOPLIST_FILE = AltStore/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				LD_EXPORT_SYMBOLS = NO;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3297,13 +3228,11 @@
 					"$(PROJECT_DIR)/Dependencies/libfragmentzip",
 					"$(PROJECT_DIR)/Dependencies/libcurl",
 				);
-				LLVM_LTO = YES_THIN;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
 				SWIFT_OBJC_BRIDGING_HEADER = "AltStore/AltStore-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -3315,7 +3244,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AltStore/AltStore.entitlements;
@@ -3323,12 +3252,8 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_BITCODE = NO;
-				ENABLE_DEBUG_DYLIB = NO;
-				GCC_OPTIMIZATION_LEVEL = fast;
-				GCC_UNROLL_LOOPS = YES;
 				INFOPLIST_FILE = AltStore/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				LD_EXPORT_SYMBOLS = NO;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3338,16 +3263,12 @@
 					"$(PROJECT_DIR)/Dependencies/libfragmentzip",
 					"$(PROJECT_DIR)/Dependencies/libcurl",
 				);
-				LLVM_LTO = YES_THIN;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-				SWIFT_COMPILATION_MODE = singlefile;
-				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
 				SWIFT_OBJC_BRIDGING_HEADER = "AltStore/AltStore-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Osize";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -3444,8 +3365,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SideStore/AltSign";
 			requirement = {
-				kind = revision;
-				revision = 4323ff794e600ce1759cb6ea57275e13b7ea72f2;
+				branch = master;
+				kind = branch;
 			};
 		};
 		4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */ = {

AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,4 @@
 {
-  "originHash" : "ee46302f91cbb62c5234c36750d40856658e961e191f5536cf4fe74d10fc2c94",
   "pins" : [
     {
       "identity" : "altsign",
@@ -7,7 +6,7 @@
       "location" : "https://github.com/SideStore/AltSign",
       "state" : {
         "branch" : "master",
-        "revision" : "4323ff794e600ce1759cb6ea57275e13b7ea72f2"
+        "revision" : "cc6189f0f7cd8e5bd24943af9322e0ff9420e9f4"
       }
     },
     {
@@ -60,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/krzyzanowskim/OpenSSL",
       "state" : {
-        "revision" : "8cb1d641ab5ebce2cd7cf31c93baef07bed672d4",
-        "version" : "1.1.2301"
+        "revision" : "0faf71a188bcfdf0245cab42886b9b240ca71c52",
+        "version" : "1.1.2200"
       }
     },
     {
@@ -78,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SwiftPackageIndex/SemanticVersion.git",
       "state" : {
-        "revision" : "ea8eea9d89842a29af1b8e6c7677f1c86e72fa42",
-        "version" : "0.4.0"
+        "revision" : "a70840d5fca686ae3bd2fcf8aecc5ded0bd4f125",
+        "version" : "0.3.6"
       }
     },
     {
@@ -87,8 +86,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/sparkle-project/Sparkle.git",
       "state" : {
-        "revision" : "0ef1ee0220239b3776f433314515fd849025673f",
-        "version" : "2.6.4"
+        "revision" : "f0ceaf5cc9f3f23daa0ccb6dcebd79fc96ccc7d9",
+        "version" : "2.5.0"
       }
     },
     {
@@ -96,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/daltoniam/Starscream.git",
       "state" : {
-        "revision" : "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
-        "version" : "4.0.8"
+        "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
+        "version" : "4.0.6"
       }
     },
     {
@@ -110,5 +109,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

AltStore.xcodeproj/xcshareddata/xcschemes/AltDaemon.xcscheme

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1150"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "NO"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A7A6DC28A6D60809855FE404C6A3EA29"
+               BuildableName = "libPods-AltDaemon.a"
+               BlueprintName = "Pods-AltDaemon"
+               ReferencedContainer = "container:Pods/Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF1E314F22A0616100370A3C"
+               BuildableName = "libAltKit.a"
+               BlueprintName = "AltKit"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF18BFE624857D7900DD5981"
+               BuildableName = "AltDaemon"
+               BlueprintName = "AltDaemon"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF18BFE624857D7900DD5981"
+            BuildableName = "AltDaemon"
+            BlueprintName = "AltDaemon"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "THEOS"
+            value = "~/theos"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF18BFE624857D7900DD5981"
+            BuildableName = "AltDaemon"
+            BlueprintName = "AltDaemon"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1120"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF5C5FC4237DF5AE00EDD0C6"
+               BuildableName = "AltPlugin.mailbundle"
+               BlueprintName = "AltPlugin"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "1"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF5C5FC4237DF5AE00EDD0C6"
+            BuildableName = "AltPlugin.mailbundle"
+            BlueprintName = "AltPlugin"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/AltServer.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF45868C229872EA00BD7491"
+               BuildableName = "AltServer.app"
+               BlueprintName = "AltServer"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF45868C229872EA00BD7491"
+            BuildableName = "AltServer.app"
+            BlueprintName = "AltServer"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF45868C229872EA00BD7491"
+            BuildableName = "AltServer.app"
+            BlueprintName = "AltServer"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF45868C229872EA00BD7491"
+            BuildableName = "AltServer.app"
+            BlueprintName = "AltServer"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/AltStore - Release.xcscheme

@@ -55,26 +55,7 @@
             argument = "-com.apple.CoreData.ConcurrencyDebug 1"
             isEnabled = "YES">
          </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.MigrationDebug 1"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.SQLiteIntegrityCheck 1"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.SQLDebug 1"
-            isEnabled = "NO">
-         </CommandLineArgument>
       </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "OS_ACTIVITY_MODE"
-            value = "$(DEBUG_ACTIVITY_MODE)"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

AltStore.xcodeproj/xcshareddata/xcschemes/AltStore.xcscheme

@@ -55,26 +55,7 @@
             argument = "-com.apple.CoreData.ConcurrencyDebug 1"
             isEnabled = "YES">
          </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.MigrationDebug 1"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.SQLiteIntegrityCheck 1"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.SQLDebug 1"
-            isEnabled = "NO">
-         </CommandLineArgument>
       </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "OS_ACTIVITY_MODE"
-            value = "$(DEBUG_ACTIVITY_MODE)"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

AltStore.xcodeproj/xcshareddata/xcschemes/AltXPC.xcscheme

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BFF7C903257844C900E55F36"
+               BuildableName = "AltXPC.xpc"
+               BlueprintName = "AltXPC"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF45868C229872EA00BD7491"
+            BuildableName = "AltServer.app"
+            BlueprintName = "AltServer"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BFF7C903257844C900E55F36"
+            BuildableName = "AltXPC.xpc"
+            BlueprintName = "AltXPC"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore/AltStore.entitlements

@@ -2,12 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.kernel.extended-virtual-addressing</key>
-	<true/>
-	<key>com.apple.developer.kernel.increased-debugging-memory-limit</key>
-	<true/>
-	<key>com.apple.developer.kernel.increased-memory-limit</key>
-	<true/>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.siri</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>

AltStore/App Detail/AppContentViewController.swift

@@ -81,7 +81,7 @@ final class AppContentViewController: UITableViewController
         self.subtitleLabel.text = self.app.subtitle
         self.descriptionTextView.text = self.app.localizedDescription
         
-        if let version = self.app.latestAvailableVersion
+        if let version = self.app.latestVersion
         {
             self.versionDescriptionTextView.text = version.localizedDescription
             self.versionLabel.text = String(format: NSLocalizedString("Version %@", comment: ""), version.version)

AltStore/App Detail/AppViewController.swift

@@ -384,7 +384,7 @@ private extension AppViewController
             button.progress = progress
         }
         
-        if let versionDate = self.app.latestAvailableVersion?.date, versionDate > Date()
+        if let versionDate = self.app.latestVersion?.date, versionDate > Date()
         {
             self.bannerView.button.countdownDate = versionDate
             self.navigationBarDownloadButton.countdownDate = versionDate
@@ -510,7 +510,7 @@ extension AppViewController
             catch
             {
                 DispatchQueue.main.async {
-                    let toastView = ToastView(error: error, opensLog: true)
+                    let toastView = ToastView(error: error)
                     toastView.show(in: self)
                 }
             }

AltStore/AppDelegate.swift

@@ -61,8 +61,6 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         // Register default settings before doing anything else.
         UserDefaults.registerDefaults()
         
-        
-        
         DatabaseManager.shared.start { (error) in
             if let error = error
             {
@@ -382,7 +380,7 @@ private extension AppDelegate
                 for update in updates
                 {
                     guard !previousUpdates.contains(where: { $0[#keyPath(InstalledApp.bundleIdentifier)] == update.bundleIdentifier }) else { continue }
-                    guard let storeApp = update.storeApp, let version = storeApp.latestSupportedVersion else { continue }
+                    guard let storeApp = update.storeApp, let version = storeApp.version else { continue }
                     
                     let content = UNMutableNotificationContent()
                     content.title = NSLocalizedString("New Update Available", comment: "")

AltStore/Authentication/Authentication.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -13,8 +13,8 @@
         <scene sceneID="lNR-II-WoW">
             <objects>
                 <navigationController storyboardIdentifier="navigationController" id="ZTo-53-dSL" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" largeTitles="YES" id="Aej-RF-PfV" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" largeTitles="YES" id="Aej-RF-PfV" customClass="NavigationBar" customModule="AltStore" customModuleProvider="target">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" name="SettingsBackground"/>
@@ -36,19 +36,19 @@
         <!--Authentication View Controller-->
         <scene sceneID="OCd-xc-Ms7">
             <objects>
-                <viewController storyboardIdentifier="authenticationViewController" id="yO1-iT-7NP" customClass="AuthenticationViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="authenticationViewController" id="yO1-iT-7NP" customClass="AuthenticationViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="mjy-4S-hyH">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-Fd-ojD" userLabel="Sizing View">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="623"/>
                             </view>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" alwaysBounceVertical="YES" indicatorStyle="white" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="WXx-hX-AXv">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2wp-qG-f0Z">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" axis="vertical" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="YmX-7v-pxh">
                                                 <rect key="frame" x="16" y="6" width="343" height="359.5"/>
@@ -57,7 +57,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="67.5"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to SideStore." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EI2-V3-zQZ">
-                                                                <rect key="frame" x="0.0" y="0.0" width="343" height="41"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="332" height="41"/>
                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="34"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -179,7 +179,7 @@
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="250" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="DBk-rT-ZE8">
-                                                <rect key="frame" x="16" y="498.5" width="343" height="96.5"/>
+                                                <rect key="frame" x="16" y="518.5" width="343" height="96.5"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Why do we need this?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p9U-0q-Kn8">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="20.5"/>
@@ -198,10 +198,6 @@
                                             </stackView>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="DBk-rT-ZE8" firstAttribute="leading" secondItem="2wp-qG-f0Z" secondAttribute="leadingMargin" id="5AT-nV-ZP9"/>
-                                            <constraint firstAttribute="bottomMargin" secondItem="DBk-rT-ZE8" secondAttribute="bottom" id="HgY-oY-8KM"/>
-                                            <constraint firstAttribute="trailingMargin" secondItem="DBk-rT-ZE8" secondAttribute="trailing" id="VCf-bW-2K4"/>
-                                            <constraint firstItem="YmX-7v-pxh" firstAttribute="top" secondItem="2wp-qG-f0Z" secondAttribute="top" constant="6" id="iUr-Nd-tkt"/>
                                             <constraint firstItem="DBk-rT-ZE8" firstAttribute="top" relation="greaterThanOrEqual" secondItem="YmX-7v-pxh" secondAttribute="bottom" constant="8" symbolic="YES" id="zTU-eY-DWd"/>
                                         </constraints>
                                     </view>
@@ -219,15 +215,19 @@
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="WXx-hX-AXv" secondAttribute="bottom" id="0jL-Ky-ju6"/>
                             <constraint firstAttribute="leadingMargin" secondItem="YmX-7v-pxh" secondAttribute="leading" id="2PO-lG-dmB"/>
+                            <constraint firstItem="DBk-rT-ZE8" firstAttribute="leading" secondItem="2wp-qG-f0Z" secondAttribute="leadingMargin" id="5AT-nV-ZP9"/>
                             <constraint firstItem="oyW-Fd-ojD" firstAttribute="top" secondItem="zMn-DV-fpy" secondAttribute="top" id="730-db-ukB"/>
+                            <constraint firstItem="2wp-qG-f0Z" firstAttribute="bottomMargin" secondItem="DBk-rT-ZE8" secondAttribute="bottom" id="HgY-oY-8KM"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="trailing" secondItem="oyW-Fd-ojD" secondAttribute="trailing" id="KGE-CN-SWf"/>
                             <constraint firstItem="WXx-hX-AXv" firstAttribute="top" secondItem="mjy-4S-hyH" secondAttribute="top" id="LPQ-bF-ic0"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="trailing" secondItem="WXx-hX-AXv" secondAttribute="trailing" id="MG7-A6-pKp"/>
                             <constraint firstAttribute="trailingMargin" secondItem="YmX-7v-pxh" secondAttribute="trailing" id="O4T-nu-o3e"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="bottom" secondItem="oyW-Fd-ojD" secondAttribute="bottom" id="PuX-ab-cEq"/>
                             <constraint firstItem="oyW-Fd-ojD" firstAttribute="leading" secondItem="zMn-DV-fpy" secondAttribute="leading" id="SzC-gC-Nvi"/>
+                            <constraint firstItem="2wp-qG-f0Z" firstAttribute="trailingMargin" secondItem="DBk-rT-ZE8" secondAttribute="trailing" id="VCf-bW-2K4"/>
                             <constraint firstItem="WXx-hX-AXv" firstAttribute="leading" secondItem="zMn-DV-fpy" secondAttribute="leading" id="d08-zF-5X6"/>
                             <constraint firstItem="2wp-qG-f0Z" firstAttribute="height" secondItem="oyW-Fd-ojD" secondAttribute="height" id="dFN-pw-TWt"/>
+                            <constraint firstItem="YmX-7v-pxh" firstAttribute="top" secondItem="2wp-qG-f0Z" secondAttribute="top" constant="6" id="iUr-Nd-tkt"/>
                             <constraint firstItem="2wp-qG-f0Z" firstAttribute="width" secondItem="oyW-Fd-ojD" secondAttribute="width" id="rYO-GN-0Lk"/>
                         </constraints>
                     </view>
@@ -258,13 +258,13 @@
         <!--How it works-->
         <scene sceneID="dMt-EA-SGy">
             <objects>
-                <viewController storyboardIdentifier="instructionsViewController" hidesBottomBarWhenPushed="YES" id="aFi-fb-W0B" customClass="InstructionsViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="instructionsViewController" hidesBottomBarWhenPushed="YES" id="aFi-fb-W0B" customClass="InstructionsViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="Otz-hn-WGS">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="bp6-55-IG2">
-                                <rect key="frame" x="0.0" y="64" width="375" height="544"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="564"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="FjP-tm-w7K">
                                         <rect key="frame" x="16" y="35" width="343" height="95.5"/>
@@ -298,7 +298,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="LpI-Jt-SzX">
-                                        <rect key="frame" x="16" y="161" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="168" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0LW-eE-qHa">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -310,7 +310,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="dMu-eg-gIO">
-                                                <rect key="frame" x="79" y="17.5" width="264" height="60.5"/>
+                                                <rect key="frame" x="79" y="17" width="264" height="61.5"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to Wi-Fi and VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="esj-pD-D4A">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -319,7 +319,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable SideStore VPN in Wireguard and be able to use Sidestore on the go." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="4rk-ge-FSj">
-                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="35"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="36"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
@@ -329,7 +329,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="tfb-ja-9UC">
-                                        <rect key="frame" x="16" y="287.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="300.5" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nVr-El-Csi">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -341,7 +341,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="z6Y-zi-teL">
-                                                <rect key="frame" x="79" y="15.5" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="16" width="264" height="64"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Download Apps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JeJ-bk-UCA">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -360,7 +360,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="X3r-G1-vf2">
-                                        <rect key="frame" x="16" y="413.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="433.5" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2U-NL-plG">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -434,7 +434,7 @@
         <!--Refresh AltStore-->
         <scene sceneID="9Vh-dM-OqX">
             <objects>
-                <viewController storyboardIdentifier="refreshAltStoreViewController" id="aoK-yE-UVT" customClass="RefreshAltStoreViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="refreshAltStoreViewController" id="aoK-yE-UVT" customClass="RefreshAltStoreViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="R83-kV-365">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -445,7 +445,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="tDQ-ao-1Jg">
                                 <rect key="frame" x="16" y="570" width="343" height="89"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcg-hT-tDe" customClass="PillButton" customModule="SideStore" customModuleProvider="target">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcg-hT-tDe" customClass="PillButton" customModule="AltStore" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="343" height="51"/>
                                         <color key="backgroundColor" name="SettingsHighlighted"/>
                                         <constraints>
@@ -493,12 +493,12 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Chr-7g-qEw" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3025" y="734"/>
+            <point key="canvasLocation" x="2967" y="736"/>
         </scene>
         <!--Select a Team-->
         <scene sceneID="ioQ-WB-CLJ">
             <objects>
-                <viewController storyboardIdentifier="selectTeamViewController" hidesBottomBarWhenPushed="YES" id="kOD-4P-a6L" customClass="SelectTeamViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="selectTeamViewController" hidesBottomBarWhenPushed="YES" id="kOD-4P-a6L" customClass="SelectTeamViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="60" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="fWW-kX-ifH">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -506,11 +506,11 @@
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="TeamCell" textLabel="6ip-34-gmM" detailTextLabel="knk-Wf-PKf" style="IBUITableViewCellStyleSubtitle" id="qeQ-eb-2SC" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="TeamCell" textLabel="6ip-34-gmM" detailTextLabel="knk-Wf-PKf" style="IBUITableViewCellStyleSubtitle" id="qeQ-eb-2SC" customClass="InsetGroupTableViewCell" customModule="AltStore" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="55.5" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qeQ-eb-2SC" id="bT4-Fc-u6I">
-                                    <rect key="frame" x="0.0" y="0.0" width="334.5" height="60"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="334" height="60"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Team 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6ip-34-gmM">
@@ -550,19 +550,20 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="yH5-jU-aez" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2114" y="734"/>
+            <point key="canvasLocation" x="1401" y="734"/>
+
         </scene>
-    </scenes>
-    <color key="tintColor" name="Primary"/>
-    <resources>
-        <namedColor name="Primary">
-            <color red="0.64313725490196083" green="0.019607843137254902" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
+</scenes>
+<color key="tintColor" name="Primary"/>
+<resources>
+    <namedColor name="Primary">
+        <color red="0.0040000001899898052" green="0.50199997425079346" blue="0.51800000667572021" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+    </namedColor>
         <namedColor name="SettingsBackground">
-            <color red="0.45098039215686275" green="0.015686274509803921" blue="0.68627450980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0039215686274509803" green="0.50196078431372548" blue="0.51764705882352946" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="SettingsHighlighted">
-            <color red="0.38823529411764707" green="0.011764705882352941" blue="0.58823529411764708" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0080000003799796104" green="0.32199999690055847" blue="0.40400001406669617" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

AltStore/Authentication/AuthenticationViewController.swift

@@ -108,12 +108,12 @@ private extension AuthenticationViewController
                 
             case .failure(let error as NSError):
                 DispatchQueue.main.async {
-                    let error = error.withLocalizedTitle(NSLocalizedString("Failed to Log In", comment: ""))
-
+                    let error = error.withLocalizedFailure(NSLocalizedString("Failed to Log In", comment: ""))
+                    
                     let toastView = ToastView(error: error)
+                    toastView.textLabel.textColor = .altPink
+                    toastView.detailTextLabel.textColor = .altPink
                     toastView.show(in: self)
-                    toastView.textLabel.textColor = .altPrimary
-                    toastView.detailTextLabel.textColor = .altPrimary
                     self.toastView = toastView
                     
                     self.signInButton.isIndicatingActivity = false

AltStore/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="wKh-xq-NuP">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21223" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="wKh-xq-NuP">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21204"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -356,8 +356,8 @@
                                                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="ewH-gi-pyW">
                                                                     <rect key="frame" x="0.0" y="30.5" width="335" height="17"/>
                                                                     <subviews>
-                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Version 0.5.6" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7E0-TV-G4l">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="84" height="17"/>
+                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Version 4.4.2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7E0-TV-G4l">
+                                                                            <rect key="frame" x="0.0" y="0.0" width="84.5" height="17"/>
                                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                             <nil key="highlightedColor"/>
@@ -596,7 +596,7 @@ World</string>
                     <tabBarItem key="tabBarItem" title="Browse" image="Browse" id="Uwh-Bg-Ymq"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="dIv-qd-9L5" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" name="Primary"/>
                     </navigationBar>
@@ -626,7 +626,7 @@ World</string>
                     </tabBarItem>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="CzO-Kt-BlZ" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -883,7 +883,7 @@ World</string>
                     <navigationItem key="navigationItem" title="App IDs" id="3Co-uv-Fhb">
                         <barButtonItem key="leftBarButtonItem" style="plain" id="Aqs-QK-Ups">
                             <view key="customView" contentMode="scaleToFill" id="p0q-Fg-3Ba">
-                                <rect key="frame" x="16" y="7" width="83" height="42"/>
+                                <rect key="frame" x="16" y="1" width="83" height="42"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </view>
                         </barButtonItem>
@@ -909,7 +909,7 @@ World</string>
                     <tabBarItem key="tabBarItem" title="News" image="News" id="fVN-ed-uO1"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="525-jF-uDK" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
@@ -928,7 +928,7 @@ World</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="IXk-qg-mFJ" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="9sB-f3-Fnk">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1070,7 +1070,7 @@ World</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Qo4-72-Hmr" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="mcx-oR-qPe">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1095,13 +1095,13 @@ World</string>
         <image name="News" width="19" height="20"/>
         <image name="Settings" width="20" height="20"/>
         <namedColor name="Background">
-            <color red="0.45098039215686275" green="0.015686274509803921" blue="0.68627450980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.6431" green="0.0196" blue="0.9804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="BlurTint">
-            <color red="1" green="1" blue="1" alpha="0.30000001192092896" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="0.3" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="Primary">
-            <color red="0.64313725490196083" green="0.019607843137254902" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.6431" green="0.0196" blue="0.9804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

AltStore/Browse/BrowseViewController.swift

@@ -114,9 +114,9 @@ private extension BrowseViewController
                 let progress = AppManager.shared.installationProgress(for: app)
                 cell.bannerView.button.progress = progress
                 
-                if let versionDate = app.latestSupportedVersion?.date, versionDate > Date()
+                if let versionDate = app.latestVersion?.date, versionDate > Date()
                 {
-                    cell.bannerView.button.countdownDate = versionDate
+                    cell.bannerView.button.countdownDate = app.versionDate
                 }
                 else
                 {
@@ -278,7 +278,7 @@ private extension BrowseViewController
                 {
                 case .failure(OperationError.cancelled): break // Ignore
                 case .failure(let error):
-                    let toastView = ToastView(error: error, opensLog: true)
+                    let toastView = ToastView(error: error)
                     toastView.show(in: self)
                 
                 case .success: print("Installed app:", app.bundleIdentifier)

AltStore/Components/ToastView.swift

@@ -18,17 +18,8 @@ extension TimeInterval
 
 final class ToastView: RSTToastView
 {
-    static let openErrorLogNotification = Notification.Name("ALTOpenErrorLogNotification")
-
     var preferredDuration: TimeInterval
-
-    var opensErrorLog: Bool = false
-
-    convenience init(text: String, detailText: String?, opensLog: Bool = false) {
-        self.init(text: text, detailText: detailText)
-        self.opensErrorLog = opensLog
-    }
-
+    
     override init(text: String, detailText detailedText: String?)
     {
         if detailedText == nil
@@ -52,43 +43,53 @@ final class ToastView: RSTToastView
             // RSTToastView does not expose stack view containing labels,
             // so we access it indirectly as the labels' superview.
             stackView.spacing = (detailedText != nil) ? 4.0 : 0.0
-            stackView.alignment = .leading
         }
-        self.addTarget(self, action: #selector(ToastView.showErrorLog), for: .touchUpInside)
     }
-
-    convenience init(error: Error, opensLog: Bool = false) {
-        self.init(error: error)
-        self.opensErrorLog = opensLog
-    }
-
+    
     convenience init(error: Error)
     {
         var error = error as NSError
         var underlyingError = error.underlyingError
         
+        var preferredDuration: TimeInterval?
+        
         if
             let unwrappedUnderlyingError = underlyingError,
             error.domain == AltServerErrorDomain && error.code == ALTServerError.Code.underlyingError.rawValue
         {
-            // Treat underlyingError as the primary error, but keep localized title + failure.
-            let nsError = error as NSError
+            // Treat underlyingError as the primary error.
+            
             error = unwrappedUnderlyingError as NSError
-
-            if let localizedTitle = nsError.localizedTitle {
-                error = error.withLocalizedTitle(localizedTitle)
-            }
-            if let localizedFailure = nsError.localizedFailure {
-                error = error.withLocalizedFailure(localizedFailure)
-            }
-
             underlyingError = nil
+            
+            preferredDuration = .longToastViewDuration
         }
-        let text = error.localizedTitle ?? NSLocalizedString("Operation Failed", comment: "")
-        let detailText = error.localizedDescription
-
-
+        
+        let text: String
+        let detailText: String?
+        
+        if let failure = error.localizedFailure
+        {
+            text = failure
+            detailText = error.localizedFailureReason ?? error.localizedRecoverySuggestion ?? underlyingError?.localizedDescription ?? error.localizedDescription
+        }
+        else if let reason = error.localizedFailureReason
+        {
+            text = reason
+            detailText = error.localizedRecoverySuggestion ?? underlyingError?.localizedDescription
+        }
+        else
+        {
+            text = error.localizedDescription
+            detailText = underlyingError?.localizedDescription ?? error.localizedRecoverySuggestion
+        }
+        
         self.init(text: text, detailText: detailText)
+        
+        if let preferredDuration = preferredDuration
+        {
+            self.preferredDuration = preferredDuration
+        }
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -111,18 +112,6 @@ final class ToastView: RSTToastView
     
     override func show(in view: UIView, duration: TimeInterval)
     {
-        if opensErrorLog, #available(iOS 13.0, *), case let configuration = UIImage.SymbolConfiguration(font: self.textLabel.font),
-           let icon = UIImage(systemName: "chevron.right.circle", withConfiguration: configuration) {
-            let tintedIcon = icon.withTintColor(.white, renderingMode: .alwaysOriginal)
-            let moreIconImageView = UIImageView(image: tintedIcon)
-            moreIconImageView.translatesAutoresizingMaskIntoConstraints = false
-            self.addSubview(moreIconImageView)
-            NSLayoutConstraint.activate([
-                moreIconImageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -self.layoutMargins.right),
-                moreIconImageView.centerYAnchor.constraint(equalTo: self.textLabel.centerYAnchor),
-                moreIconImageView.leadingAnchor.constraint(greaterThanOrEqualToSystemSpacingAfter: self.textLabel.trailingAnchor, multiplier: 1.0)
-            ])
-        }
         super.show(in: view, duration: duration)
         
         let announcement = (self.textLabel.text ?? "") + ". " + (self.detailTextLabel.text ?? "")
@@ -138,10 +127,4 @@ final class ToastView: RSTToastView
     {
         self.show(in: view, duration: self.preferredDuration)
     }
-
-    @objc
-    func showErrorLog() {
-        guard self.opensErrorLog else { return }
-        NotificationCenter.default.post(name: ToastView.openErrorLogNotification, object: self)
-    }
 }

AltStore/Extensions/ProcessInfo+SideStore.swift

@@ -1,96 +0,0 @@
-//
-//  ProcessInfo+SideStore.swift
-//  SideStore
-//
-//  Created by ny on 10/23/24.
-//  Copyright © 2024 SideStore. All rights reserved.
-//
-
-import Foundation
-
-fileprivate struct BuildVersion: Comparable {
-    let prefix: String
-    let numericPart: Int
-    let suffix: Character?
-    
-    init?(_ buildString: String) {
-        // Initialize indices
-        var index = buildString.startIndex
-        
-        // Extract prefix (letters before the numeric part)
-        while index < buildString.endIndex, !buildString[index].isNumber {
-            index = buildString.index(after: index)
-        }
-        guard index > buildString.startIndex else { return nil }
-        self.prefix = String(buildString[buildString.startIndex..<index])
-        
-        // Extract numeric part
-        let startOfNumeric = index
-        while index < buildString.endIndex, buildString[index].isNumber {
-            index = buildString.index(after: index)
-        }
-        guard let numericValue = Int(buildString[startOfNumeric..<index]) else { return nil }
-        self.numericPart = numericValue
-        
-        // Extract suffix (if any)
-        if index < buildString.endIndex {
-            self.suffix = buildString[index]
-        } else {
-            self.suffix = nil
-        }
-    }
-    
-    // Implement Comparable protocol
-    static func < (lhs: BuildVersion, rhs: BuildVersion) -> Bool {
-        // Compare prefixes
-        if lhs.prefix != rhs.prefix {
-            return lhs.prefix < rhs.prefix
-        }
-        // Compare numeric parts
-        if lhs.numericPart != rhs.numericPart {
-            return lhs.numericPart < rhs.numericPart
-        }
-        // Compare suffixes
-        switch (lhs.suffix, rhs.suffix) {
-        case let (l?, r?):
-            return l < r
-        case (nil, _?):
-            return true // nil is considered less than any character
-        case (_?, nil):
-            return false
-        default:
-            return false // Both are nil and equal
-        }
-    }
-    
-    static func == (lhs: BuildVersion, rhs: BuildVersion) -> Bool {
-        return lhs.prefix == rhs.prefix &&
-        lhs.numericPart == rhs.numericPart &&
-        lhs.suffix == rhs.suffix
-    }
-}
-
-extension ProcessInfo {
-    var shortVersion: String {
-        operatingSystemVersionString
-            .replacingOccurrences(of: "Version ", with: "")
-            .replacingOccurrences(of: "Build ", with: "")
-    }
-    
-    var operatingSystemBuild: String {
-        if let start = shortVersion.range(of: "(")?.upperBound,
-           let end = shortVersion.range(of: ")")?.lowerBound {
-            shortVersion[start..<end].replacingOccurrences(of: "Build ", with: "")
-        } else { "???" }
-    }
-    
-    var sparseRestorePatched: Bool {
-        if operatingSystemVersion < OperatingSystemVersion(majorVersion: 18, minorVersion: 1, patchVersion: 0) { false }
-        else if operatingSystemVersion > OperatingSystemVersion(majorVersion: 18, minorVersion: 1, patchVersion: 1) { true }
-        else if operatingSystemVersion >= OperatingSystemVersion(majorVersion: 18, minorVersion: 1, patchVersion: 0),
-                let currentBuild = BuildVersion(operatingSystemBuild),
-                let targetBuild  = BuildVersion("22B5054e") {
-            currentBuild >= targetBuild
-        } else { false }
-    }
-}

AltStore/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>ALTAnisetteURL</key>
-	<string>https://ani.sidestore.io</string>
 	<key>ALTAppGroups</key>
 	<array>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>
@@ -11,10 +9,12 @@
 	</array>
 	<key>ALTDeviceID</key>
 	<string>00008101-000129D63698001E</string>
-	<key>ALTPairingFile</key>
-	<string>&lt;insert pairing file here&gt;</string>
 	<key>ALTServerID</key>
 	<string>1F7D5B55-79CE-4546-A029-D4DDC4AF3B6D</string>
+	<key>ALTPairingFile</key>
+	<string>&lt;insert pairing file here&gt;</string>
+	<key>ALTAnisetteURL</key>
+	<string>https://ani.sidestore.io</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDocumentTypes</key>
@@ -44,6 +44,8 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
@@ -91,13 +93,6 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<false/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>NSBonjourServices</key>
 	<array>
 		<string>_altserver._tcp</string>
@@ -136,10 +131,13 @@
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
-	<key>UIFileSharingEnabled</key>
-	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -206,5 +204,7 @@
 			</dict>
 		</dict>
 	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 </dict>
 </plist>

AltStore/Intents/IntentHandler.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 
-import minimuxer
 import AltStoreCore
 
 @available(iOS 14, *)
@@ -40,12 +39,8 @@ final class IntentHandler: NSObject, RefreshAllIntentHandling
         
         // Give ourselves 9 extra seconds before starting handle() timeout timer.
         // 10 seconds or longer results in timeout regardless.
-        self.queue.asyncAfter(deadline: .now() + 8.0) {
-            if minimuxer.ready() {
-                self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
-            } else {
-                self.finish(intent, response: RefreshAllIntentResponse(code: .failure, userActivity: nil))
-            }
+        self.queue.asyncAfter(deadline: .now() + 9.0) {
+            self.finish(intent, response: RefreshAllIntentResponse(code: .ready, userActivity: nil))
         }
         
         if !DatabaseManager.shared.isStarted
@@ -57,14 +52,12 @@ final class IntentHandler: NSObject, RefreshAllIntentHandling
                 }
                 else
                 {
-                    self.finish(intent, response: RefreshAllIntentResponse(code: .ready, userActivity: nil))
                     self.refreshApps(intent: intent)
                 }
             }
         }
         else
         {
-            self.finish(intent, response: RefreshAllIntentResponse(code: .ready, userActivity: nil))
             self.refreshApps(intent: intent)
         }
     }
@@ -90,11 +83,6 @@ final class IntentHandler: NSObject, RefreshAllIntentHandling
                     // We took too long to finish and return the final result,
                     // so we'll now present a normal notification when finished.
                     operation.presentsFinishedNotification = true
-                    if minimuxer.ready() {
-                        self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
-                    } else {
-                        self.finish(intent, response: RefreshAllIntentResponse(code: .failure, userActivity: nil))
-                    }
                 }
                 
                 self.finish(intent, response: RefreshAllIntentResponse(code: .inProgress, userActivity: nil))
@@ -118,9 +106,6 @@ private extension IntentHandler
             {
                 // Queue response in case refreshing finishes after confirm() but before handle().
                 self.queuedResponses[intent] = response
-                DispatchQueue.main.async {
-                    UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
-                }
             }
         }
     }
@@ -141,12 +126,10 @@ private extension IntentHandler
                     }
                     
                     self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
-                    UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                 }
-                catch ~RefreshErrorCode.noInstalledApps
+                catch RefreshError.noInstalledApps
                 {
                     self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
-                    UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                 }
                 catch let error as NSError
                 {

AltStore/LaunchViewController.swift

@@ -49,43 +49,6 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(true)
-        if #available(iOS 17, *), !UserDefaults.standard.sidejitenable {
-            DispatchQueue.global().async {
-                self.isSideJITServerDetected() { result in
-                    DispatchQueue.main.async {
-                        switch result {
-                        case .success():
-                            let dialogMessage = UIAlertController(title: "SideJITServer Detected", message: "Would you like to enable SideJITServer", preferredStyle: .alert)
-                            
-                            // Create OK button with action handler
-                            let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
-                                UserDefaults.standard.sidejitenable = true
-                            })
-                            
-                            let cancel = UIAlertAction(title: "Cancel", style: .cancel)
-                            //Add OK button to a dialog message
-                            dialogMessage.addAction(ok)
-                            dialogMessage.addAction(cancel)
-                            
-                            // Present Alert to
-                            self.present(dialogMessage, animated: true, completion: nil)
-                        case .failure(_):
-                            print("Cannot find sideJITServer")
-                        }
-                    }
-                }
-            }
-        }
-        
-        if #available(iOS 17, *), UserDefaults.standard.sidejitenable {
-            DispatchQueue.global().async {
-                self.askfornetwork()
-            }
-            print("SideJITServer Enabled")
-        }
-        
-        
-        
         #if !targetEnvironment(simulator)
         start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         
@@ -97,46 +60,6 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         #endif
     }
     
-    func askfornetwork() {
-        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
-        
-        var SJSURL = address
-        
-        if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-          SJSURL = "http://sidejitserver._http._tcp.local:8080"
-        }
-        
-        // Create a network operation at launch to Refresh SideJITServer
-        let url = URL(string: "\(SJSURL)/re/")!
-        let task = URLSession.shared.dataTask(with: url) { (data, response, error) in
-            print(data)
-        }
-        task.resume()
-    }
-    
-    func isSideJITServerDetected(completion: @escaping (Result<Void, Error>) -> Void) {
-        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
-        
-        var SJSURL = address
-        
-        if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-          SJSURL = "http://sidejitserver._http._tcp.local:8080"
-        }
-        
-        // Create a network operation at launch to Refresh SideJITServer
-        let url = URL(string: SJSURL)!
-        let task = URLSession.shared.dataTask(with: url) { (data, response, error) in
-            if let error = error {
-                print("No SideJITServer on Network")
-                completion(.failure(error))
-                return
-            }
-            completion(.success(()))
-        }
-        task.resume()
-        return
-    }
-    
     func fetchPairingFile() -> String? {
         let filename = "ALTPairingFile.mobiledevicepairing"
         let fm = FileManager.default
@@ -149,17 +72,16 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
             fm.fileExists(atPath: appResourcePath.path),
             let data = fm.contents(atPath: appResourcePath.path),
             let contents = String(data: data, encoding: .utf8),
-            !contents.isEmpty,
-            !UserDefaults.standard.isPairingReset {
+            !contents.isEmpty  {
             print("Loaded ALTPairingFile from \(appResourcePath.path)")
             return contents
-        } else if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String, !plistString.isEmpty, !plistString.contains("insert pairing file here"), !UserDefaults.standard.isPairingReset{
+        } else if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String, !plistString.isEmpty, !plistString.contains("insert pairing file here"){
             print("Loaded ALTPairingFile from Info.plist")
             return plistString
         } else {
             // Show an alert explaining the pairing file
             // Create new Alert
-            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file or select \"Help\" for help.", preferredStyle: .alert)
+            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/getting-started/#pairing-file", preferredStyle: .alert)
             
             // Create OK button with action handler
             let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
@@ -171,33 +93,14 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
                 documentPickerController.shouldShowFileExtensions = true
                 documentPickerController.delegate = self
                 self.present(documentPickerController, animated: true, completion: nil)
-                UserDefaults.standard.isPairingReset = false
              })
             
-            //Add "help" button to take user to wiki
-            let wikiOption = UIAlertAction(title: "Help", style: .default) { (action) in
-                let wikiURL: String = "https://docs.sidestore.io/docs/getting-started/pairing-file"
-                if let url = URL(string: wikiURL) {
-                    UIApplication.shared.open(url)
-                }
-                sleep(2)
-                exit(0)
-            }
-            
-            //Add buttons to dialog message
-            dialogMessage.addAction(wikiOption)
+            //Add OK button to a dialog message
             dialogMessage.addAction(ok)
 
             // Present Alert to
             self.present(dialogMessage, animated: true, completion: nil)
 
-            let dialogMessage2 = UIAlertController(title: "Analytics", message: "This app contains anonymous analytics for research and project development. By continuing to use this app, you are consenting to this data collection", preferredStyle: .alert)
-
-            let ok2 = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in})
-            
-            dialogMessage2.addAction(ok2)
-            self.present(dialogMessage2, animated: true, completion: nil)
-
             return nil
         }
     }

AltStore/Managing Apps/AppExtensionView.swift

@@ -1,81 +0,0 @@
-//
-//  AppExtensionView.swift
-//  SideStore
-//
-//  Created by June P on 8/17/24.
-//  Copyright © 2024 SideStore. All rights reserved.
-//
-
-import SwiftUI
-import CAltSign
-
-extension ALTApplication: Identifiable {}
-
-struct AppExtensionView: View {
-    var extensions: Set<ALTApplication>
-    @State var selection: [ALTApplication] = []
-        
-    var completion: (_ selection: [ALTApplication]) -> Any?
-    
-    var body: some View {
-        NavigationView {
-            List {
-                ForEach(self.extensions.sorted {
-                    $0.bundleIdentifier < $1.bundleIdentifier
-                }, id: \.self) { item in
-                    MultipleSelectionRow(title: item.bundleIdentifier, isSelected: !selection.contains(item)) {
-                        if self.selection.contains(item) {
-                            self.selection.removeAll(where: { $0 == item })
-                        }
-                        else {
-                            self.selection.append(item)
-                        }
-                    }
-                }
-            }
-            .navigationTitle("App Extensions")
-            .onDisappear {
-                _ = completion(selection)
-            }
-        }
-    }
-}
-
-struct MultipleSelectionRow: View {
-    var title: String
-    var isSelected: Bool
-    var action: () -> Void
-
-    var body: some View {
-        SwiftUI.Button(action: self.action) {
-            HStack {
-                Text(self.title)
-                if self.isSelected {
-                    Spacer()
-                    Image(systemName: "checkmark")
-                }
-            }
-        }
-    }
-}
-
-class AppExtensionViewHostingController: UIHostingController<AppExtensionView> {
-    
-    
-    var completion: Optional<(_ selection: [ALTApplication]) -> Any?> = nil
-    
-    required init(extensions: Set<ALTApplication>, completion: @escaping (_ selection: [ALTApplication]) -> Any?) {
-        self.completion = completion
-        super.init(rootView: AppExtensionView(extensions: extensions, completion: completion))
-    }
-    
-    @MainActor required dynamic init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-}
-
-extension AppExtensionViewHostingController: UIPopoverPresentationControllerDelegate {
-    func adaptivePresentationStyle(for controller: UIPresentationController) -> UIModalPresentationStyle {
-        return .none
-    }
-}

AltStore/Managing Apps/AppManager.swift

@@ -8,14 +8,12 @@
 
 import Foundation
 import UIKit
-import SwiftUI
 import UserNotifications
 import MobileCoreServices
 import Intents
 import Combine
 import WidgetKit
 
-import minimuxer
 import AltStoreCore
 import AltSign
 import Roxas
@@ -39,12 +37,17 @@ final class AppManagerPublisher: ObservableObject
     fileprivate(set) var refreshProgress = [String: Progress]()
 }
 
+private func ==(lhs: OperatingSystemVersion, rhs: OperatingSystemVersion) -> Bool
+{
+    return (lhs.majorVersion == rhs.majorVersion && lhs.minorVersion == rhs.minorVersion && lhs.patchVersion == rhs.patchVersion)
+}
+
 final class AppManager
 {
     static let shared = AppManager()
     
     private(set) var updatePatronsResult: Result<Void, Error>?
-        
+    
     private let operationQueue = OperationQueue()
     private let serialOperationQueue = OperationQueue()
 
@@ -240,7 +243,7 @@ extension AppManager
     
     func deactivateApps(for app: ALTApplication, presentingViewController: UIViewController, completion: @escaping (Result<Void, Error>) -> Void)
     {
-        guard !UserDefaults.standard.isAppLimitDisabled, let activeAppsLimit = UserDefaults.standard.activeAppsLimit else { return completion(.success(())) }
+        guard let activeAppsLimit = UserDefaults.standard.activeAppsLimit else { return completion(.success(())) }
         
         DispatchQueue.main.async {
             let activeApps = InstalledApp.fetchActiveApps(in: DatabaseManager.shared.viewContext)
@@ -314,35 +317,6 @@ extension AppManager
         
         self.run([clearAppCacheOperation], context: nil)
     }
-
-    func log(_ error: Error, operation: LoggedError.Operation, app: AppProtocol)
-    {
-        switch error {
-        case ~OperationError.Code.cancelled: return // Don't log cancelled events
-        default: break
-        }
-        // Sanitize NSError on same thread before performing background task.
-        let sanitizedError = (error as NSError).sanitizedForSerialization()
-
-        DatabaseManager.shared.persistentContainer.performBackgroundTask { context in
-            var app = app
-            if let managedApp = app as? NSManagedObject, let tempApp = context.object(with: managedApp.objectID) as? AppProtocol
-            {
-                app = tempApp
-            }
-
-            do
-            {
-                _ = LoggedError(error: sanitizedError, app: app, operation: operation, context: context)
-                try context.save()
-            }
-            catch let saveError
-            {
-                print("[ALTLog] Failed to log error \(sanitizedError.domain) code \(sanitizedError.code) for \(app.bundleIdentifier):", saveError)
-            }
-        }
-    }
-
 }
 
 extension AppManager
@@ -395,7 +369,7 @@ extension AppManager
                     case .success(let source): fetchedSources.insert(source)
                     case .failure(let error):
                         let source = managedObjectContext.object(with: source.objectID) as! Source
-                        source.error = (error as NSError).sanitizedForSerialization()
+                        source.error = (error as NSError).sanitizedForCoreData()
                         errors[source] = error
                     }
                     
@@ -483,7 +457,7 @@ extension AppManager
         group.completionHandler = { (results) in
             do
             {
-                guard let result = results.values.first else { throw context.error ?? OperationError.unknown() }
+                guard let result = results.values.first else { throw context.error ?? OperationError.unknown }
                 completionHandler(result)
             }
             catch
@@ -502,7 +476,7 @@ extension AppManager
     func update(_ app: InstalledApp, presentingViewController: UIViewController?, context: AuthenticatedOperationContext = AuthenticatedOperationContext(), completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> Progress
     {
         guard let storeApp = app.storeApp else {
-            completionHandler(.failure(OperationError.appNotFound(name: app.name)))
+            completionHandler(.failure(OperationError.appNotFound))
             return Progress.discreteProgress(totalUnitCount: 1)
         }
         
@@ -510,7 +484,7 @@ extension AppManager
         group.completionHandler = { (results) in
             do
             {
-                guard let result = results.values.first else { throw OperationError.unknown() }
+                guard let result = results.values.first else { throw OperationError.unknown }
                 completionHandler(result)
             }
             catch
@@ -546,8 +520,8 @@ extension AppManager
         group.completionHandler = { (results) in
             do
             {
-                guard let result = results.values.first else { throw OperationError.unknown() }
-
+                guard let result = results.values.first else { throw OperationError.unknown }
+                
                 let installedApp = try result.get()
                 assert(installedApp.managedObjectContext != nil)
                 
@@ -585,7 +559,7 @@ extension AppManager
             group.completionHandler = { (results) in
                 do
                 {
-                    guard let result = results.values.first else { throw OperationError.unknown() }
+                    guard let result = results.values.first else { throw OperationError.unknown }
 
                     let installedApp = try result.get()
                     assert(installedApp.managedObjectContext != nil)
@@ -611,8 +585,8 @@ extension AppManager
         group.completionHandler = { (results) in
             do
             {
-                guard let result = results.values.first else { throw OperationError.unknown() }
-
+                guard let result = results.values.first else { throw OperationError.unknown }
+                
                 let installedApp = try result.get()
                 assert(installedApp.managedObjectContext != nil)
                 
@@ -636,7 +610,7 @@ extension AppManager
         group.completionHandler = { (results) in
             do
             {
-                guard let result = results.values.first else { throw OperationError.unknown() }
+                guard let result = results.values.first else { throw OperationError.unknown }
                 
                 let installedApp = try result.get()
                 assert(installedApp.managedObjectContext != nil)
@@ -706,20 +680,13 @@ extension AppManager
             var installedApp: InstalledApp?
         }
         
-        let appName = installedApp.name
         let context = Context()
         context.installedApp = installedApp
         
         
         let enableJITOperation = EnableJITOperation(context: context)
         enableJITOperation.resultHandler = { (result) in
-            switch result {
-            case .success: completionHandler(.success(()))
-            case .failure(let nsError as NSError):
-                let localizedTitle = String(format: NSLocalizedString("Failed to enable JIT for %@", comment: ""), appName)
-                let error = nsError.withLocalizedTitle(localizedTitle)
-                self.log(error, operation: .enableJIT, app: installedApp)
-            }
+            completionHandler(result)
         }
         
         self.run([enableJITOperation], context: context, requiresSerialQueue: true)
@@ -855,18 +822,6 @@ private extension AppManager
             
             return bundleIdentifier
         }
-
-        var loggedErrorOperation: LoggedError.Operation {
-            switch self {
-            case .install: return .install
-            case .update: return .update
-            case .refresh: return .refresh
-            case .activate: return .activate
-            case .deactivate: return .deactivate
-            case .backup: return .backup
-            case .restore: return .restore
-            }
-        }
     }
     
     @discardableResult
@@ -1015,133 +970,7 @@ private extension AppManager
         return group
     }
     
-    func removeAppExtensions(
-        from application: ALTApplication,
-        existingApp: InstalledApp?,
-        extensions: Set<ALTApplication>,
-        _ presentingViewController: UIViewController?,
-        completion: @escaping (Result<Void, Error>) -> Void
-    ) {
-            
-        // App-Extensions: Ensure existing app's extensions and currently installing app's extensions must match
-        if let existingApp {
-            _ = RSTAsyncBlockOperation { _ in
-                let existingAppEx: Set<InstalledExtension> = existingApp.appExtensions
-                let currentAppEx: Set<ALTApplication> = application.appExtensions
-                
-                let currentAppExNames  = currentAppEx.map{ appEx in appEx.bundleIdentifier}
-                let existingAppExNames = existingAppEx.map{ appEx in appEx.bundleIdentifier}
-                
-                let excessExtensions = currentAppEx.filter{
-                    !(existingAppExNames.contains($0.bundleIdentifier))
-                }
-                
-                
-                let isMatching = (currentAppEx.count == existingAppEx.count) && excessExtensions.isEmpty
-                let diagnosticsMsg = "AppManager.removeAppExtensions: App Extensions in existingApp and currentApp are matching: \(isMatching)\n"
-                + "AppManager.removeAppExtensions: existingAppEx: \(existingAppExNames); currentAppEx: \(String(describing: currentAppExNames))\n"
-                print(diagnosticsMsg)
-                
-                
-                // if background mode, then remove only the excess extensions
-                guard let presentingViewController: UIViewController = presentingViewController else {
-                    // perform silent extensions cleanup for those that aren't already present in existing app
-                    print("\n    Performing background mode Extensions removal    \n")
-                    print("AppManager.removeAppExtensions: Excess Extensions: \(excessExtensions)")
-                    
-                    do {
-                        for appExtension in excessExtensions {
-                            print("Deleting extension \(appExtension.bundleIdentifier)")
-                            try FileManager.default.removeItem(at: appExtension.fileURL)
-                        }
-                        return completion(.success(()))
-                    } catch {
-                        return completion(.failure(error))
-                    }
-                }
-            }
-        }
-     
-        guard !application.appExtensions.isEmpty else { return completion(.success(())) }
-        
-        DispatchQueue.main.async {
-            let firstSentence: String
-            
-            if UserDefaults.standard.activeAppLimitIncludesExtensions
-            {
-                firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to 3 active apps and app extensions.", comment: "")
-            }
-            else
-            {
-                firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to creating 10 App IDs per week.", comment: "")
-            }
-            
-            let message = firstSentence + " " + NSLocalizedString("Would you like to remove this app's extensions so they don't count towards your limit? There are \(extensions.count) Extensions", comment: "")
-            
-            let alertController = UIAlertController(title: NSLocalizedString("App Contains Extensions", comment: ""), message: message, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
-                completion(.failure(OperationError.cancelled))
-            }))
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
-                completion(.success(()))
-            })
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in
-                do
-                {
-                    for appExtension in application.appExtensions
-                    {
-                        print("Deleting extension \(appExtension.bundleIdentifier)")
-                        try FileManager.default.removeItem(at: appExtension.fileURL)
-                    }
-                    
-                    completion(.success(()))
-                }
-                catch
-                {
-                    completion(.failure(error))
-                }
-            })
-            
-            if let presentingViewController {
-                alertController.addAction(UIAlertAction(title: NSLocalizedString("Choose App Extensions", comment: ""), style: .default) { (action) in
-                    let popoverContentController = AppExtensionViewHostingController(extensions: extensions) { (selection) in
-                        do
-                        {
-                            for appExtension in selection
-                            {
-                                print("Deleting extension \(appExtension.bundleIdentifier)")
-                                
-                                try FileManager.default.removeItem(at: appExtension.fileURL)
-                            }
-                            completion(.success(()))
-                        }
-                        catch
-                        {
-                            completion(.failure(error))
-                        }
-                        return nil
-                    }
-                    
-                    let suiview = popoverContentController.view!
-                    suiview.translatesAutoresizingMaskIntoConstraints = false
-                    
-                    popoverContentController.modalPresentationStyle = .popover
-                    
-                    if let popoverPresentationController = popoverContentController.popoverPresentationController {
-                        popoverPresentationController.sourceView = presentingViewController.view
-                        popoverPresentationController.sourceRect = CGRect(x: 50, y: 50, width: 4, height: 4)
-                        popoverPresentationController.delegate = popoverContentController
-                        
-                        presentingViewController.present(popoverContentController, animated: true)
-                    }
-                })
-                
-                presentingViewController.present(alertController, animated: true)
-            }
-        }
-    }
-    
-    private func _install(_ app: AppProtocol, operation appOperation: AppOperation, group: RefreshGroup, context: InstallAppOperationContext? = nil, additionalEntitlements: [ALTEntitlement: Any] = [.increasedDebuggingMemoryLimit: ALTEntitlement.increasedDebuggingMemoryLimit, .increasedMemoryLimit: ALTEntitlement.increasedMemoryLimit, .extendedVirtualAddressing: ALTEntitlement.extendedVirtualAddressing], cacheApp: Bool = true, completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> Progress
+    private func _install(_ app: AppProtocol, operation appOperation: AppOperation, group: RefreshGroup, context: InstallAppOperationContext? = nil, additionalEntitlements: [ALTEntitlement: Any]? = nil, cacheApp: Bool = true, completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> Progress
     {
         let progress = Progress.discreteProgress(totalUnitCount: 100)
         
@@ -1213,52 +1042,6 @@ private extension AppManager
         }
         verifyOperation.addDependency(downloadOperation)
         
-        /* Remove App Extensions */
-        
-        let removeAppExtensionsOperation = RSTAsyncBlockOperation { [weak self] (operation) in
-            do
-            {
-                if let error = context.error
-                {
-                    throw error
-                }
-/*
-                guard case .install = appOperation else {
-                    operation.finish()
-                    return
-                }
-*/
-                guard let extensions = context.app?.appExtensions else {
-                    throw OperationError.invalidParameters("AppManager._install.removeAppExtensionsOperation: context.app?.appExtensions is nil")
-                }
-                
-                guard let currentApp = context.app else {
-                    throw OperationError.invalidParameters("AppManager._install.removeAppExtensionsOperation: context.app is nil")
-                }
-                
-                
-                self?.removeAppExtensions(from: currentApp,
-                                          existingApp: app as? InstalledApp,
-                                          extensions: extensions,
-                                          context.authenticatedContext.presentingViewController
-                ) { result in
-                    switch result {
-                    case .success(): break
-                    case .failure(let error): context.error = error
-                    }
-                    operation.finish()
-                }
-                
-            }
-            catch
-            {
-                context.error = error
-                operation.finish()
-            }
-        }
-        
-        removeAppExtensionsOperation.addDependency(verifyOperation)
-        
         
         /* Refresh Anisette Data */
         let refreshAnisetteDataOperation = FetchAnisetteDataOperation(context: group.context)
@@ -1269,7 +1052,7 @@ private extension AppManager
             case .success(let anisetteData): group.context.session?.anisetteData = anisetteData
             }
         }
-        refreshAnisetteDataOperation.addDependency(removeAppExtensionsOperation)
+        refreshAnisetteDataOperation.addDependency(verifyOperation)
 
 
         /* Fetch Provisioning Profiles */
@@ -1279,9 +1062,7 @@ private extension AppManager
             switch result
             {
             case .failure(let error): context.error = error
-            case .success(let provisioningProfiles): 
-                context.provisioningProfiles = provisioningProfiles
-                print("PROVISIONING PROFILES \(context.provisioningProfiles)")
+            case .success(let provisioningProfiles): context.provisioningProfiles = provisioningProfiles
             }
         }
         fetchProvisioningProfilesOperation.addDependency(refreshAnisetteDataOperation)
@@ -1304,20 +1085,13 @@ private extension AppManager
                     throw error
                 }
                 
-                guard let profiles = context.provisioningProfiles else {
-                    throw OperationError.invalidParameters("AppManager._install.deactivateAppsOperation: context.provisioningProfiles is nil")
-                }
+                guard let profiles = context.provisioningProfiles else { throw OperationError.invalidParameters }
                 if !profiles.contains(where: { $1.isFreeProvisioningProfile == true }) {
                     operation.finish()
                     return
                 }
                                 
-                guard
-                    let app = context.app,
-                    let presentingViewController = context.authenticatedContext.presentingViewController
-                else {
-                    throw OperationError.invalidParameters("AppManager._install.deactivateAppsOperation: self.context.app or context.authenticatedContext.presentingViewController is nil")
-                }
+                guard let app = context.app, let presentingViewController = context.authenticatedContext.presentingViewController else { throw OperationError.invalidParameters }
                 
                 self?.deactivateApps(for: app, presentingViewController: presentingViewController) { result in
                     switch result
@@ -1337,6 +1111,7 @@ private extension AppManager
         }
         deactivateAppsOperation.addDependency(fetchProvisioningProfilesOperation)
         
+        
         /* Patch App */
         let patchAppOperation = RSTAsyncBlockOperation { operation in
             do
@@ -1356,9 +1131,7 @@ private extension AppManager
                     throw error
                 }
                 
-                guard let app = context.app else {
-                    throw OperationError.invalidParameters("AppManager._install.patchAppOperation: context.app is nil")
-                }
+                guard let app = context.app else { throw OperationError.invalidParameters }
                 
                 guard let isUntetherRequired = app.bundle.infoDictionary?[Bundle.Info.untetherRequired] as? Bool,
                       let minimumiOSVersionString = app.bundle.infoDictionary?[Bundle.Info.untetherMinimumiOSVersion] as? String,
@@ -1463,7 +1236,7 @@ private extension AppManager
         progress.addChild(installOperation.progress, withPendingUnitCount: 30)
         installOperation.addDependency(sendAppOperation)
         
-        let operations = [downloadOperation, verifyOperation, removeAppExtensionsOperation, refreshAnisetteDataOperation, fetchProvisioningProfilesOperation, deactivateAppsOperation, patchAppOperation, resignAppOperation, sendAppOperation, installOperation]
+        let operations = [downloadOperation, verifyOperation, refreshAnisetteDataOperation, fetchProvisioningProfilesOperation, deactivateAppsOperation, patchAppOperation, resignAppOperation, sendAppOperation, installOperation]
         group.add(operations)
         self.run(operations, context: group.context)
         
@@ -1477,24 +1250,6 @@ private extension AppManager
         let context = AppOperationContext(bundleIdentifier: app.bundleIdentifier, authenticatedContext: group.context)
         context.app = ALTApplication(fileURL: app.fileURL)
         
-        //App-Extensions: Ensure DB data and disk state must match
-        let dbAppEx: Set<InstalledExtension> = Set(app.appExtensions)
-        let diskAppEx: Set<ALTApplication> = Set(context.app!.appExtensions)
-        let diskAppExNames = diskAppEx.map { $0.bundleIdentifier }
-        let dbAppExNames = dbAppEx.map{ $0.bundleIdentifier }            
-        let isMatching = Set(dbAppExNames) == Set(diskAppExNames)
-
-        let validateAppExtensionsOperation = RSTAsyncBlockOperation { op in
-            
-            let errMessage = "AppManager.refresh: App Extensions in DB and Disk are matching: \(isMatching)\n"
-                           + "AppManager.refresh: dbAppEx: \(dbAppExNames); diskAppEx: \(String(describing: diskAppExNames))\n"
-            print(errMessage)
-            if(!isMatching){
-                completionHandler(.failure(OperationError.refreshAppFailed(message: errMessage)))
-            }
-            op.finish()
-        }
-        
         /* Fetch Provisioning Profiles */
         let fetchProvisioningProfilesOperation = FetchProvisioningProfilesOperation(context: context)
         fetchProvisioningProfilesOperation.resultHandler = { (result) in
@@ -1505,8 +1260,6 @@ private extension AppManager
             }
         }
         progress.addChild(fetchProvisioningProfilesOperation.progress, withPendingUnitCount: 60)
-        fetchProvisioningProfilesOperation.addDependency(validateAppExtensionsOperation)
-        
         
         /* Refresh */
         let refreshAppOperation = RefreshAppOperation(context: context)
@@ -1516,21 +1269,14 @@ private extension AppManager
             case .success(let installedApp):
                 completionHandler(.success(installedApp))
                 
-            case .failure(MinimuxerError.ProfileInstall):
-                completionHandler(.failure(OperationError.noWiFi))
-                
-            case .failure(ALTServerError.unknownRequest), .failure(OperationError.appNotFound(name: app.name)):
+            case .failure(ALTServerError.unknownRequest), .failure(OperationError.appNotFound):
                 // Fall back to installation if AltServer doesn't support newer provisioning profile requests,
                 // OR if the cached app could not be found and we may need to redownload it.
                 app.managedObjectContext?.performAndWait { // Must performAndWait to ensure we add operations before we return.
-                    if minimuxer.ready() {
-                        let installProgress = self._install(app, operation: operation, group: group) { (result) in
-                            completionHandler(result)
-                        }
-                        progress.addChild(installProgress, withPendingUnitCount: 40)
-                    } else {
-                        completionHandler(.failure(OperationError.noWiFi))
+                    let installProgress = self._install(app, operation: operation, group: group) { (result) in
+                        completionHandler(result)
                     }
+                    progress.addChild(installProgress, withPendingUnitCount: 40)
                 }
                 
             case .failure(let error):
@@ -1540,7 +1286,7 @@ private extension AppManager
         progress.addChild(refreshAppOperation.progress, withPendingUnitCount: 40)
         refreshAppOperation.addDependency(fetchProvisioningProfilesOperation)
         
-        let operations = [validateAppExtensionsOperation, fetchProvisioningProfilesOperation, refreshAppOperation]
+        let operations = [fetchProvisioningProfilesOperation, refreshAppOperation]
         group.add(operations)
         self.run(operations, context: group.context)
 
@@ -1797,7 +1543,7 @@ private extension AppManager
         }
         
         guard let application = ALTApplication(fileURL: app.fileURL) else {
-            completionHandler(.failure(OperationError.appNotFound(name: app.name)))
+            completionHandler(.failure(OperationError.appNotFound))
             return progress
         }
         
@@ -1809,8 +1555,8 @@ private extension AppManager
                     let temporaryDirectoryURL = context.temporaryDirectory.appendingPathComponent("AltBackup-" + UUID().uuidString)
                     try FileManager.default.createDirectory(at: temporaryDirectoryURL, withIntermediateDirectories: true, attributes: nil)
                     
-                    guard let altbackupFileURL = Bundle.main.url(forResource: "AltBackup", withExtension: "ipa") else { throw OperationError.appNotFound(name: app.name) }
-
+                    guard let altbackupFileURL = Bundle.main.url(forResource: "AltBackup", withExtension: "ipa") else { throw OperationError.appNotFound }
+                    
                     let unzippedAppBundleURL = try FileManager.default.unzipAppBundle(at: altbackupFileURL, toDirectory: temporaryDirectoryURL)
                     guard let unzippedAppBundle = Bundle(url: unzippedAppBundleURL) else { throw OperationError.invalidApp }
                     
@@ -1948,35 +1694,11 @@ private extension AppManager
             do { try installedApp.managedObjectContext?.save() }
             catch { print("Error saving installed app.", error) }
         }
-        catch let nsError as NSError
+        catch
         {
-            var appName: String!
-            if let app = operation.app as? (NSManagedObject & AppProtocol) {
-                if let context = app.managedObjectContext {
-                    context.performAndWait {
-                        appName = app.name
-                    }
-                } else {
-                    appName = NSLocalizedString("Unknown App", comment: "")
-                }
-            } else {
-                appName = operation.app.name
-            }
-
-            let localizedTitle: String
-            switch operation {
-            case .install: localizedTitle = String(format: NSLocalizedString("Failed to Install %@", comment: ""), appName)
-            case .refresh: localizedTitle = String(format: NSLocalizedString("Failed to Refresh %@", comment: ""), appName)
-            case .update: localizedTitle = String(format: NSLocalizedString("Failed to Update %@", comment: ""), appName)
-            case .activate: localizedTitle = String(format: NSLocalizedString("Failed to Activate %@", comment: ""), appName)
-            case .deactivate: localizedTitle = String(format: NSLocalizedString("Failed to Deactivate %@", comment: ""), appName)
-            case .backup: localizedTitle = String(format: NSLocalizedString("Failed to Backup %@", comment: ""), appName)
-            case .restore: localizedTitle = String(format: NSLocalizedString("Failed to Restore %@ Backup", comment: ""), appName)
-            }
-            let error = nsError.withLocalizedTitle(localizedTitle)
             group.set(.failure(error), forAppWithBundleIdentifier: operation.bundleIdentifier)
             
-            self.log(error, operation: operation.loggedErrorOperation, app: operation.app)
+            self.log(error, for: operation)
         }
     }
     
@@ -1993,8 +1715,8 @@ private extension AppManager
         let trigger = UNTimeIntervalNotificationTrigger(timeInterval: timeIntervalUntilNotification, repeats: false)
         
         let content = UNMutableNotificationContent()
-        content.title = NSLocalizedString("SideStore Expiring Soon", comment: "")
-        content.body = NSLocalizedString("SideStore will expire in 24 hours. Open the app and refresh it to prevent it from expiring.", comment: "")
+        content.title = NSLocalizedString("AltStore Expiring Soon", comment: "")
+        content.body = NSLocalizedString("AltStore will expire in 24 hours. Open the app and refresh it to prevent it from expiring.", comment: "")
         content.sound = .default
         
         let request = UNNotificationRequest(identifier: AppManager.expirationWarningNotificationID, content: content, trigger: trigger)
@@ -2004,7 +1726,7 @@ private extension AppManager
     func log(_ error: Error, for operation: AppOperation)
     {
         // Sanitize NSError on same thread before performing background task.
-        let sanitizedError = (error as NSError).sanitizedForSerialization()
+        let sanitizedError = (error as NSError).sanitizedForCoreData()
         
         let loggedErrorOperation: LoggedError.Operation = {
             switch operation

AltStore/Managing Apps/AppManagerErrors.swift

@@ -22,27 +22,13 @@ extension AppManager
         
         var managedObjectContext: NSManagedObjectContext?
         
-        var localizedTitle: String? {
-            var localizedTitle: String?
-            self.managedObjectContext?.performAndWait {
-                if self.sources?.count == 1 {
-                    localizedTitle = NSLocalizedString("Failed to refresh Store", comment: "")
-                } else if self.errors.count == 1 {
-                    guard let source = self.errors.keys.first else { return }
-                    localizedTitle = String(format: NSLocalizedString("Failed to refresh Source '%@'", comment: ""), source.name)
-                } else {
-                    localizedTitle = String(format: NSLocalizedString("Failed to refresh %@ Sources", comment: ""), NSNumber(value: self.errors.count))
-                }
-            }
-            return localizedTitle
-        }
-
         var errorDescription: String? {
-            if let error = self.primaryError {
+            if let error = self.primaryError
+            {
                 return error.localizedDescription
-            } else if let error = self.errors.values.first, self.errors.count == 1 {
-                return error.localizedDescription
-            } else {
+            }
+            else
+            {
                 var localizedDescription: String?
                 
                 self.managedObjectContext?.performAndWait {
@@ -81,14 +67,8 @@ extension AppManager
         }
         
         var errorUserInfo: [String : Any] {
-            let errors = Array(self.errors.values)
-            var userInfo = [String: Any]()
-            userInfo[ALTLocalizedTitleErrorKey] = self.localizedTitle
-            userInfo[NSUnderlyingErrorKey] = self.primaryError
-            if #available(iOS 14.5, *), !errors.isEmpty {
-                userInfo[NSMultipleUnderlyingErrorsKey] = errors
-            }
-            return userInfo
+            guard let error = self.errors.values.first, self.errors.count == 1 else { return [:] }
+            return [NSUnderlyingErrorKey: error]
         }
         
         init(_ error: Error)

AltStore/My Apps/MyAppsViewController.swift

@@ -155,13 +155,6 @@ final class MyAppsViewController: UICollectionViewController
     @IBAction func unwindToMyAppsViewController(_ segue: UIStoryboardSegue)
     {
     }
-    var minimuxerStatus: Bool {
-        guard minimuxer.ready() else {
-            ToastView(error: (OperationError.noWiFi as NSError).withLocalizedTitle("No WiFi or VPN!")).show(in: self)
-            return false
-        }
-        return true
-    }
 }
 
 private extension MyAppsViewController
@@ -195,7 +188,7 @@ private extension MyAppsViewController
     func makeUpdatesDataSource() -> RSTFetchedResultsCollectionViewPrefetchingDataSource<InstalledApp, UIImage>
     {
         let fetchRequest = InstalledApp.updatesFetchRequest()
-        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \InstalledApp.storeApp?.latestSupportedVersion?.date, ascending: false),
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \InstalledApp.storeApp?.latestVersion?.date, ascending: true),
                                         NSSortDescriptor(keyPath: \InstalledApp.name, ascending: true)]
         fetchRequest.returnsObjectsAsFaults = false
         
@@ -204,21 +197,21 @@ private extension MyAppsViewController
         dataSource.cellIdentifierHandler = { _ in "UpdateCell" }
         dataSource.cellConfigurationHandler = { [weak self] (cell, installedApp, indexPath) in
             guard let self = self else { return }
-            guard let app = installedApp.storeApp, let latestSupportedVersion = app.latestSupportedVersion else { return }
+            guard let app = installedApp.storeApp, let latestVersion = app.latestVersion else { return }
             
             let cell = cell as! UpdateCollectionViewCell
             cell.layoutMargins.left = self.view.layoutMargins.left
             cell.layoutMargins.right = self.view.layoutMargins.right
             
             cell.tintColor = app.tintColor ?? .altPrimary
-            cell.versionDescriptionTextView.text = latestSupportedVersion.localizedDescription
+            cell.versionDescriptionTextView.text = app.versionDescription
             
             cell.bannerView.iconImageView.image = nil
             cell.bannerView.iconImageView.isIndicatingActivity = true
             
             cell.bannerView.configure(for: app)
             
-            let versionDate = Date().relativeDateString(since: latestSupportedVersion.date, dateFormatter: self.dateFormatter)
+            let versionDate = Date().relativeDateString(since: latestVersion.date, dateFormatter: self.dateFormatter)
             cell.bannerView.subtitleLabel.text = versionDate
             
             let appName: String
@@ -232,7 +225,7 @@ private extension MyAppsViewController
                 appName = app.name
             }
             
-            cell.bannerView.accessibilityLabel = String(format: NSLocalizedString("%@ %@ update. Released on %@.", comment: ""), appName, latestSupportedVersion.version, versionDate)
+            cell.bannerView.accessibilityLabel = String(format: NSLocalizedString("%@ %@ update. Released on %@.", comment: ""), appName, latestVersion.version, versionDate)
             
             cell.bannerView.button.isIndicatingActivity = false
             cell.bannerView.button.addTarget(self, action: #selector(MyAppsViewController.updateApp(_:)), for: .primaryActionTriggered)
@@ -535,9 +528,11 @@ private extension MyAppsViewController
                 
                 guard !failures.isEmpty else { return }
                 
+                let toastView: ToastView
+                
                 if let failure = failures.first, results.count == 1
                 {
-                    ToastView(error: failure.value).show(in: self)
+                    toastView = ToastView(error: failure.value)
                 }
                 else
                 {
@@ -555,10 +550,11 @@ private extension MyAppsViewController
                     let error = failures.first?.value as NSError?
                     let detailText = error?.localizedFailure ?? error?.localizedFailureReason ?? error?.localizedDescription
                     
-                    let toastView = ToastView(text: localizedText, detailText: detailText, opensLog: true)
+                    toastView = ToastView(text: localizedText, detailText: detailText)
                     toastView.preferredDuration = 4.0
-                    toastView.show(in: self)
                 }
+                
+                toastView.show(in: self)
             }
             
             self.refreshGroup = nil
@@ -649,7 +645,11 @@ private extension MyAppsViewController
     
     @IBAction func refreshAllApps(_ sender: UIBarButtonItem)
     {
-        guard minimuxerStatus else { return }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
 
         self.isRefreshingAllApps = true
         self.collectionView.collectionViewLayout.invalidateLayout()
@@ -694,7 +694,8 @@ private extension MyAppsViewController
                     self.collectionView.reloadItems(at: [indexPath])
                     
                 case .failure(let error):
-                    ToastView(error: error, opensLog: true).show(in: self)
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
                     
                     self.collectionView.reloadItems(at: [indexPath])
                     
@@ -712,7 +713,11 @@ private extension MyAppsViewController
     
     @IBAction func sideloadApp(_ sender: UIBarButtonItem)
     {
-        guard minimuxerStatus else { return }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
 
         let supportedTypes = UTType.types(tag: "ipa", tagClass: .filenameExtension, conformingTo: nil)
         
@@ -783,7 +788,7 @@ private extension MyAppsViewController
         }
         
         let unzipProgress = Progress.discreteProgress(totalUnitCount: 1)
-        let unzipAppOperation = BlockOperation { 
+        let unzipAppOperation = BlockOperation {
             do
             {
                 if let error = context.error
@@ -791,9 +796,7 @@ private extension MyAppsViewController
                     throw error
                 }
                 
-                guard let fileURL = context.fileURL else {
-                    throw OperationError.invalidParameters("MyAppsViewController.sideloadApp.unzipAppOperation: context.fileURL is nil")
-                }
+                guard let fileURL = context.fileURL else { throw OperationError.invalidParameters }
                 defer {
                     try? FileManager.default.removeItem(at: fileURL)
                 }
@@ -817,7 +820,38 @@ private extension MyAppsViewController
         {
             unzipAppOperation.addDependency(downloadOperation)
         }
+        
+        let removeAppExtensionsProgress = Progress.discreteProgress(totalUnitCount: 1)
+        let removeAppExtensionsOperation = RSTAsyncBlockOperation { [weak self] (operation) in
+            do
+            {
+                if let error = context.error
+                {
+                    throw error
+                }
                 
+                guard let application = context.application else { throw OperationError.invalidParameters }
+                
+                DispatchQueue.main.async {
+                    self?.removeAppExtensions(from: application) { (result) in
+                        switch result
+                        {
+                        case .success: removeAppExtensionsProgress.completedUnitCount = 1
+                        case .failure(let error): context.error = error
+                        }
+                        operation.finish()
+                    }
+                }
+            }
+            catch
+            {
+                context.error = error
+                operation.finish()
+            }
+        }
+        removeAppExtensionsOperation.addDependency(unzipAppOperation)
+        progress.addChild(removeAppExtensionsProgress, withPendingUnitCount: 5)
+        
         let installProgress = Progress.discreteProgress(totalUnitCount: 100)
         let installAppOperation = RSTAsyncBlockOperation { (operation) in
             do
@@ -827,9 +861,7 @@ private extension MyAppsViewController
                     throw error
                 }
                 
-                guard let application = context.application else {
-                    throw OperationError.invalidParameters("MyAppsViewController.sideloadApp.installAppOperation: context.application is nil")
-                }
+                guard let application = context.application else { throw OperationError.invalidParameters }
                 
                 let group = AppManager.shared.install(application, presentingViewController: self) { (result) in
                     switch result
@@ -868,23 +900,22 @@ private extension MyAppsViewController
                     completion(.failure((OperationError.cancelled)))
                     
                 case .failure(let error):
-                    ToastView(error: error, opensLog: true).show(in: self)
-
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
+                    
                     completion(.failure(error))
                 }
             }
         }
-        
-        installAppOperation.addDependency(unzipAppOperation)
-        
         progress.addChild(installProgress, withPendingUnitCount: 65)
+        installAppOperation.addDependency(removeAppExtensionsOperation)
         
         self.sideloadingProgress = progress
         self.sideloadingProgressView.progress = 0
         self.sideloadingProgressView.isHidden = false
         self.sideloadingProgressView.observedProgress = self.sideloadingProgress
         
-        let operations = [downloadOperation, unzipAppOperation, installAppOperation].compactMap { $0 }
+        let operations = [downloadOperation, unzipAppOperation, removeAppExtensionsOperation, installAppOperation].compactMap { $0 }
         self.operationQueue.addOperations(operations, waitUntilFinished: false)
     }
     
@@ -933,6 +964,49 @@ private extension MyAppsViewController
         
         cell.bannerView.iconImageView.isIndicatingActivity = false
     }
+    
+    func removeAppExtensions(from application: ALTApplication, completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        guard !application.appExtensions.isEmpty else { return completion(.success(())) }
+        
+        let firstSentence: String
+        
+        if UserDefaults.standard.activeAppLimitIncludesExtensions
+        {
+            firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to 3 active apps and app extensions.", comment: "")
+        }
+        else
+        {
+            firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to creating 10 App IDs per week.", comment: "")
+        }
+        
+        let message = firstSentence + " " + NSLocalizedString("Would you like to remove this app's extensions so they don't count towards your limit?", comment: "")
+        
+        let alertController = UIAlertController(title: NSLocalizedString("App Contains Extensions", comment: ""), message: message, preferredStyle: .alert)
+        alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
+            completion(.failure(OperationError.cancelled))
+        }))
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
+            completion(.success(()))
+        })
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in
+            do
+            {
+                for appExtension in application.appExtensions
+                {
+                    try FileManager.default.removeItem(at: appExtension.fileURL)
+                }
+                
+                completion(.success(()))
+            }
+            catch
+            {
+                completion(.failure(error))
+            }
+        })
+        
+        self.present(alertController, animated: true, completion: nil)
+    }
 }
 
 private extension MyAppsViewController
@@ -942,13 +1016,18 @@ private extension MyAppsViewController
         UIApplication.shared.open(installedApp.openAppURL) { success in
             guard !success else { return }
             
-            ToastView(error: OperationError.openAppFailed(name: installedApp.name), opensLog: true).show(in: self)
+            let toastView = ToastView(error: OperationError.openAppFailed(name: installedApp.name))
+            toastView.show(in: self)
         }
     }
     
     func refresh(_ installedApp: InstalledApp)
     {
-        guard minimuxerStatus else { return }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
 
         let previousProgress = AppManager.shared.refreshProgress(for: installedApp)
         guard previousProgress == nil else {
@@ -971,7 +1050,11 @@ private extension MyAppsViewController
     
     func activate(_ installedApp: InstalledApp)
     {
-        guard minimuxerStatus else { return }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
 
         func finish(_ result: Result<InstalledApp, Error>)
         {
@@ -993,12 +1076,13 @@ private extension MyAppsViewController
                 DispatchQueue.main.async {
                     installedApp.isActive = false
                     
-                    ToastView(error: error, opensLog: true).show(in: self)
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
                 }
             }
         }
                 
-        if !UserDefaults.standard.isAppLimitDisabled && UserDefaults.standard.activeAppsLimit != nil, #available(iOS 13, *)
+        if UserDefaults.standard.activeAppsLimit != nil, #available(iOS 13, *)
         {
             // UserDefaults.standard.activeAppsLimit is only non-nil on iOS 13.3.1 or later, so the #available check is just so we can use Combine.
             
@@ -1047,8 +1131,12 @@ private extension MyAppsViewController
     
     func deactivate(_ installedApp: InstalledApp, completionHandler: ((Result<InstalledApp, Error>) -> Void)? = nil)
     {
-        guard installedApp.isActive, minimuxerStatus else { return }
-
+        guard installedApp.isActive else { return }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
         installedApp.isActive = false
         
         AppManager.shared.deactivate(installedApp, presentingViewController: self) { (result) in
@@ -1061,12 +1149,13 @@ private extension MyAppsViewController
             }
             catch
             {
-                print("Failed to deactivate app:", error)
+                print("Failed to activate app:", error)
                 
                 DispatchQueue.main.async {
                     installedApp.isActive = true
                     
-                    ToastView(error: error, opensLog: true).show(in: self)
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
                 }
             }
             
@@ -1088,7 +1177,7 @@ private extension MyAppsViewController
             message = NSLocalizedString("This will also erase all backup data for this app.", comment: "")
         }
 
-        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: .actionSheet)
         alertController.addAction(.cancel)
         alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove", comment: ""), style: .destructive, handler: { (action) in
             AppManager.shared.remove(installedApp) { (result) in
@@ -1097,7 +1186,8 @@ private extension MyAppsViewController
                 case .success: break
                 case .failure(let error):
                     DispatchQueue.main.async {
-                        ToastView(error: error, opensLog: true).show(in: self)
+                        let toastView = ToastView(error: error)
+                        toastView.show(in: self)
                     }
                 }
             }
@@ -1108,8 +1198,11 @@ private extension MyAppsViewController
     
     func backup(_ installedApp: InstalledApp)
     {
-        guard minimuxerStatus else { return }
-
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
         let title = NSLocalizedString("Start Backup?", comment: "")
         let message = NSLocalizedString("This will replace any previous backups. Please leave SideStore open until the backup is complete.", comment: "")
 
@@ -1131,8 +1224,9 @@ private extension MyAppsViewController
                     print("Failed to back up app:", error)
                     
                     DispatchQueue.main.async {
-                        ToastView(error: error, opensLog: true).show(in: self)
-
+                        let toastView = ToastView(error: error)
+                        toastView.show(in: self)
+                        
                         self.collectionView.reloadSections([Section.activeApps.rawValue, Section.inactiveApps.rawValue])
                     }
                 }
@@ -1148,8 +1242,11 @@ private extension MyAppsViewController
     
     func restore(_ installedApp: InstalledApp)
     {
-        guard minimuxerStatus else { return }
-
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
+            return
+        }
         let message = String(format: NSLocalizedString("This will replace all data you currently have in %@.", comment: ""), installedApp.name)
         let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to restore this backup?", comment: ""), message: message, preferredStyle: .actionSheet)
         alertController.addAction(.cancel)
@@ -1167,7 +1264,8 @@ private extension MyAppsViewController
                     print("Failed to restore app:", error)
                     
                     DispatchQueue.main.async {
-                        ToastView(error: error, opensLog: true).show(in: self)
+                        let toastView = ToastView(error: error)
+                        toastView.show(in: self)
                     }
                 }
             }
@@ -1242,7 +1340,8 @@ private extension MyAppsViewController
                 print("Failed to change app icon.", error)
                 
                 DispatchQueue.main.async {
-                    ToastView(error: error, opensLog: true).show(in: self)
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
                 }
             }
         }
@@ -1251,28 +1350,24 @@ private extension MyAppsViewController
     @available(iOS 14, *)
     func enableJIT(for installedApp: InstalledApp)
     {
-        
-        let sidejitenabled = UserDefaults.standard.sidejitenable
-        
-        if #unavailable(iOS 17) {
-            guard minimuxerStatus else { return }
-        }
-        
-
-        if #available(iOS 17, *), !sidejitenabled {
-            ToastView(error: (OperationError.tooNewError as NSError).withLocalizedTitle("No iOS 17 On Device JIT!"), opensLog: true).show(in: self)
-            AppManager.shared.log(OperationError.tooNewError, operation: .enableJIT, app: installedApp)
+        if #available(iOS 17, *) {
+            let toastView = ToastView(error: OperationError.tooNewError)
+            toastView.show(in: self)
+            return
+        }
+        if !minimuxer.ready() {
+            let toastView = ToastView(error: MinimuxerError.NoConnection)
+            toastView.show(in: self)
             return
         }
-        
         AppManager.shared.enableJIT(for: installedApp) { result in
             DispatchQueue.main.async {
                 switch result
                 {
                 case .success: break
                 case .failure(let error):
-                    ToastView(error: error, opensLog: true).show(in: self)
-                    AppManager.shared.log(error, operation: .enableJIT, app: installedApp)
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self.navigationController?.view ?? self.view, duration: 5)
                 }
             }
         }
@@ -1358,7 +1453,7 @@ extension MyAppsViewController
                 headerView.layoutMargins.left = self.view.layoutMargins.left
                 headerView.layoutMargins.right = self.view.layoutMargins.right
                 
-                if UserDefaults.standard.activeAppsLimit == nil || UserDefaults.standard.isAppLimitDisabled
+                if UserDefaults.standard.activeAppsLimit == nil
                 {
                     headerView.textLabel.text = NSLocalizedString("Installed", comment: "")
                 }
@@ -1757,7 +1852,7 @@ extension MyAppsViewController: UICollectionViewDragDelegate
             return []
             
         case .activeApps, .inactiveApps:
-            guard UserDefaults.standard.activeAppsLimit != nil && !UserDefaults.standard.isAppLimitDisabled else { return [] }
+            guard UserDefaults.standard.activeAppsLimit != nil else { return [] }
             guard let cell = collectionView.cellForItem(at: indexPath as IndexPath) as? InstalledAppCollectionViewCell else { return [] }
             
             let item = self.dataSource.item(at: indexPath)
@@ -1812,7 +1907,6 @@ extension MyAppsViewController: UICollectionViewDropDelegate
     func collectionView(_ collectionView: UICollectionView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal
     {
         guard
-            !UserDefaults.standard.isAppLimitDisabled,
             let activeAppsLimit = UserDefaults.standard.activeAppsLimit,
             let installedApp = session.items.first?.localObject as? InstalledApp
         else { return UICollectionViewDropProposal(operation: .cancel) }

AltStore/News/NewsViewController.swift

@@ -313,8 +313,9 @@ private extension NewsViewController
                 {
                 case .failure(OperationError.cancelled): break // Ignore
                 case .failure(let error):
-                    ToastView(error: error, opensLog: true).show(in: self)
-
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
+                    
                 case .success: print("Installed app:", storeApp.bundleIdentifier)
                 }
                 
@@ -390,9 +391,9 @@ extension NewsViewController
             let progress = AppManager.shared.installationProgress(for: storeApp)
             footerView.bannerView.button.progress = progress
             
-            if let versionDate = storeApp.latestSupportedVersion?.date, versionDate > Date()
+            if let versionDate = storeApp.latestVersion?.date, versionDate > Date()
             {
-                footerView.bannerView.button.countdownDate = versionDate
+                footerView.bannerView.button.countdownDate = storeApp.versionDate
             }
             else
             {

AltStore/Operations/AuthenticationOperation.swift

@@ -14,8 +14,7 @@ import AltStoreCore
 import AltSign
 import minimuxer
 
-typealias AuthenticationError = AuthenticationErrorCode.Error
-enum AuthenticationErrorCode: Int, ALTErrorEnum, CaseIterable
+enum AuthenticationError: LocalizedError
 {
     case noTeam
     case noCertificate
@@ -24,11 +23,11 @@ enum AuthenticationErrorCode: Int, ALTErrorEnum, CaseIterable
     case missingPrivateKey
     case missingCertificate
     
-    var errorFailureReason: String {
+    var errorDescription: String? {
         switch self {
-        case .noTeam: return NSLocalizedString("Your Apple ID has no developer teams?", comment: "")
-        case .noCertificate: return NSLocalizedString("The developer certificate could not be found.", comment: "")
+        case .noTeam: return NSLocalizedString("Developer team could not be found.", comment: "")
         case .teamSelectorError: return NSLocalizedString("Error presenting team selector view.", comment: "")
+        case .noCertificate: return NSLocalizedString("Developer certificate could not be found.", comment: "")
         case .missingPrivateKey: return NSLocalizedString("The certificate's private key could not be found.", comment: "")
         case .missingCertificate: return NSLocalizedString("The certificate could not be found.", comment: "")
         }
@@ -214,8 +213,8 @@ final class AuthenticationOperation: ResultOperation<(ALTTeam, ALTCertificate, A
                 guard
                     let account = Account.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Account.identifier), altTeam.account.identifier), in: context),
                     let team = Team.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Team.identifier), altTeam.identifier), in: context)
-                else { throw AuthenticationError(.noTeam) }
-
+                else { throw AuthenticationError.noTeam }
+                
                 // Account
                 account.isActiveAccount = true
                 
@@ -241,11 +240,12 @@ final class AuthenticationOperation: ResultOperation<(ALTTeam, ALTCertificate, A
                 }
                 
                 let activeAppsMinimumVersion = OperatingSystemVersion(majorVersion: 13, minorVersion: 3, patchVersion: 1)
-                if team.type == .free, !UserDefaults.standard.isAppLimitDisabled, ProcessInfo().sparseRestorePatched {
+                if team.type == .free, ProcessInfo.processInfo.isOperatingSystemAtLeast(activeAppsMinimumVersion)
+                {
                     UserDefaults.standard.activeAppsLimit = ALTActiveAppsLimit
-                } else if UserDefaults.standard.isAppLimitDisabled, !ProcessInfo().sparseRestorePatched {
-                    UserDefaults.standard.activeAppsLimit = 10
-                } else {
+                }
+                else
+                {
                     UserDefaults.standard.activeAppsLimit = nil
                 }
                 
@@ -432,7 +432,7 @@ private extension AuthenticationOperation
                     }
                     else
                     {
-                        completionHandler(.failure(error ?? OperationError.unknown()))
+                        completionHandler(.failure(error ?? OperationError.unknown))
                     }
                 }
             }
@@ -449,7 +449,7 @@ private extension AuthenticationOperation
                  if let team = teams.first {
                      return completionHandler(.success(team))
                  } else {
-                     return completionHandler(.failure(AuthenticationError(.noTeam)))
+                     return completionHandler(.failure(AuthenticationError.noTeam))
                  }
              } else {
                  DispatchQueue.main.async {
@@ -460,7 +460,7 @@ private extension AuthenticationOperation
 
                      if !self.present(selectTeamViewController)
                      {
-                         return completionHandler(.failure(AuthenticationError(.noTeam)))
+                         return completionHandler(.failure(AuthenticationError.noTeam))
                      }
                  }
              }
@@ -489,20 +489,20 @@ private extension AuthenticationOperation
     {
         func requestCertificate()
         {
-            let machineName: String = "SideStore - \(team.account.firstName)'s \(UIDevice.current.name)"
+            let machineName = "AltStore - " + UIDevice.current.name
             ALTAppleAPI.shared.addCertificate(machineName: machineName, to: team, session: session) { (certificate, error) in
                 do
                 {
                     let certificate = try Result(certificate, error).get()
-                    guard let privateKey = certificate.privateKey else { throw AuthenticationError(.missingPrivateKey) }
-
+                    guard let privateKey = certificate.privateKey else { throw AuthenticationError.missingPrivateKey }
+                    
                     ALTAppleAPI.shared.fetchCertificates(for: team, session: session) { (certificates, error) in
                         do
                         {
                             let certificates = try Result(certificates, error).get()
                             
                             guard let certificate = certificates.first(where: { $0.serialNumber == certificate.serialNumber }) else {
-                                throw AuthenticationError(.missingCertificate)
+                                throw AuthenticationError.missingCertificate
                             }
                             
                             certificate.privateKey = privateKey
@@ -523,50 +523,16 @@ private extension AuthenticationOperation
         
         func replaceCertificate(from certificates: [ALTCertificate])
         {
-            let ourCertificates = certificates.filter { a in
-                a.machineName?.starts(with: "SideStore") == true || a.machineName?.starts(with: "AltStore") == true
-            }
+            guard let certificate = certificates.first(where: { $0.machineName?.starts(with: "AltStore") == true }) ?? certificates.first else { return completionHandler(.failure(AuthenticationError.noCertificate)) }
             
-            if ourCertificates.isEmpty {
-                return requestCertificate()
-            }
-            
-            // We don't have private keys for any of the certificates,
-            // so we need to revoke one and create a new one.
-            var certsText = ""
-            for certificate in ourCertificates {
-                if let name = certificate.machineName {
-                    certsText.append("\(name)\n")
-                }
-            }
-            
-            let alertController = UIAlertController(title: NSLocalizedString("Would you like to revoke your previous certificates?\n\(certsText)", comment: ""), message: nil, preferredStyle: .alert)
-            
-            let noAction = UIAlertAction(title: NSLocalizedString("No", comment: ""), style: .default) { (action) in
-                requestCertificate()
-            }
-            let yesAction = UIAlertAction(title: NSLocalizedString("Yes", comment: ""), style: .default) { (action) in
-                for certificate in ourCertificates {
-                    ALTAppleAPI.shared.revoke(certificate, for: team, session: session) { (success, error) in
-                        if let error = error, !success
-                        {
-                            completionHandler(.failure(error))
-                        }
-                    }
-                }
-                requestCertificate()
-            }
-            alertController.addAction(noAction)
-            alertController.addAction(yesAction)
-            
-            DispatchQueue.main.async {
-                if self.navigationController.presentingViewController != nil
+            ALTAppleAPI.shared.revoke(certificate, for: team, session: session) { (success, error) in
+                if let error = error, !success
                 {
-                    self.navigationController.present(alertController, animated: true, completion: nil)
+                    completionHandler(.failure(error))
                 }
                 else
                 {
-                    self.presentingViewController?.present(alertController, animated: true, completion: nil)
+                    requestCertificate()
                 }
             }
         }
@@ -614,6 +580,8 @@ private extension AuthenticationOperation
                 }
                 else
                 {
+                    // We don't have private keys for any of the certificates,
+                    // so we need to revoke one and create a new one.
                     replaceCertificate(from: certificates)
                 }
             }

AltStore/Operations/BackgroundRefreshAppsOperation.swift

@@ -13,12 +13,11 @@ import AltStoreCore
 import EmotionalDamage
 import minimuxer
 
-typealias RefreshError = RefreshErrorCode.Error
-enum RefreshErrorCode: Int, ALTErrorEnum, CaseIterable
+enum RefreshError: LocalizedError
 {
     case noInstalledApps
     
-    var errorFailureReason: String {
+    var errorDescription: String? {
         switch self
         {
         case .noInstalledApps: return NSLocalizedString("No active apps require refreshing.", comment: "")
@@ -95,7 +94,7 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result<Inst
         super.main()
         
         guard !self.installedApps.isEmpty else {
-            self.finish(.failure(RefreshError(.noInstalledApps)))
+            self.finish(.failure(RefreshError.noInstalledApps))
             return
         }
         start_em_proxy(bind_addr: Consts.Proxy.serverURL)
@@ -108,7 +107,8 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result<Inst
         }
         if #available(iOS 17, *) {
             // TODO: iOS 17 and above have a new JIT implementation that is completely broken in SideStore :(
-        } else {
+        }
+        else {
             start_auto_mounter(documentsDirectory)
         }
 
@@ -203,7 +203,7 @@ private extension BackgroundRefreshAppsOperation
             
             let content = UNMutableNotificationContent()
             
-            var shouldPresentAlert = true
+            var shouldPresentAlert = false
             
             do
             {
@@ -219,18 +219,20 @@ private extension BackgroundRefreshAppsOperation
                 content.title = NSLocalizedString("Refreshed Apps", comment: "")
                 content.body = NSLocalizedString("All apps have been refreshed.", comment: "")
             }
-            catch ~OperationError.Code.noWiFi, ~RefreshErrorCode.noInstalledApps
+            catch RefreshError.noInstalledApps
             {
                 shouldPresentAlert = false
             }
             catch
             {
                 print("Failed to refresh apps in background.", error)
-
+                
                 content.title = NSLocalizedString("Failed to Refresh Apps", comment: "")
                 content.body = error.localizedDescription
+                
+                shouldPresentAlert = false
             }
-
+            
             if shouldPresentAlert
             {
                 let trigger = UNTimeIntervalNotificationTrigger(timeInterval: delay + 1, repeats: false)

AltStore/Operations/BackupAppOperation.swift

@@ -48,24 +48,19 @@ class BackupAppOperation: ResultOperation<Void>
         {
             if let error = self.context.error { throw error }
             
-            guard let installedApp = self.context.installedApp, let context = installedApp.managedObjectContext else {
-                throw OperationError.invalidParameters("BackupAppOperation.main: self.context.installedApp or installedApp.managedObjectContext is nil")
-            }
+            guard let installedApp = self.context.installedApp, let context = installedApp.managedObjectContext else { throw OperationError.invalidParameters }
             context.perform {
                 do
                 {
                     let appName = installedApp.name
                     self.appName = appName
                     
-                    guard let altstoreApp = InstalledApp.fetchAltStore(in: context) else {
-                        throw OperationError.appNotFound(name: appName)
-                    }
-                    let altstoreOpenURL = altstoreApp.openAppURL
+                    let altstoreOpenURL = URL(string: "sidestore://")!
 
                     var returnURLComponents = URLComponents(url: altstoreOpenURL, resolvingAgainstBaseURL: false)
                     returnURLComponents?.host = "appBackupResponse"
                     guard let returnURL = returnURLComponents?.url else { throw OperationError.openAppFailed(name: appName) }
-
+                    
                     var openURLComponents = URLComponents()
                     openURLComponents.scheme = installedApp.openAppURL.scheme
                     openURLComponents.host = self.action.rawValue

AltStore/Operations/DownloadAppOperation.swift

@@ -12,110 +12,66 @@ import Roxas
 import AltStoreCore
 import AltSign
 
+private extension DownloadAppOperation
+{
+    struct DependencyError: ALTLocalizedError
+    {
+        let dependency: Dependency
+        let error: Error
+        
+        var failure: String? {
+            return String(format: NSLocalizedString("Could not download “%@”.", comment: ""), self.dependency.preferredFilename)
+        }
+        
+        var underlyingError: Error? {
+            return self.error
+        }
+    }
+}
+
 @objc(DownloadAppOperation)
 final class DownloadAppOperation: ResultOperation<ALTApplication>
 {
     let app: AppProtocol
     let context: AppOperationContext
-
-    private let appName: String
+    
     private let bundleIdentifier: String
     private var sourceURL: URL?
     private let destinationURL: URL
-
+    
     private let session = URLSession(configuration: .default)
     private let temporaryDirectory = FileManager.default.uniqueTemporaryURL()
-
+    
     init(app: AppProtocol, destinationURL: URL, context: AppOperationContext)
     {
         self.app = app
         self.context = context
-
-        self.appName = app.name
+        
         self.bundleIdentifier = app.bundleIdentifier
         self.sourceURL = app.url
         self.destinationURL = destinationURL
-
+        
         super.init()
-
+        
         // App = 3, Dependencies = 1
         self.progress.totalUnitCount = 4
     }
-
+    
     override func main()
     {
         super.main()
-
+        
         if let error = self.context.error
         {
             self.finish(.failure(error))
             return
         }
-
+        
         print("Downloading App:", self.bundleIdentifier)
-
-        self.localizedFailure = String(format: NSLocalizedString("%@ could not be downloaded.", comment: ""), self.appName)
-
-        guard let storeApp = self.app as? StoreApp else { return self.download(self.app) }
-        storeApp.managedObjectContext?.perform {
-            do {
-                let latestVersion = try self.verify(storeApp)
-                self.download(latestVersion)
-            } catch let error as VerificationError where error.code == .iOSVersionNotSupported {
-                guard let presentingViewController = self.context.presentingViewController,
-                      let latestSupportedVersion = storeApp.latestSupportedVersion,
-                      case let version = latestSupportedVersion.version,
-                      version != storeApp.installedApp?.version else {
-                    return self.finish(.failure(error))
-                }
-                let title = NSLocalizedString("Unsupported iOS Version", comment: "")
-                let message = error.localizedDescription + "\n\n" + NSLocalizedString("Would you like to download the last version compatible with this device instead?", comment: "")
-
-                DispatchQueue.main.async {
-                    let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-                    alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style) { _ in
-                        self.finish(.failure(OperationError.cancelled))
-                    })
-                    alertController.addAction(UIAlertAction(title: String(format: NSLocalizedString("Download %@ %@", comment: ""), self.appName, version), style: .default) { _ in
-                        self.download(latestSupportedVersion)
-                    })
-                    presentingViewController.present(alertController, animated: true)
-                }
-            } catch {
-                self.finish(.failure(error))
-            }
-        }
-    }
-
-    override func finish(_ result: Result<ALTApplication, any Error>) {
-        do {
-            try FileManager.default.removeItem(at: self.temporaryDirectory)
-        } catch {
-            print("Failed to remove DownloadAppOperation temporary directory: \(self.temporaryDirectory).", error)
-        }
-        super.finish(result)
-    }
-}
-
-private extension DownloadAppOperation {
-    func verify(_ storeApp: StoreApp) throws -> AppVersion {
-        guard let version = storeApp.latestAvailableVersion else {
-            let failureReason = String(format: NSLocalizedString("The latest version of %@ could not be determined.", comment: ""), self.appName)
-            throw OperationError.unknown(failureReason: failureReason)
-        }
-        if let minOSVersion = version.minOSVersion, !ProcessInfo.processInfo.isOperatingSystemAtLeast(minOSVersion) {
-            throw VerificationError.iOSVersionNotSupported(app: storeApp, requiredOSVersion: minOSVersion)
-        } else if let maxOSVersion = version.maxOSVersion, ProcessInfo.processInfo.operatingSystemVersion > maxOSVersion {
-            throw VerificationError.iOSVersionNotSupported(app: storeApp, requiredOSVersion: maxOSVersion)
-        }
-
-        return version
-    }
-
-    func download(@Managed _ app: AppProtocol) {
-        guard let sourceURL = self.sourceURL else { return self.finish(.failure(OperationError.appNotFound(name: self.appName))) }
-
-        self.downloadIPA(from: sourceURL) { result in
+        
+        guard let sourceURL = self.sourceURL else { return self.finish(.failure(OperationError.appNotFound)) }
+        
+        self.downloadApp(from: sourceURL) { result in
             do
             {
                 let application = try result.get()
@@ -156,7 +112,24 @@ private extension DownloadAppOperation {
         }
     }
     
-    func downloadIPA(from sourceURL: URL, completionHandler: @escaping (Result<ALTApplication, Error>) -> Void)
+    override func finish(_ result: Result<ALTApplication, Error>)
+    {
+        do
+        {
+            try FileManager.default.removeItem(at: self.temporaryDirectory)
+        }
+        catch
+        {
+            print("Failed to remove DownloadAppOperation temporary directory: \(self.temporaryDirectory).", error)
+        }
+        
+        super.finish(result)
+    }
+}
+
+private extension DownloadAppOperation
+{
+    func downloadApp(from sourceURL: URL, completionHandler: @escaping (Result<ALTApplication, Error>) -> Void)
     {
         func finishOperation(_ result: Result<URL, Error>)
         {
@@ -165,8 +138,8 @@ private extension DownloadAppOperation {
                 let fileURL = try result.get()
                 
                 var isDirectory: ObjCBool = false
-                guard FileManager.default.fileExists(atPath: fileURL.path, isDirectory: &isDirectory) else { throw OperationError.appNotFound(name: self.appName) }
-
+                guard FileManager.default.fileExists(atPath: fileURL.path, isDirectory: &isDirectory) else { throw OperationError.appNotFound }
+                
                 try FileManager.default.createDirectory(at: self.temporaryDirectory, withIntermediateDirectories: true, attributes: nil)
                 
                 let appBundleURL: URL
@@ -205,9 +178,6 @@ private extension DownloadAppOperation {
             let downloadTask = self.session.downloadTask(with: sourceURL) { (fileURL, response, error) in
                 do
                 {
-                    if let response = response as? HTTPURLResponse {
-                        guard response.statusCode != 404 else { throw CocoaError(.fileNoSuchFile, userInfo: [NSURLErrorKey: sourceURL]) }
-                    }
                     let (fileURL, _) = try Result((fileURL, response), error).get()
                     finishOperation(.success(fileURL))
                     
@@ -282,7 +252,7 @@ private extension DownloadAppOperation
             let altstorePlist = try PropertyListDecoder().decode(AltStorePlist.self, from: data)
                         
             var dependencyURLs = Set<URL>()
-            var dependencyError: Error?
+            var dependencyError: DependencyError?
             
             let dispatchGroup = DispatchGroup()
             let progress = Progress(totalUnitCount: Int64(altstorePlist.dependencies.count), parent: self.progress, pendingUnitCount: 1)
@@ -315,7 +285,7 @@ private extension DownloadAppOperation
         }
         catch let error as DecodingError
         {
-            let nsError = (error as NSError).withLocalizedFailure(String(format: NSLocalizedString("Could not determine dependencies for %@.", comment: ""), application.name))
+            let nsError = (error as NSError).withLocalizedFailure(String(format: NSLocalizedString("Could not download dependencies for %@.", comment: ""), application.name))
             completionHandler(.failure(nsError))
         }
         catch
@@ -324,7 +294,7 @@ private extension DownloadAppOperation
         }
     }
     
-    func download(_ dependency: Dependency, for application: ALTApplication, progress: Progress, completionHandler: @escaping (Result<URL, Error>) -> Void)
+    func download(_ dependency: Dependency, for application: ALTApplication, progress: Progress, completionHandler: @escaping (Result<URL, DependencyError>) -> Void)
     {
         let downloadTask = self.session.downloadTask(with: dependency.downloadURL) { (fileURL, response, error) in
             do
@@ -345,10 +315,9 @@ private extension DownloadAppOperation
                 
                 completionHandler(.success(destinationURL))
             }
-            catch let error as NSError
+            catch
             {
-                let localizedFailure = String(format: NSLocalizedString("The dependency '%@' could not be downloaded.", comment: ""), dependency.preferredFilename)
-                completionHandler(.failure(error.withLocalizedFailure(localizedFailure)))
+                completionHandler(.failure(DependencyError(dependency: dependency, error: error)))
             }
         }
         progress.addChild(downloadTask.progress, withPendingUnitCount: 1)

AltStore/Operations/EnableJITOperation.swift

@@ -9,17 +9,9 @@
 import UIKit
 import Combine
 import minimuxer
-import UniformTypeIdentifiers
 
 import AltStoreCore
 
-enum SideJITServerErrorType: Error {
-     case invalidURL
-     case errorConnecting
-     case deviceNotFound
-     case other(String)
- }
-
 @available(iOS 14, *)
 protocol EnableJITContext
 {
@@ -50,108 +42,22 @@ final class EnableJITOperation<Context: EnableJITContext>: ResultOperation<Void>
             return
         }
         
-        guard let installedApp = self.context.installedApp else {
-            return self.finish(.failure(OperationError.invalidParameters("EnableJITOperation.main: self.context.installedApp is nil")))
-        }
-        if #available(iOS 17, *) {
-            let sideJITenabled = UserDefaults.standard.sidejitenable
-            let SideJITIP = UserDefaults.standard.textInputSideJITServerurl ?? ""
-            
-            if sideJITenabled {
-                installedApp.managedObjectContext?.perform {
-                    EnableJITSideJITServer(serverurl: SideJITIP, installedapp: installedApp) { result in
-                        switch result {
-                        case .failure(let error):
-                            switch error {
-                            case .invalidURL, .errorConnecting:
-                                self.finish(.failure(OperationError.unableToConnectSideJIT))
-                            case .deviceNotFound:
-                                self.finish(.failure(OperationError.unableToRespondSideJITDevice))
-                            case .other(let message):
-                                if let startRange = message.range(of: "<p>"),
-                                   let endRange = message.range(of: "</p>", range: startRange.upperBound..<message.endIndex) {
-                                    let pContent = message[startRange.upperBound..<endRange.lowerBound]
-                                    self.finish(.failure(OperationError.SideJITIssue(error: String(pContent))))
-                                    print(message + " + " + String(pContent))
-                                } else {
-                                    print(message)
-                                    self.finish(.failure(OperationError.SideJITIssue(error: message)))
-                                }
-                            }
-                        case .success():
-                            self.finish(.success(()))
-                            print("Thank you for using this, it was made by Stossy11 and tested by trolley or sniper1239408")
-                        }
-                    }
-                    return
-                }
-            }
-      } else {
-            installedApp.managedObjectContext?.perform {
-                var retries = 3
-                while (retries > 0){
-                    do {
-                        try debug_app(installedApp.resignedBundleIdentifier)
-                        self.finish(.success(()))
-                        retries = 0
-                    } catch {
-                        retries -= 1
-                        if (retries <= 0){
-                            self.finish(.failure(error))
-                        }
+        guard let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
+        
+        installedApp.managedObjectContext?.perform {
+            var retries = 3
+            while (retries > 0){
+                do {
+                    try debug_app(installedApp.resignedBundleIdentifier)
+                    self.finish(.success(()))
+                    retries = 0
+                } catch {
+                    retries -= 1
+                    if (retries <= 0){
+                        self.finish(.failure(error))
                     }
                 }
             }
         }
     }
 }
-
-@available(iOS 17, *)
-func EnableJITSideJITServer(serverurl: String, installedapp: InstalledApp, completion: @escaping (Result<Void, SideJITServerErrorType>) -> Void) {
-    guard let udid = fetch_udid()?.toString() else {
-        completion(.failure(.other("Unable to get UDID")))
-        return
-    }
-    
-    var SJSURL = serverurl
-    
-     if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-      SJSURL = "http://sidejitserver._http._tcp.local:8080"
-     }
-    
-    if !SJSURL.hasPrefix("http") {
-        completion(.failure(.invalidURL))
-        return
-    }
-    
-    let fullurl = SJSURL + "/\(udid)/" + installedapp.resignedBundleIdentifier
-    
-    let url = URL(string: fullurl)!
-    
-    let task = URLSession.shared.dataTask(with: url) {(data, response, error) in
-        if let error = error {
-            completion(.failure(.errorConnecting))
-            return
-        }
-        
-        guard let data = data, let datastring = String(data: data, encoding: .utf8) else { return }
-        
-        if datastring == "Enabled JIT for '\(installedapp.name)'!" {
-            let content = UNMutableNotificationContent()
-            content.title = "JIT Successfully Enabled"
-            content.subtitle = "JIT Enabled For \(installedapp.name)"
-            content.sound = UNNotificationSound.default
-
-            let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 0.1, repeats: false)
-            let request = UNNotificationRequest(identifier: "EnabledJIT", content: content, trigger: nil)
-
-            UNUserNotificationCenter.current().add(request)
-            completion(.success(()))
-        } else {
-            let errorType: SideJITServerErrorType = datastring == "Could not find device!" ? .deviceNotFound : .other(datastring)
-            completion(.failure(errorType))
-        }
-    }
-    
-    task.resume()
-}

AltStore/Operations/FetchAnisetteDataOperation.swift

@@ -45,122 +45,17 @@ final class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>, WebSoc
             return
         }
         
-        // TODO: Pass in proper view context to show the Toast messages
-        let viewContext = context.presentingViewController
+        self.url = AnisetteManager.currentURL
+        print("Anisette URL: \(self.url!.absoluteString)")
         
-        getAnisetteServerUrl(viewContext){ url, error in
-            guard let urlString = url else {
-                self.finish(.failure(error!))
-                return
-            }
-
-            // set as preferred
-            UserDefaults.standard.menuAnisetteURL = urlString
-            let url = URL(string: urlString)
-            self.url = url
-            print("Anisette URL: \(self.url!.absoluteString)")
-
-            if let identifier = Keychain.shared.identifier,
-               let adiPb = Keychain.shared.adiPb {
-                self.fetchAnisetteV3(identifier, adiPb)
-            } else {
-                self.provision()
-            }
+        if let identifier = Keychain.shared.identifier,
+           let adiPb = Keychain.shared.adiPb {
+            fetchAnisetteV3(identifier, adiPb)
+        } else {
+            provision()
         }
     }
     
-
-    func getAnisetteServerUrl(_ viewContext: UIViewController?, completion: @escaping (String?, Error?) -> Void) {
-        var serverUrls = UserDefaults.standard.menuAnisetteServersList
-        let currentServer = UserDefaults.standard.menuAnisetteURL
-
-        // Prioritize the current server by moving it to the top of the list
-        if let currentServerIndex = serverUrls.firstIndex(of: currentServer) {
-            serverUrls.remove(at: currentServerIndex)
-            serverUrls.insert(currentServer, at: 0)
-        }
-        
-        tryNextServer(from: serverUrls, viewContext, currentIndex: 0, completion: completion)
-    }
-    
-    private func showToast(viewContext: UIViewController?, message: String){
-        if let viewContext = viewContext{
-            let error = OperationError.anisetteV1Error(message: message)
-            let toastView = ToastView(error: error)
-//            toastView.textLabel.textColor = .altPrimary
-//            toastView.detailTextLabel.textColor = .altPrimary
-            DispatchQueue.main.async {
-                toastView.show(in: viewContext)
-            }
-        }
-    }
-
-    private func tryNextServer(from serverUrls: [String], _ viewContext: UIViewController?,currentIndex: Int, completion: @escaping (String?, Error?) -> Void) {
-        // Check if all URLs have been exhausted
-        guard currentIndex < serverUrls.count else {
-            let error = NSError(domain: "AnisetteError", code: 0, userInfo: [NSLocalizedDescriptionKey: "No valid server found."])
-            completion(nil, error)
-            return
-        }
-
-        let currentServerUrlString = serverUrls[currentIndex]
-        guard let url = URL(string: currentServerUrlString) else {
-            // Invalid URL, skip to next
-            let errmsg = "Skipping invalid URL: \(currentServerUrlString)"
-            print(errmsg)
-            showToast(viewContext: viewContext, message: errmsg)
-            tryNextServer(from: serverUrls, viewContext, currentIndex: currentIndex + 1, completion: completion)
-            return
-        }
-
-        // Attempt to ping the current URL
-        pingServer(url) { success, error in
-            if success {
-                // If the server is reachable, return the URL
-                let okmsg = "Found working server: \(url.absoluteString)"
-                print(okmsg)
-                if(currentIndex > 0){
-                    // notify user if available server is different the user-specified one
-                    self.showToast(viewContext: viewContext, message: okmsg)
-                }
-                completion(url.absoluteString, nil)
-            } else {
-                // If not, try the next URL
-                let errmsg = "Failed to reach server: \(url.absoluteString), trying next server."
-                print(errmsg)
-                self.showToast(viewContext: viewContext, message: errmsg)
-                self.tryNextServer(from: serverUrls, viewContext, currentIndex: currentIndex + 1, completion: completion)
-            }
-        }
-    }
-
-    func pingServer(_ url: URL, completion: @escaping (Bool, Error?) -> Void) {
-        var request = URLRequest(url: url)
-        request.timeoutInterval = 10 // Timeout after 10 seconds
-        
-        let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
-            if let error = error {
-                completion(false, error)
-                return
-            }
-            
-            let httpResponse = response as? HTTPURLResponse
-            let statusCode = httpResponse?.statusCode
-            
-            guard let statusCode = statusCode,
-                  (200...299).contains(statusCode) else {
-                let serverError = OperationError.anisetteV3Error(message: "Server unreachable or invalid response: \(String(describing: statusCode ?? nil))")
-                completion(false, serverError)
-                return
-            }
-            
-            completion(true, nil)
-        }
-        
-        task.resume()
-    }
-    
-    
     // MARK: - COMMON
     
     func extractAnisetteData(_ data: Data, _ response: HTTPURLResponse?, v3: Bool) throws {
@@ -513,7 +408,6 @@ final class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>, WebSoc
     func fetchAnisetteV3(_ identifier: String, _ adiPb: String) {
         fetchClientInfo {
             print("Fetching anisette V3")
-            let url = UserDefaults.standard.menuAnisetteURL
             var request = URLRequest(url: self.url!.appendingPathComponent("v3").appendingPathComponent("get_headers"))
             request.httpMethod = "POST"
             request.httpBody = try! JSONSerialization.data(withJSONObject: [

AltStore/Operations/FetchAppIDsOperation.swift

@@ -39,9 +39,7 @@ final class FetchAppIDsOperation: ResultOperation<([AppID], NSManagedObjectConte
         guard
             let team = self.context.team,
             let session = self.context.session
-        else {
-            return self.finish(.failure(OperationError.invalidParameters("FetchAppIDsOperation.main: self.context.team or self.context.session is nil")))
-        }
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
                 
         ALTAppleAPI.shared.fetchAppIDs(for: team, session: session) { (appIDs, error) in
             self.managedObjectContext.perform {

AltStore/Operations/FetchProvisioningProfilesOperation.swift

@@ -43,11 +43,10 @@ final class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProv
         guard
             let team = self.context.team,
             let session = self.context.session
-        else {
-            return self.finish(.failure(OperationError.invalidParameters("FetchProvisioningProfilesOperation.main: self.context.team or self.context.session is nil"))) }
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
+        
+        guard let app = self.context.app else { return self.finish(.failure(OperationError.appNotFound)) }
         
-        guard let app = self.context.app else { return self.finish(.failure(OperationError.appNotFound(name: nil))) }
-
         self.progress.totalUnitCount = Int64(1 + app.appExtensions.count)
         
         self.prepareProvisioningProfile(for: app, parentApp: nil, team: team, session: session) { (result) in
@@ -261,11 +260,7 @@ extension FetchProvisioningProfilesOperation
                         {
                             if let expirationDate = sortedExpirationDates.first
                             {
-                                throw OperationError.maximumAppIDLimitReached(appName: application.name, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, expirationDate: expirationDate)
-                            }
-                            else
-                            {
-                                throw ALTAppleAPIError(.maximumAppIDLimitReached)
+                                throw OperationError.maximumAppIDLimitReached(application: application, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, nextExpirationDate: expirationDate)
                             }
                         }
                     }
@@ -291,7 +286,7 @@ extension FetchProvisioningProfilesOperation
                             {
                                 if let expirationDate = sortedExpirationDates.first
                                 {
-                                    throw OperationError.maximumAppIDLimitReached(appName: application.name, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, expirationDate: expirationDate)
+                                    throw OperationError.maximumAppIDLimitReached(application: application, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, nextExpirationDate: expirationDate)
                                 }
                                 else
                                 {
@@ -299,19 +294,6 @@ extension FetchProvisioningProfilesOperation
                                 }
                             }
                         }
-                        catch ALTAppleAPIError.bundleIdentifierUnavailable {
-                            ALTAppleAPI.shared.fetchAppIDs(for: team, session: session) {res, err in
-                                if let err = err {
-                                    return completionHandler(.failure(err))
-                                }
-                                guard let res = res else {return completionHandler(.failure(ALTError(.unknown)))}
-                                for appid in res {
-                                    if appid.bundleIdentifier == bundleIdentifier {
-                                        completionHandler(.success(appid))
-                                    }
-                                }
-                            }
-                        }
                         catch
                         {
                             completionHandler(.failure(error))
@@ -376,9 +358,7 @@ extension FetchProvisioningProfilesOperation
             }
         }
         
-        appID.entitlements = entitlements
-        
-        if updateFeatures || true
+        if updateFeatures
         {
             let appID = appID.copy() as! ALTAppID
             appID.features = features

AltStore/Operations/InstallAppOperation.swift

@@ -43,9 +43,7 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             let certificate = self.context.certificate,
             let resignedApp = self.context.resignedApp,
             let provisioningProfiles = self.context.provisioningProfiles
-        else {
-            return self.finish(.failure(OperationError.invalidParameters("InstallAppOperation.main: self.context.certificate or self.context.resignedApp or self.context.provisioningProfiles is nil")))
-        }
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         let backgroundContext = DatabaseManager.shared.persistentContainer.newBackgroundContext()
         backgroundContext.perform {
@@ -114,22 +112,6 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             }
             
             installedApp.appExtensions = installedExtensions
-
-            // Remove stale "PlugIns" (Extensions) from currently installed App
-            if let installedAppExns = ALTApplication(fileURL: installedApp.fileURL)?.appExtensions {
-                let currentAppExns = Set(installedApp.appExtensions).map{ $0.bundleIdentifier }
-                let staleAppExns = installedAppExns.filter{ !currentAppExns.contains($0.bundleIdentifier) }
-                
-                for staleAppExn in staleAppExns {
-                    do {
-                        try FileManager.default.removeItem(at: staleAppExn.fileURL)
-                        print("InstallAppOperation.appExtensions: removed stale app-extension: \(staleAppExn.fileURL)")
-                    } catch {
-                        print("InstallAppOperation.appExtensions processing error Error: \(error)")
-                    }
-                }
-            }
-            
             
             self.context.beginInstallationHandler?(installedApp)
             
@@ -240,10 +222,8 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             
             do
             {
-                if(FileManager.default.fileExists(atPath: fileURL.path)){
-                    try FileManager.default.removeItem(at: fileURL)
-                    print("Removed refreshed IPA")
-                }
+                try FileManager.default.removeItem(at: fileURL)
+                print("Removed refreshed IPA")
             }
             catch
             {

AltStore/Operations/Operation.swift

@@ -12,10 +12,7 @@ import Roxas
 class ResultOperation<ResultType>: Operation
 {
     var resultHandler: ((Result<ResultType, Error>) -> Void)?
-
-    // Should only be set by subclasses
-    var localizedFailure: String?
-
+    
     @available(*, unavailable)
     override func finish()
     {
@@ -25,20 +22,16 @@ class ResultOperation<ResultType>: Operation
     func finish(_ result: Result<ResultType, Error>)
     {
         guard !self.isFinished else { return }
-
-        var result = result
-
+        
         if self.isCancelled
         {
-            result = .failure(OperationError.cancelled)
+            self.resultHandler?(.failure(OperationError.cancelled))
         }
-        else if case .failure(let nsError as NSError) = result, let localizedFailure, nsError.localizedFailure == nil {
-            // Error doesn't have its own localizedFailure, so we give it the Operation's (if it exists)
-            let error = nsError.withLocalizedFailure(localizedFailure)
-            result = .failure(error)
+        else
+        {
+            self.resultHandler?(result)
         }
-        self.resultHandler?(result)
-
+        
         super.finish()
     }
 }

AltStore/Operations/OperationError.swift

@@ -8,202 +8,71 @@
 
 import Foundation
 import AltSign
-import AltStoreCore
 import minimuxer
 
-extension OperationError
+enum OperationError: LocalizedError
 {
-    enum Code: Int, ALTErrorCode, CaseIterable {
-        typealias Error = OperationError
-
-        // General
-        case unknown = 1000
-        case unknownResult
-        case cancelled
-        case timedOut
-        case unableToConnectSideJIT
-        case unableToRespondSideJITDevice
-        case wrongSideJITIP
-        case SideJITIssue // (error: String)
-        case refreshsidejit
-        case notAuthenticated
-        case appNotFound
-        case unknownUDID
-        case invalidApp
-        case invalidParameters
-        case maximumAppIDLimitReached//((application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date)
-        case noSources
-        case openAppFailed//(name: String)
-        case missingAppGroup
-        case refreshAppFailed
-
-        // Connection
-        case noWiFi = 1200
-        case tooNewError
-        case anisetteV1Error//(message: String)
-        case provisioningError//(result: String, message: String?)
-        case anisetteV3Error//(message: String)
-
-        case cacheClearError//(errors: [String])
-    }
-
-    static let unknownResult: OperationError = .init(code: .unknownResult)
-    static let cancelled: OperationError = .init(code: .cancelled)
-    static let timedOut: OperationError = .init(code: .timedOut)
-    static let unableToConnectSideJIT: OperationError = .init(code: .unableToConnectSideJIT)
-    static let unableToRespondSideJITDevice: OperationError = .init(code: .unableToRespondSideJITDevice)
-    static let wrongSideJITIP: OperationError = .init(code: .wrongSideJITIP)
-    static let notAuthenticated: OperationError = .init(code: .notAuthenticated)
-    static let unknownUDID: OperationError = .init(code: .unknownUDID)
-    static let invalidApp: OperationError = .init(code: .invalidApp)
-    static let noSources: OperationError = .init(code: .noSources)
-    static let missingAppGroup: OperationError = .init(code: .missingAppGroup)
-
-    static let noWiFi: OperationError = .init(code: .noWiFi)
-    static let tooNewError: OperationError = .init(code: .tooNewError)
-    static let provisioningError: OperationError = .init(code: .provisioningError)
-    static let anisetteV1Error: OperationError = .init(code: .anisetteV1Error)
-    static let anisetteV3Error: OperationError = .init(code: .anisetteV3Error)
-
-    static let cacheClearError: OperationError = .init(code: .cacheClearError)
-
-    static func unknown(failureReason: String? = nil, file: String = #fileID, line: UInt = #line) -> OperationError {
-        OperationError(code: .unknown, failureReason: failureReason, sourceFile: file, sourceLine: line)
-    }
-
-    static func appNotFound(name: String?) -> OperationError {
-        OperationError(code: .appNotFound, appName: name)
-    }
-
-    static func openAppFailed(name: String?) -> OperationError {
-        OperationError(code: .openAppFailed, appName: name)
-    }
-    static let domain = OperationError(code: .unknown)._domain
+    static let domain = OperationError.unknown._domain
     
-    static func SideJITIssue(error: String?) -> OperationError {
-        var o = OperationError(code: .SideJITIssue)
-        o.errorFailure = error
-        return o
-    }
+    case unknown
+    case unknownResult
+    case cancelled
+    case timedOut
     
-    static func maximumAppIDLimitReached(appName: String, requiredAppIDs: Int, availableAppIDs: Int, expirationDate: Date) -> OperationError {
-        OperationError(code: .maximumAppIDLimitReached, appName: appName, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, expirationDate: expirationDate)
-    }
-
-    static func provisioningError(result: String, message: String?) -> OperationError {
-        var o = OperationError(code: .provisioningError, failureReason: result)
-        o.errorTitle = message
-        return o
-    }
-
-    static func cacheClearError(errors: [String]) -> OperationError {
-        OperationError(code: .cacheClearError, failureReason: errors.joined(separator: "\n"))
-    }
-
-    static func anisetteV1Error(message: String) -> OperationError {
-        OperationError(code: .anisetteV1Error, failureReason: message)
-    }
-
-    static func anisetteV3Error(message: String) -> OperationError {
-        OperationError(code: .anisetteV3Error, failureReason: message)
-    }
-
-    static func refreshAppFailed(message: String) -> OperationError {
-        OperationError(code: .refreshAppFailed, failureReason: message)
-    }
-
-    static func invalidParameters(_ message: String? = nil) -> OperationError {
-        OperationError(code: .invalidParameters, failureReason: message)
-    }
-}
-
-
-struct OperationError: ALTLocalizedError {
-
-    let code: Code
-
-    var errorTitle: String?
-    var errorFailure: String?
-
-    var appName: String?
-
-    var requiredAppIDs: Int?
-    var availableAppIDs: Int?
-    var expirationDate: Date?
-
-    var sourceFile: String?
-    var sourceLine: UInt?
-
-    private var _failureReason: String?
-
-    private init(code: Code, failureReason: String? = nil,
-                 appName: String? = nil, requiredAppIDs: Int? = nil, availableAppIDs: Int? = nil,
-                 expirationDate: Date? = nil, sourceFile: String? = nil, sourceLine: UInt? = nil){
-        self.code = code
-        self._failureReason = failureReason
-
-        self.appName = appName
-        self.requiredAppIDs = requiredAppIDs
-        self.availableAppIDs = availableAppIDs
-        self.expirationDate = expirationDate
-        self.sourceFile = sourceFile
-        self.sourceLine = sourceLine
-    }
-
-    var errorFailureReason: String {
-        switch self.code {
-        case .unknown:
-            var failureReason = self._failureReason ?? NSLocalizedString("An unknown error occurred.", comment: "")
-            guard let sourceFile, let sourceLine else { return failureReason }
-            failureReason += " (\(sourceFile) line \(sourceLine)"
-            return failureReason
+    case notAuthenticated
+    case appNotFound
+    
+    case unknownUDID
+    
+    case invalidApp
+    case invalidParameters
+    
+    case maximumAppIDLimitReached(application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date)
+    
+    case noSources
+    
+    case openAppFailed(name: String)
+    case missingAppGroup
+    
+    case noWiFi
+    case tooNewError
+    case anisetteV1Error(message: String)
+    case provisioningError(result: String, message: String?)
+    case anisetteV3Error(message: String)
+    
+    case cacheClearError(errors: [String])
+    
+    var failureReason: String? {
+        switch self {
+        case .unknown: return NSLocalizedString("An unknown error occured.", comment: "")
         case .unknownResult: return NSLocalizedString("The operation returned an unknown result.", comment: "")
         case .cancelled: return NSLocalizedString("The operation was cancelled.", comment: "")
         case .timedOut: return NSLocalizedString("The operation timed out.", comment: "")
         case .notAuthenticated: return NSLocalizedString("You are not signed in.", comment: "")
-        case .unknownUDID: return NSLocalizedString("SideStore could not determine this device's UDID.", comment: "")
-        case .invalidApp: return NSLocalizedString("The app is in an invalid format.", comment: "")
-        case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs within a 7 day period.", comment: "")
+        case .appNotFound: return NSLocalizedString("App not found.", comment: "")
+        case .unknownUDID: return NSLocalizedString("Unknown device UDID.", comment: "")
+        case .invalidApp: return NSLocalizedString("The app is invalid.", comment: "")
+        case .invalidParameters: return NSLocalizedString("Invalid parameters.", comment: "")
         case .noSources: return NSLocalizedString("There are no SideStore sources.", comment: "")
-        case .missingAppGroup: return NSLocalizedString("SideStore's shared app group could not be accessed.", comment: "")
-        case .appNotFound:
-            let appName = self.appName ?? NSLocalizedString("The app", comment: "")
-            return String(format: NSLocalizedString("%@ could not be found.", comment: ""), appName)
-        case .openAppFailed:
-            let appName = self.appName ?? NSLocalizedString("The app", comment: "")
-            return String(format: NSLocalizedString("SideStore was denied permission to launch %@.", comment: ""), appName)
-        case .noWiFi: return NSLocalizedString("You do not appear to be connected to WiFi and/or the WireGuard VPN!\nSideStore will never be able to install or refresh applications without WiFi and the WireGuard VPN.", comment: "")
-        case .tooNewError: return NSLocalizedString("iOS 17 has changed how JIT is enabled therefore SideStore cannot enable it without SideJITServer at this time, sorry for any inconvenience.\nWe will let everyone know once we have a solution!", comment: "")
-        case .unableToConnectSideJIT: return NSLocalizedString("Unable to connect to SideJITServer Please check that you are on the Same Wi-Fi and your Firewall has been set correctly", comment: "")
-        case .unableToRespondSideJITDevice: return NSLocalizedString("SideJITServer is unable to connect to your iDevice Please make sure you have paired your Device by doing 'SideJITServer -y' or try Refreshing SideJITServer from Settings", comment: "")
-        case .wrongSideJITIP: return NSLocalizedString("Incorrect SideJITServer IP Please make sure that you are on the Samw Wifi as SideJITServer", comment: "")
-        case .refreshsidejit: return NSLocalizedString("Unable to find App Please try Refreshing SideJITServer from Settings", comment: "")
-        case .anisetteV1Error: return NSLocalizedString("An error occurred when getting anisette data from a V1 server: %@. Try using another anisette server.", comment: "")
-        case .provisioningError: return NSLocalizedString("An error occurred when provisioning: %@ %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
-        case .anisetteV3Error: return NSLocalizedString("An error occurred when getting anisette data from a V3 server: %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
-        case .cacheClearError: return NSLocalizedString("An error occurred while clearing cache: %@", comment: "")
-        case .SideJITIssue: return NSLocalizedString("An error occurred while using SideJIT: %@", comment: "")
-            
-        case .refreshAppFailed:
-            let message = self._failureReason ?? ""
-            return String(format: NSLocalizedString("Unable to refresh App\n%@", comment: ""), message)
-
-        case .invalidParameters:
-            let message = self._failureReason.map { ": \n\($0)" } ?? "."
-            return String(format: NSLocalizedString("Invalid parameters%@", comment: ""), message)
+        case .openAppFailed(let name): return String(format: NSLocalizedString("SideStore was denied permission to launch %@.", comment: ""), name)
+        case .missingAppGroup: return NSLocalizedString("SideStore's shared app group could not be found.", comment: "")
+        case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs.", comment: "")
+        case .noWiFi: return NSLocalizedString("You do not appear to be connected to WiFi!\nSideStore will never be able to install or refresh applications without WiFi.", comment: "")
+        case .tooNewError: return NSLocalizedString("iOS 17 has changed how JIT is enabled therefore SideStore cannot enable it at this time, sorry for any inconvenience.\nWe will let everyone know once we have a solution!", comment: "")
+        case .anisetteV1Error(let message): return String(format: NSLocalizedString("An error occurred when getting anisette data from a V1 server: %@. Try using another anisette server.", comment: ""), message)
+        case .provisioningError(let result, let message): return String(format: NSLocalizedString("An error occurred when provisioning: %@%@. Please try again. If the issue persists, report it on GitHub Issues!", comment: ""), result, message != nil ? (" (" + message! + ")") : "")
+        case .anisetteV3Error(let message): return String(format: NSLocalizedString("An error occurred when getting anisette data from a V3 server: %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: ""), message)
+        case .cacheClearError(let errors): return String(format: NSLocalizedString("An error occurred while clearing cache: %@", comment: ""), errors.joined(separator: "\n"))
         }
-        
     }
     
     var recoverySuggestion: String? {
-        switch self.code
+        switch self
         {
-        case .noWiFi: return NSLocalizedString("Make sure the VPN is toggled on and you are connected to any WiFi network!", comment: "")
-        case .maximumAppIDLimitReached:
+        case .maximumAppIDLimitReached(let application, let requiredAppIDs, let availableAppIDs, let date):
             let baseMessage = NSLocalizedString("Delete sideloaded apps to free up App ID slots.", comment: "")
-            guard let appName, let requiredAppIDs, let availableAppIDs, let expirationDate else { return baseMessage }
-            var message: String
-
+            let message: String
+            
             if requiredAppIDs > 1
             {
                 let availableText: String
@@ -215,23 +84,23 @@ struct OperationError: ALTLocalizedError {
                 default: availableText = String(format: NSLocalizedString("only %@ are available", comment: ""), NSNumber(value: availableAppIDs))
                 }
                 
-                let prefixMessage = String(format: NSLocalizedString("%@ requires %@ App IDs, but %@.", comment: ""), appName, NSNumber(value: requiredAppIDs), availableText)
-                message = prefixMessage + " " + baseMessage + "\n\n"
+                let prefixMessage = String(format: NSLocalizedString("%@ requires %@ App IDs, but %@.", comment: ""), application.name, NSNumber(value: requiredAppIDs), availableText)
+                message = prefixMessage + " " + baseMessage
             }
             else
             {
-                message = baseMessage + " "
+                let dateComponents = Calendar.current.dateComponents([.day, .hour, .minute], from: Date(), to: date)
+                
+                let dateComponentsFormatter = DateComponentsFormatter()
+                dateComponentsFormatter.maximumUnitCount = 1
+                dateComponentsFormatter.unitsStyle = .full
+                
+                let remainingTime = dateComponentsFormatter.string(from: dateComponents)!
+                
+                let remainingTimeMessage = String(format: NSLocalizedString("You can register another App ID in %@.", comment: ""), remainingTime)
+                message = baseMessage + " " + remainingTimeMessage
             }
-
-            let dateComponents = Calendar.current.dateComponents([.day, .hour, .minute], from: Date(), to: expirationDate)
-            let dateFormatter = DateComponentsFormatter()
-            dateFormatter.maximumUnitCount = 1
-            dateFormatter.unitsStyle = .full
-
-            let remainingTime = dateFormatter.string(from: dateComponents)!
-
-            message += String(format: NSLocalizedString("You can register another App ID in %@.", comment: ""), remainingTime)
-
+            
             return message
             
         default: return nil
@@ -245,7 +114,7 @@ extension MinimuxerError: LocalizedError {
         case .NoDevice:
             return NSLocalizedString("Cannot fetch the device from the muxer", comment: "")
         case .NoConnection:
-            return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi. This could mean an invalid pairing.", comment: "")
+            return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi", comment: "")
         case .PairingFile:
             return NSLocalizedString("Invalid pairing file. Your pairing file either didn't have a UDID, or it wasn't a valid plist. Please use jitterbugpair to generate it", comment: "")
             
@@ -275,7 +144,7 @@ extension MinimuxerError: LocalizedError {
         case .CreateAfc:
             return self.createService(name: "AFC")
         case .RwAfc:
-            return NSLocalizedString("AFC was unable to manage files on the device. This usually means an invalid pairing.", comment: "")
+            return NSLocalizedString("AFC was unable to manage files on the device", comment: "")
         case .InstallApp(let message):
             return NSLocalizedString("Unable to install the app: \(message.toString())", comment: "")
         case .UninstallApp:

AltStore/Operations/Patch App/PatchAppOperation.swift

@@ -25,38 +25,22 @@ protocol PatchAppContext
     var error: Error? { get }
 }
 
-extension PatchAppError
+enum PatchAppError: LocalizedError
 {
-    enum Code: Int, ALTErrorCode, CaseIterable {
-        typealias Error = PatchAppError
-
-        case unsupportedOperatingSystemVersion
-    }
-
-    static func unsupportedOperatingSystemVersion(_ osVersion: OperatingSystemVersion) -> PatchAppError {
-        PatchAppError(code: .unsupportedOperatingSystemVersion, osVersion: osVersion)
-    }
-}
-
-struct PatchAppError: ALTLocalizedError {
-    let code: Code
-
-    var errorTitle: String?
-    var errorFailure: String?
-
-    var osVersion: OperatingSystemVersion?
-
-    var errorFailureReason: String {
-        switch self.code {
-        case .unsupportedOperatingSystemVersion:
-            let osVersionString: String
-
-            if let osVersion = self.osVersion?.stringValue {
-                osVersionString = NSLocalizedString("iOS", comment: "") + " " + osVersion
-            } else {
-                osVersionString = NSLocalizedString("your device's iOS version", comment: "")
+    case unsupportedOperatingSystemVersion(OperatingSystemVersion)
+    
+    var errorDescription: String? {
+        switch self
+        {
+        case .unsupportedOperatingSystemVersion(let osVersion):
+            var osVersionString = "\(osVersion.majorVersion).\(osVersion.minorVersion)"
+            if osVersion.patchVersion != 0
+            {
+                osVersionString += ".\(osVersion.patchVersion)"
             }
-            return String(format: NSLocalizedString("The OTA download URL for %@ could not be determined.", comment: ""), osVersionString)
+            
+            let errorDescription = String(format: NSLocalizedString("The OTA download URL for iOS %@ could not be determined.", comment: ""), osVersionString)
+            return errorDescription
         }
     }
 }
@@ -98,9 +82,7 @@ final class PatchAppOperation: ResultOperation<Void>
             return
         }
         
-        guard let resignedApp = self.context.resignedApp else {
-            return self.finish(.failure(OperationError.invalidParameters("PatchAppOperation.main: self.context.resignedApp is nil")))
-        }
+        guard let resignedApp = self.context.resignedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         self.progressHandler?(self.progress, NSLocalizedString("Downloading iOS firmware...", comment: ""))
                 

AltStore/Operations/Patch App/PatchViewController.swift

@@ -439,7 +439,7 @@ private extension PatchViewController
                             
                             do
                             {
-                                guard let (bundleIdentifier, result) = results.first else { throw refreshGroup?.context.error ?? OperationError.unknown() }
+                                guard let (bundleIdentifier, result) = results.first else { throw refreshGroup?.context.error ?? OperationError.unknown }
                                 _ = try result.get()
                                 
                                 if var patchedApps = UserDefaults.standard.patchedApps, let index = patchedApps.firstIndex(of: bundleIdentifier)

AltStore/Operations/RefreshAppOperation.swift

@@ -35,17 +35,11 @@ final class RefreshAppOperation: ResultOperation<InstalledApp>
         
         do
         {
-            if let error = self.context.error {
-                print("RefreshAppOperation.main: ERROR: self.context.app = \(self.context.app!); self.context.error is \(error)")
-                return self.finish(.failure(error))
-            }
+            if let error = self.context.error { return self.finish(.failure(error)) }
             
-            guard let profiles = self.context.provisioningProfiles else {
-                return self.finish(.failure(OperationError.invalidParameters("RefreshAppOperation.main: self.context.provisioningProfiles is nil")))
-            }
+            guard let profiles = self.context.provisioningProfiles else { return self.finish(.failure(OperationError.invalidParameters)) }
+            guard let app = self.context.app else { return self.finish(.failure(OperationError.appNotFound)) }
             
-            guard let app = self.context.app else { return self.finish(.failure(OperationError(.appNotFound(name: nil)))) }
-
             for p in profiles {
                 do {
                     let bytes = p.value.data.toRustByteSlice()
@@ -55,13 +49,14 @@ final class RefreshAppOperation: ResultOperation<InstalledApp>
                 }
 
                 DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+                print("Sending refresh app request...")
                     
                     self.progress.completedUnitCount += 1
                     
                     let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), app.bundleIdentifier)
                     self.managedObjectContext.perform {
                         guard let installedApp = InstalledApp.first(satisfying: predicate, in: self.managedObjectContext) else {
-                            self.finish(.failure(OperationError(.appNotFound(name: app.name))))
+                            self.finish(.failure(OperationError.appNotFound))
                             return
                         }
                         installedApp.update(provisioningProfile: p.value)

AltStore/Operations/RemoveAppBackupOperation.swift

@@ -35,9 +35,7 @@ final class RemoveAppBackupOperation: ResultOperation<Void>
             return
         }
         
-        guard let installedApp = self.context.installedApp else {
-            return self.finish(.failure(OperationError.invalidParameters("RemoveAppBackupOperation.main: self.context.installedApp is nil")))
-        }
+        guard let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
         installedApp.managedObjectContext?.perform {
             guard let backupDirectoryURL = FileManager.default.backupDirectoryURL(for: installedApp) else { return self.finish(.failure(OperationError.missingAppGroup)) }
             

AltStore/Operations/RemoveAppOperation.swift

@@ -33,9 +33,7 @@ final class RemoveAppOperation: ResultOperation<InstalledApp>
             return
         }
         
-        guard let installedApp = self.context.installedApp else {
-            return self.finish(.failure(OperationError.invalidParameters("RemoveAppOperation.main: self.context.installedApp is nil")))
-        }
+        guard let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         installedApp.managedObjectContext?.perform {
             let resignedBundleIdentifier = installedApp.resignedBundleIdentifier

AltStore/Operations/ResignAppOperation.swift

@@ -42,12 +42,7 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
             let profiles = self.context.provisioningProfiles,
             let team = self.context.team,
             let certificate = self.context.certificate
-        else {
-            return self.finish(.failure(OperationError.invalidParameters("ResignAppOperation.main: " +
-                                                                         "self.context.team or " +
-                                                                         "self.context.provisioningProfiles or" +
-                                                                         "self.context.certificate is nil")))
-        }
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         // Prepare app bundle
         let prepareAppProgress = Progress.discreteProgress(totalUnitCount: 2)
@@ -121,9 +116,7 @@ private extension ResignAppOperation
             
             infoDictionary[kCFBundleIdentifierKey as String] = profile.bundleIdentifier
             infoDictionary[Bundle.Info.altBundleID] = identifier
-            infoDictionary[Bundle.Info.devicePairingString] = "<insert pairing file here>"
-            infoDictionary.removeValue(forKey: "DTXcode")
-            infoDictionary.removeValue(forKey: "DTXcodeBuild")
+            infoDictionary[Bundle.Info.devicePairingString] = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String
 
             for (key, value) in additionalInfoDictionaryValues
             {
@@ -191,7 +184,7 @@ private extension ResignAppOperation
                 {
                     guard let udid = fetch_udid()?.toString() as? String else { throw OperationError.unknownUDID }
                     guard let pairingFileString = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.devicePairingString) as? String else { throw OperationError.unknownUDID }                    
-                    additionalValues[Bundle.Info.devicePairingString] = "<insert pairing file here>"
+                    additionalValues[Bundle.Info.devicePairingString] = pairingFileString
                     additionalValues[Bundle.Info.deviceID] = udid
                     additionalValues[Bundle.Info.serverID] = UserDefaults.standard.preferredServerID
                     

AltStore/Operations/SendAppOperation.swift

@@ -36,9 +36,7 @@ final class SendAppOperation: ResultOperation<()>
             return self.finish(.failure(error))
         }
         
-        guard let resignedApp = self.context.resignedApp else {
-            return self.finish(.failure(OperationError.invalidParameters("SendAppOperation.main: self.resignedApp is nil")))
-        }
+        guard let resignedApp = self.context.resignedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         // self.context.resignedApp.fileURL points to the app bundle, but we want the .ipa.
         let app = AnyApp(name: resignedApp.name, bundleIdentifier: self.context.bundleIdentifier, url: resignedApp.fileURL)
@@ -59,7 +57,7 @@ final class SendAppOperation: ResultOperation<()>
             }
         } else {
             print("IPA doesn't exist????")
-            self.finish(.failure(OperationError(.appNotFound(name: resignedApp.name))))
+            self.finish(.failure(OperationError.appNotFound))
         }
     }
 }

AltStore/Operations/VerifyAppOperation.swift

@@ -8,87 +8,48 @@
 
 import Foundation
 
-import AltStoreCore
 import AltSign
 import Roxas
 
-extension VerificationError
+enum VerificationError: ALTLocalizedError
 {
-    enum Code: Int, ALTErrorCode, CaseIterable {
-        typealias Error = VerificationError
-
-        case privateEntitlements
-        case mismatchedBundleIdentifiers
-        case iOSVersionNotSupported
-    }
-
-    static func privateEntitlements(_ entitlements: [String: Any], app: ALTApplication) -> VerificationError {
-        VerificationError(code: .privateEntitlements, app: app, entitlements: entitlements)
-    }
-
-    static func mismatchedBundleIdentifiers(sourceBundleID: String, app: ALTApplication) -> VerificationError {
-        VerificationError(code: .mismatchedBundleIdentifiers, app: app, sourceBundleID: sourceBundleID)
-    }
-
-    static func iOSVersionNotSupported(app: AppProtocol, osVersion: OperatingSystemVersion = ProcessInfo.processInfo.operatingSystemVersion, requiredOSVersion: OperatingSystemVersion?) -> VerificationError {
-        VerificationError(code: .iOSVersionNotSupported, app: app)
-    }
-}
-
-struct VerificationError: ALTLocalizedError {
-    let code: Code
-
-    var errorTitle: String?
-    var errorFailure: String?
-
-    @Managed var app: AppProtocol?
-    var entitlements: [String: Any]?
-    var sourceBundleID: String?
-    var deviceOSVersion: OperatingSystemVersion?
-    var requiredOSVersion: OperatingSystemVersion?
+    case privateEntitlements(ALTApplication, entitlements: [String: Any])
+    case mismatchedBundleIdentifiers(ALTApplication, sourceBundleID: String)
+    case iOSVersionNotSupported(ALTApplication)
     
-    var errorDescription: String? {
-        switch self.code {
-        case .iOSVersionNotSupported:
-            guard let deviceOSVersion else { return nil }
-
-            var failureReason = self.errorFailureReason
-            if self.app == nil {
-                let firstLetter = failureReason.prefix(1).lowercased()
-                failureReason = firstLetter + failureReason.dropFirst()
-            }
-
-            return String(formatted: "This device is running iOS %@, but %@", deviceOSVersion.stringValue, failureReason)
-        default: return nil
+    var app: ALTApplication {
+        switch self
+        {
+        case .privateEntitlements(let app, _): return app
+        case .mismatchedBundleIdentifiers(let app, _): return app
+        case .iOSVersionNotSupported(let app): return app
         }
     }
-
-    var errorFailureReason: String {
-        switch self.code
+    
+    var failure: String? {
+        return String(format: NSLocalizedString("“%@” could not be installed.", comment: ""), app.name)
+    }
+    
+    var failureReason: String? {
+        switch self
         {
-        case .privateEntitlements:
-            let appName = self.$app.name ?? NSLocalizedString("The app", comment: "")
-            return String(formatted: "“%@” requires private permissions.", appName)
-
-        case .mismatchedBundleIdentifiers:
-            if let appBundleID = self.$app.bundleIdentifier, let bundleID = self.sourceBundleID {
-                return String(formatted: "The bundle ID '%@' does not match the one specified by the source ('%@').", appBundleID, bundleID)
-            } else {
-                return NSLocalizedString("The bundle ID does not match the one specified by the source.", comment: "")
-            }
-
-        case .iOSVersionNotSupported:
-            let appName = self.$app.name ?? NSLocalizedString("The app", comment: "")
-            let deviceOSVersion = self.deviceOSVersion ?? ProcessInfo.processInfo.operatingSystemVersion
-
-            guard let requiredOSVersion else {
-                return String(formatted: "%@ does not support iOS %@.", appName, deviceOSVersion.stringValue)
-            }
-            if deviceOSVersion > requiredOSVersion {
-                return String(formatted: "%@ requires iOS %@ or earlier", appName, requiredOSVersion.stringValue)
-            } else {
-                return String(formatted: "%@ requires iOS %@ or later", appName, requiredOSVersion.stringValue)
+        case .privateEntitlements(let app, _):
+            return String(format: NSLocalizedString("“%@” requires private permissions.", comment: ""), app.name)
+            
+        case .mismatchedBundleIdentifiers(let app, let sourceBundleID):
+            return String(format: NSLocalizedString("The bundle ID “%@” does not match the one specified by the source (“%@”).", comment: ""), app.bundleIdentifier, sourceBundleID)
+            
+        case .iOSVersionNotSupported(let app):
+            let name = app.name
+            
+            var version = "iOS \(app.minimumiOSVersion.majorVersion).\(app.minimumiOSVersion.minorVersion)"
+            if app.minimumiOSVersion.patchVersion > 0
+            {
+                version += ".\(app.minimumiOSVersion.patchVersion)"
             }
+            
+            let localizedDescription = String(format: NSLocalizedString("%@ requires %@.", comment: ""), name, version)
+            return localizedDescription
         }
     }
 }
@@ -116,21 +77,15 @@ final class VerifyAppOperation: ResultOperation<Void>
             {
                 throw error
             }
-            let appName = self.context.app?.name ?? NSLocalizedString("The app", comment: "")
-            self.localizedFailure = String(format: NSLocalizedString("%@ could not be installed.", comment: ""), appName)
             
-            guard let app = self.context.app else {
-                throw OperationError.invalidParameters("VerifyAppOperation.main: self.context.app is nil")
-            }
+            guard let app = self.context.app else { throw OperationError.invalidParameters }
             
-            if !["ny.litritt.ignited", "com.litritt.ignited"].contains(where: { $0 == app.bundleIdentifier }) {
-                guard app.bundleIdentifier == self.context.bundleIdentifier else {
-                    throw VerificationError.mismatchedBundleIdentifiers(sourceBundleID: self.context.bundleIdentifier, app: app)
-                }
+            guard app.bundleIdentifier == self.context.bundleIdentifier else {
+                throw VerificationError.mismatchedBundleIdentifiers(app, sourceBundleID: self.context.bundleIdentifier)
             }
             
             guard ProcessInfo.processInfo.isOperatingSystemAtLeast(app.minimumiOSVersion) else {
-                throw VerificationError.iOSVersionNotSupported(app: app, requiredOSVersion: app.minimumiOSVersion)
+                throw VerificationError.iOSVersionNotSupported(app)
             }
             
             if #available(iOS 13.5, *)
@@ -161,7 +116,7 @@ final class VerifyAppOperation: ResultOperation<Void>
                     let entitlements = try PropertyListSerialization.propertyList(from: entitlementsPlist.data(using: .utf8)!, options: [], format: nil) as! [String: Any]
                     
                     app.hasPrivateEntitlements = true
-                    let error = VerificationError.privateEntitlements(entitlements, app: app)
+                    let error = VerificationError.privateEntitlements(app, entitlements: entitlements)
                     self.process(error) { (result) in
                         self.finish(result.mapError { $0 as Error })
                     }
@@ -190,10 +145,9 @@ private extension VerifyAppOperation
         guard let presentingViewController = self.context.presentingViewController else { return completion(.failure(error)) }
         
         DispatchQueue.main.async {
-            switch error.code
+            switch error
             {
-            case .privateEntitlements:
-                guard let entitlements = error.entitlements else { return completion(.failure(error)) }
+            case .privateEntitlements(_, let entitlements):
                 let permissions = entitlements.keys.sorted().joined(separator: "\n")
                 let message = String(format: NSLocalizedString("""
                     You must allow access to these private permissions before continuing:
@@ -212,7 +166,8 @@ private extension VerifyAppOperation
                 }))
                 presentingViewController.present(alertController, animated: true, completion: nil)
                 
-            case .mismatchedBundleIdentifiers, .iOSVersionNotSupported: return completion(.failure(error))
+            case .mismatchedBundleIdentifiers: return completion(.failure(error))
+            case .iOSVersionNotSupported: return completion(.failure(error))
             }
         }
     }

AltStore/Settings.bundle/Root.plist

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>StringsTable</key>
+	<string>Root</string>
+	<key>ApplicationGroupContainerIdentifier</key>
+	<string>group.$(APP_GROUP_IDENTIFIER)</string>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>Anisette Server</string>
+			<key>Key</key>
+			<string>customAnisetteURL</string>
+			<key>DefaultValue</key>
+			<string>https://ani.sidestore.io</string>
+			<key>Titles</key>
+			<array>
+				<string>SideStore</string>
+				<string>Macley (US)</string>
+				<string>Macley (DE)</string>
+				<string>DrPudding</string>
+				<string>Sideloadly</string>
+				<string>Nick</string>
+				<string>Jawshoeadan</string>
+				<string>crystall1nedev</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<string>https://ani.sidestore.io</string>
+				<string>http://5.249.163.88:6969/</string>
+				<string>http://45.132.246.138:6969/</string>
+				<string>https://sign.rheaa.xyz</string>
+				<string>https://sideloadly.io/anisette/irGb3Quww8zrhgqnzmrx</string>
+				<string>http://45.33.29.114</string>
+				<string>https://anisette.jawshoeadan.me</string>
+				<string>https://anisette.crystall1ne.software/</string>
+			</array>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Danger Zone</string>
+			<key>FooterText</key>
+			<string>If you disable the toggle then app will use the server you input into the &quot;Anisette URL&quot; box rather than one selected from the above selector.</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Use preferred servers</string>
+			<key>Key</key>
+			<string>textServer</string>
+			<key>DefaultValue</key>
+			<true/>
+			<key>FooterText</key>
+			<string>chicken</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Anisette URL</string>
+			<key>Key</key>
+			<string>textInputAnisetteURL</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+			<key>KeyboardType</key>
+			<string>URL</string>
+		</dict>
+	</array>
+</dict>
+</plist>

AltStore/Settings/AnisetteManager.swift

@@ -10,11 +10,6 @@ import Foundation
 
 public struct AnisetteManager {
     
-    var menuURL: String {
-        var url: String
-        url = UserDefaults.standard.menuAnisetteURL
-        return url
-    }
     /// User defined URL from Settings/UserDefaults
     static var userURL: String? {
         var urlString: String?

AltStore/Settings/AnisetteServerList.swift

@@ -1,227 +0,0 @@
-//
-//  AnisetteServerList.swift
-//  SideStore
-//
-//  Created by ny on 6/18/24.
-//  Copyright © 2024 SideStore. All rights reserved.
-//
-
-import UIKit
-import SwiftUI
-import AltStoreCore
-
-typealias SUIButton = SwiftUI.Button
-
-// MARK: - AnisetteServerData
-struct AnisetteServerData: Codable {
-    let servers: [Server]
-}
-
-// MARK: - Server
-struct Server: Codable {
-    var name: String
-    var address: String
-}
-
-class AnisetteViewModel: ObservableObject {
-    @Published var selected: String = ""
-
-    @Published var source: String = "https://servers.sidestore.io/servers.json"
-    @Published var servers: [Server] = []
-    
-    init() {
-        // using the custom Anisette list
-        if !UserDefaults.standard.menuAnisetteList.isEmpty {
-            self.source = UserDefaults.standard.menuAnisetteList
-        }
-    }
-    
-    func getListOfServers() {
-        guard let url = URL(string: source) else { return }
-        
-        // DO NOT use local cache when fetching anisette servers
-        var request = URLRequest(url: url)
-        request.cachePolicy = .reloadIgnoringLocalCacheData
-        
-        URLSession.shared.dataTask(with: request) { data, response, error in
-            if let error = error {
-                return
-            }
-            if let data = data {
-                do {
-                    let decoder = Foundation.JSONDecoder()
-                    let servers = try decoder.decode(AnisetteServerData.self, from: data)
-                    DispatchQueue.main.async {
-                        self.servers = servers.servers
-                        // store server addresses as list
-                        UserDefaults.standard.menuAnisetteServersList = servers.servers.map(\.self.address)
-                    }
-                } catch {
-                    // Handle decoding error
-                    print("Failed to decode JSON: \(error)")
-                }
-            }
-        }.resume()
-    }
-}
-
-struct AnisetteServers: View {
-    @Environment(\.presentationMode) var presentationMode
-    @StateObject var viewModel: AnisetteViewModel = AnisetteViewModel()
-    @State var selected: String? = nil
-    @State private var showingConfirmation = false
-    var errorCallback: () -> ()
-
-    var body: some View {
-        ZStack {
-            Color(UIColor.systemBackground)
-                .ignoresSafeArea()
-                .onAppear {
-                    viewModel.getListOfServers()
-                }
-            VStack {
-                if #available(iOS 16.0, *) {
-                    SwiftUI.List($viewModel.servers, id: \.address, selection: $selected) { server in
-                        HStack {
-                            VStack(alignment: .leading) {
-                                Text("\(server.name.wrappedValue)")
-                                    .font(.headline)
-                                    .foregroundColor(.primary)
-                                Text("\(server.address.wrappedValue)")
-                                    .font(.subheadline)
-                                    .foregroundColor(.secondary)
-                            }
-                            Spacer()
-                            if selected != nil {
-                                if server.address.wrappedValue == selected {
-                                    Spacer()
-                                    Image(systemName: "checkmark.circle.fill")
-                                        .foregroundColor(.accentColor)
-                                        .onAppear {
-                                            UserDefaults.standard.menuAnisetteURL = server.address.wrappedValue
-                                            print(UserDefaults.synchronize(.standard)())
-                                            print(UserDefaults.standard.menuAnisetteURL)
-                                            print(server.address.wrappedValue)
-                                        }
-                                }
-                            }
-                        }
-                        .padding()
-                        .background(RoundedRectangle(cornerRadius: 10).fill(Color(UIColor.secondarySystemBackground)))
-                        .shadow(color: Color.black.opacity(0.2), radius: 5, x: 0, y: 5)
-                    }
-                    .listStyle(.plain)
-                    .scrollContentBackground(.hidden)
-                    .listRowBackground(Color(UIColor.systemBackground))
-                } else {
-                    List(selection: $selected) {
-                        ForEach($viewModel.servers, id: \.name) { server in
-                            VStack {
-                                HStack {
-                                    Text("\(server.name.wrappedValue)")
-                                        .foregroundColor(.primary)
-                                        .frame(alignment: .center)
-                                    Text("\(server.address.wrappedValue)")
-                                        .foregroundColor(.secondary)
-                                        .frame(alignment: .center)
-                                }
-                            }
-                            Spacer()
-                        }
-                        .padding()
-                        .background(RoundedRectangle(cornerRadius: 10).fill(Color(UIColor.secondarySystemBackground)))
-                        .shadow(color: Color.black.opacity(0.2), radius: 5, x: 0, y: 5)
-                    }
-                    .listStyle(.plain)
-                }
-                
-                VStack(spacing: 16) {
-                    TextField("Anisette Server List", text: $viewModel.source)
-                        .padding()
-                        .background(RoundedRectangle(cornerRadius: 10).fill(Color(UIColor.secondarySystemFill)))
-                        .foregroundColor(.primary)
-                        .frame(height: 60)
-                        .shadow(color: Color.black.opacity(0.2), radius: 5, x: 0, y: 5)
-                        .onChange(of: viewModel.source) { newValue in
-                            UserDefaults.standard.menuAnisetteList = newValue
-                            viewModel.getListOfServers()
-                        }
-
-                    HStack(spacing: 16) {
-                        SUIButton(action: {
-                            presentationMode.wrappedValue.dismiss()
-                        }) {
-                            HStack{
-                                Spacer()
-                                Text("Back")
-                                    .fontWeight(.semibold)
-                                Spacer()
-                            }
-                            .contentShape(Rectangle())
-                        }
-                        .buttonStyle(PlainButtonStyle())
-                        .padding()
-                        .background(RoundedRectangle(cornerRadius: 10).fill(Color.accentColor))
-                        .foregroundColor(.white)
-                        .shadow(color: Color.accentColor.opacity(0.4), radius: 10, x: 0, y: 5)
-
-                        SUIButton(action: {
-                            viewModel.getListOfServers()
-                        }) {
-                            HStack{
-                                Spacer()
-                                Text("Refresh Servers")
-                                    .fontWeight(.semibold)
-                                    .frame(maxWidth: .infinity)
-                                Spacer()
-                            }
-                            .contentShape(Rectangle())
-                        }
-                        .buttonStyle(PlainButtonStyle())
-                        .padding()
-                        .background(RoundedRectangle(cornerRadius: 10).fill(Color.accentColor))
-                        .foregroundColor(.white)
-                        .shadow(color: Color.accentColor.opacity(0.4), radius: 10, x: 0, y: 5)
-                        
-                    }
-
-                    SUIButton(action: {
-                        showingConfirmation = true
-                    }) {
-                        Text("Reset adi.pb")
-                            .fontWeight(.semibold)
-                            .frame(maxWidth: .infinity)
-                    }
-                    .buttonStyle(PlainButtonStyle())
-                    .padding()
-                    .background(RoundedRectangle(cornerRadius: 10).fill(Color.red))
-                    .foregroundColor(.white)
-                    .shadow(color: Color.red.opacity(0.4), radius: 10, x: 0, y: 5)
-                    .alert(isPresented: $showingConfirmation) {
-                        Alert(
-                            title: Text("Reset adi.pb"),
-                            message: Text("are you sure to clear the adi.pb from keychain？"),
-                            primaryButton: .default(Text("do it")) {
-                                #if !DEBUG
-                                if Keychain.shared.adiPb != nil {
-                                    Keychain.shared.adiPb = nil
-                                }
-                                #endif
-                                print("Cleared adi.pb from keychain")
-                                errorCallback()
-                                presentationMode.wrappedValue.dismiss()
-                            },
-                            secondaryButton: .cancel(Text("cancel")) {
-                                print("canceled")
-                            }
-                        )
-                    }
-                }
-                .padding(.horizontal)
-                .padding(.bottom)
-            }
-        }
-        .navigationBarHidden(true)
-        .navigationTitle("")
-    }
-}

AltStore/Settings/Error Log/ErrorDetailsViewController.swift

@@ -1,53 +0,0 @@
-//
-//  ErrorDetailsViewController.swift
-//  AltStore
-//
-//  Created by Riley Testut on 10/5/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import UIKit
-
-import AltStoreCore
-
-class ErrorDetailsViewController: UIViewController
-{
-    var loggedError: LoggedError?
-
-    @IBOutlet private var textView: UITextView!
-
-    override func viewDidLoad()
-    {
-        super.viewDidLoad()
-
-        if let error = self.loggedError?.error
-        {
-            self.title = error.localizedErrorCode
-
-            let font = self.textView.font ?? UIFont.preferredFont(forTextStyle: .body)
-            let detailedDescription = error.formattedDetailedDescription(with: font)
-            self.textView.attributedText = detailedDescription
-        }
-        else
-        {
-            self.title = NSLocalizedString("Error Details", comment: "")
-        }
-
-        self.navigationController?.navigationBar.tintColor = .altPrimary
-
-        if #available(iOS 15, *), let sheetController = self.navigationController?.sheetPresentationController
-        {
-            sheetController.detents = [.medium(), .large()]
-            sheetController.selectedDetentIdentifier = .medium
-            sheetController.prefersGrabberVisible = true
-        }
-    }
-
-    override func viewDidLayoutSubviews()
-    {
-        super.viewDidLayoutSubviews()
-
-        self.textView.textContainerInset.left = self.view.layoutMargins.left
-        self.textView.textContainerInset.right = self.view.layoutMargins.right
-    }
-}

AltStore/Settings/Error Log/ErrorLogTableViewCell.swift

@@ -8,16 +8,6 @@
 
 import UIKit
 
-@objc(ErrorLogMenuButton)
-private final class ErrorLogMenuButton: UIButton {
-    @available(iOS 14.0, *)
-    override func menuAttachmentPoint(for configuration: UIContextMenuConfiguration) -> CGPoint {
-        var point = super.menuAttachmentPoint(for: configuration)
-        point.y = self.bounds.midY
-        return point
-    }
-}
-
 @objc(ErrorLogTableViewCell)
 final class ErrorLogTableViewCell: UITableViewCell
 {

AltStore/Settings/Error Log/ErrorLogViewController.swift

@@ -21,13 +21,6 @@ final class ErrorLogViewController: UITableViewController
     private lazy var dataSource = self.makeDataSource()
     private var expandedErrorIDs = Set<NSManagedObjectID>()
     
-    private var isScrolling = false {
-        didSet {
-            guard self.isScrolling != oldValue else { return }
-            self.updateButtonInteractivity()
-        }
-    }
-
     private lazy var timeFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .none
@@ -46,15 +39,6 @@ final class ErrorLogViewController: UITableViewController
         self.tableView.dataSource = self.dataSource
         self.tableView.prefetchDataSource = self.dataSource
     }
-
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        guard let loggedError = sender as? LoggedError, segue.identifier == "showErrorDetails" else { return }
-
-        let navigationController = segue.destination as! UINavigationController
-
-        let errorDetailsViewController = navigationController.viewControllers.first as! ErrorDetailsViewController
-        errorDetailsViewController.loggedError = loggedError
-    }
 }
 
 private extension ErrorLogViewController
@@ -76,8 +60,14 @@ private extension ErrorLogViewController
             let cell = cell as! ErrorLogTableViewCell
             cell.dateLabel.text = self.timeFormatter.string(from: loggedError.date)
             cell.errorFailureLabel.text = loggedError.localizedFailure ?? NSLocalizedString("Operation Failed", comment: "")
-            cell.errorCodeLabel.text = loggedError.error.localizedErrorCode
-
+            
+            switch loggedError.domain
+            {
+            case AltServerErrorDomain: cell.errorCodeLabel?.text = String(format: NSLocalizedString("AltServer Error %@", comment: ""), NSNumber(value: loggedError.code))
+            case OperationError.domain: cell.errorCodeLabel?.text = String(format: NSLocalizedString("AltStore Error %@", comment: ""), NSNumber(value: loggedError.code))
+            default: cell.errorCodeLabel?.text = loggedError.error.localizedErrorCode
+            }
+            
             let nsError = loggedError.error as NSError
             let errorDescription = [nsError.localizedDescription, nsError.localizedRecoverySuggestion].compactMap { $0 }.joined(separator: "\n\n")
             cell.errorDescriptionTextView.text = errorDescription
@@ -103,19 +93,12 @@ private extension ErrorLogViewController
                     },
                     UIAction(title: NSLocalizedString("Search FAQ", comment: ""), image: UIImage(systemName: "magnifyingglass")) { [weak self] _ in
                         self?.searchFAQ(for: loggedError)
-                    },
-                    UIAction(title: NSLocalizedString("View More Details", comment: ""), image: UIImage(systemName: "ellipsis.circle")) { [weak self] _ in
-                        self?.viewMoreDetails(for: loggedError)
-                    },
+                    }
                 ])
 
                 cell.menuButton.menu = menu
-                cell.menuButton.showsMenuAsPrimaryAction = self.isScrolling ? false : true
-                cell.selectionStyle = .none
-            } else {
-                cell.menuButton.isUserInteractionEnabled = false
             }
-
+            
             // Include errorDescriptionTextView's text in cell summary.
             cell.accessibilityLabel = [cell.errorFailureLabel.text, cell.dateLabel.text, cell.errorCodeLabel.text, cell.errorDescriptionTextView.text].compactMap { $0 }.joined(separator: ". ")
             
@@ -249,27 +232,22 @@ private extension ErrorLogViewController
     
     func searchFAQ(for loggedError: LoggedError)
     {
-        let baseURL = URL(string: "https://faq.altstore.io/getting-started/error-codes")!
+        let baseURL = URL(string: "https://faq.altstore.io/getting-started/troubleshooting-guide")!
         var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)!
         
-        let query = [loggedError.domain, "\(loggedError.error.displayCode)"].joined(separator: "+")
+        let query = [loggedError.domain, "\(loggedError.code)"].joined(separator: "+")
         components.queryItems = [URLQueryItem(name: "q", value: query)]
         
         let safariViewController = SFSafariViewController(url: components.url ?? baseURL)
         safariViewController.preferredControlTintColor = .altPrimary
         self.present(safariViewController, animated: true)
     }
-
-    func viewMoreDetails(for loggedError: LoggedError) {
-        self.performSegue(withIdentifier: "showErrorDetails", sender: loggedError)
-    }
 }
 
 extension ErrorLogViewController
 {
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)
     {
-        guard #unavailable(iOS 14) else { return }
         let loggedError = self.dataSource.item(at: indexPath)
         
         let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
@@ -343,32 +321,3 @@ extension ErrorLogViewController: QLPreviewControllerDataSource {
         return fileURL as QLPreviewItem
     }
 }
-
-extension ErrorLogViewController
-{
-    override func scrollViewWillBeginDragging(_ scrollView: UIScrollView)
-    {
-        self.isScrolling = true
-    }
-
-    override func scrollViewDidEndDecelerating(_ scrollView: UIScrollView)
-    {
-        self.isScrolling = false
-    }
-
-    override func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool)
-    {
-        guard !decelerate else { return }
-        self.isScrolling = false
-    }
-
-    private func updateButtonInteractivity()
-    {
-        guard #available(iOS 14, *) else { return }
-
-        for case let cell as ErrorLogTableViewCell in self.tableView.visibleCells
-        {
-            cell.menuButton.showsMenuAsPrimaryAction = self.isScrolling ? false : true
-        }
-    }
-}

AltStore/Settings/PatreonViewController.swift

@@ -128,7 +128,7 @@ private extension PatreonViewController
         let isPatronText = NSLocalizedString("""
         Hey ,
         
-        You’re the best. Your account was linked successfully, so you now have access to any beta versions of our apps. You can find them all in the Browse tab.
+        You’re the best. Your account was linked successfully, so you now have access to the beta versions of all of our apps. You can find them all in the Browse tab.
         
         Thanks for all of your support. Enjoy!
         - SideTeam
@@ -175,7 +175,7 @@ private extension PatreonViewController
     
     @objc func openPatreonURL(_ sender: UIButton)
     {
-        let patreonURL = URL(string: "https://www.patreon.com/SideStoreIO")!
+        let patreonURL = URL(string: "https://www.patreon.com/SideStore")!
         
         let safariViewController = SFSafariViewController(url: patreonURL)
         safariViewController.preferredControlTintColor = self.view.tintColor
@@ -184,7 +184,7 @@ private extension PatreonViewController
     
     @objc func openTwitterURL(_ sender: UIButton)
     {
-        let twitterURL = URL(string: "https://twitter.com/sidestoreio")!
+        let twitterURL = URL(string: "https://twitter.com/SideStore_io")!
         
         let safariViewController = SFSafariViewController(url: twitterURL)
         safariViewController.preferredControlTintColor = self.view.tintColor
@@ -348,7 +348,7 @@ extension PatreonViewController: UICollectionViewDelegateFlowLayout
         switch section
         {
         case .about: return .zero
-        case .patrons: return CGSize(width: 320, height: 44)
+        case .patrons: return CGSize(width: 0, height: 0)
         }
     }
 }

AltStore/Settings/Settings.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="5Rz-4h-jJ8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="5Rz-4h-jJ8">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -20,8 +20,8 @@
                         <color key="backgroundColor" name="SettingsBackground"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <label key="tableFooterView" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore 1.0" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="bUR-rp-Nw2">
-                            <rect key="frame" x="0.0" y="1347" width="375" height="25"/>
+                        <label key="tableFooterView" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bUR-rp-Nw2">
+                            <rect key="frame" x="0.0" y="1245" width="375" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="1" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -273,14 +273,14 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="amC-sE-8O0" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="546" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="495" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="amC-sE-8O0" id="GEO-2e-E4k">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Allow Siri To Refresh Apps…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c6K-fI-CVr">
-                                                    <rect key="frame" x="30" y="15.5" width="228.5" height="20.5"/>
+                                                    <rect key="frame" x="30" y="15.5" width="100.5" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
@@ -293,42 +293,6 @@
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="1" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="style">
-                                                <integer key="value" value="2"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="7PQ-AW-GcV" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="495" width="375" height="51"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7PQ-AW-GcV" id="wQ8-9w-iiw">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disable App Limit" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W95-fD-NAd" userLabel="Disable App Limit">
-                                                    <rect key="frame" x="30" y="15.5" width="142.5" height="20.5"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1aa-og-ZXD">
-                                                    <rect key="frame" x="296" y="10" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="toggleDisableAppLimit:" destination="aMk-Xp-UL8" eventType="valueChanged" id="zYc-B2-JPg"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="1aa-og-ZXD" secondAttribute="trailing" id="1Xa-t6-jAC"/>
-                                                <constraint firstItem="W95-fD-NAd" firstAttribute="leading" secondItem="wQ8-9w-iiw" secondAttribute="leadingMargin" id="J49-tg-KMa"/>
-                                                <constraint firstItem="1aa-og-ZXD" firstAttribute="centerY" secondItem="wQ8-9w-iiw" secondAttribute="centerY" id="UMz-ax-ln4"/>
-                                                <constraint firstItem="W95-fD-NAd" firstAttribute="centerY" secondItem="wQ8-9w-iiw" secondAttribute="centerY" id="bFd-lr-0xw"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <color key="backgroundColor" white="1" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="style">
                                                 <integer key="value" value="3"/>
@@ -341,19 +305,19 @@
                             <tableViewSection headerTitle="" id="eHy-qI-w5w">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="30h-59-88f" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="637" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="586" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="30h-59-88f" id="7qD-DW-Jls">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="How it works" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CC-iw-3bd">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="How it works" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CC-iw-3bd">
                                                     <rect key="frame" x="30" y="15.5" width="105" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="WtV-Dt-sDn">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="WtV-Dt-sDn">
                                                     <rect key="frame" x="327" y="16.5" width="18" height="18"/>
                                                 </imageView>
                                             </subviews>
@@ -381,28 +345,28 @@
                             <tableViewSection headerTitle="" id="J90-vn-u2O">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="i4T-2q-jF3" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="728" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="677" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="i4T-2q-jF3" id="VTQ-H4-aCM">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Developers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRA-OK-Vjw">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Developers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRA-OK-Vjw">
                                                     <rect key="frame" x="30" y="15.5" width="86" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="lx9-35-OSk">
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="lx9-35-OSk">
                                                     <rect key="frame" x="187.5" y="15.5" width="157.5" height="20.5"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="SideStore Team" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAA-iZ-VGb">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore Team" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAA-iZ-VGb">
                                                             <rect key="frame" x="0.0" y="0.0" width="125.5" height="20.5"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
                                                             <rect key="frame" x="139.5" y="0.0" width="18" height="20.5"/>
                                                         </imageView>
                                                     </subviews>
@@ -425,28 +389,28 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="oHX-oR-nwJ" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="774.5" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="728" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oHX-oR-nwJ" id="hN4-i5-igu">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
                                                     <rect key="frame" x="30" y="15.5" width="89" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
                                                     <rect key="frame" x="198" y="15.5" width="147" height="20.5"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
                                                             <rect key="frame" x="0.0" y="0.0" width="115" height="20.5"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
                                                             <rect key="frame" x="129" y="0.0" width="18" height="20.5"/>
                                                         </imageView>
                                                     </subviews>
@@ -469,7 +433,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="0MT-ht-Sit" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="830" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="779" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="0MT-ht-Sit" id="OZp-WM-5H7">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -513,7 +477,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="O5R-Al-lGj" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="881" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="830" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="O5R-Al-lGj" id="CrG-Mr-xQq">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -553,7 +517,7 @@
                             <tableViewSection headerTitle="" id="OMa-EK-hRI">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="FMZ-as-Ljo" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="972" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="921" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FMZ-as-Ljo" id="JzL-Of-A3T">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -586,7 +550,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="Qca-pU-sJh" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1023" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="972" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qca-pU-sJh" id="QtU-8J-VQN">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -622,7 +586,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="rE2-P4-OaE" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1074" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1023" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rE2-P4-OaE" id="qIT-rz-ZUb">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -654,44 +618,11 @@
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
                                         </userDefinedRuntimeAttributes>
                                         <connections>
-                                            <segue destination="g8a-Rf-zWa" kind="show" identifier="showErrorLog" id="vFC-Id-Ww6"/>
+                                            <segue destination="g8a-Rf-zWa" kind="show" id="vFC-Id-Ww6"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="VrV-qI-zXF" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1125" width="375" height="51"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VrV-qI-zXF" id="w1r-uY-4pD">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="SideJITServer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46q-DB-5nc">
-                                                    <rect key="frame" x="30" y="15.5" width="183" height="21"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="wvD-eZ-nQI">
-                                                    <rect key="frame" x="327" y="16.5" width="18" height="18"/>
-                                                </imageView>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="wvD-eZ-nQI" firstAttribute="centerY" secondItem="w1r-uY-4pD" secondAttribute="centerY" id="O6Y-Y1-yxv"/>
-                                                <constraint firstItem="46q-DB-5nc" firstAttribute="centerY" secondItem="w1r-uY-4pD" secondAttribute="centerY" id="ROS-YF-6jb"/>
-                                                <constraint firstItem="46q-DB-5nc" firstAttribute="leading" secondItem="w1r-uY-4pD" secondAttribute="leadingMargin" id="acd-O8-WTI"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="wvD-eZ-nQI" secondAttribute="trailing" id="taB-EP-QMM"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <color key="backgroundColor" white="1" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="style">
-                                                <integer key="value" value="2"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="eZ3-BT-q4D" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1176" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1023" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="eZ3-BT-q4D" id="17m-VV-hzf">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -724,7 +655,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="VNn-u4-cN8" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1227" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1074" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VNn-u4-cN8" id="4bh-qe-l2N">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -757,14 +688,14 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="e7s-hL-kv9" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1278" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1125" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e7s-hL-kv9" id="yjL-Mu-HTk">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Anisette Servers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eds-Dj-36y">
-                                                    <rect key="frame" x="30" y="15.5" width="135.5" height="20.5"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Reset adi.pb" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eds-Dj-36y">
+                                                    <rect key="frame" x="30" y="15.5" width="102" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
@@ -782,6 +713,39 @@
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="1" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="style">
+                                                <integer key="value" value="2"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
+                                        </userDefinedRuntimeAttributes>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="fj2-EJ-Z98" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1176" width="375" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fj2-EJ-Z98" id="BcT-Fs-KNg">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Advanced Settings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OcM-OM-uDE">
+                                                    <rect key="frame" x="30" y="15.5" width="154" height="20.5"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="Pcu-Sy-yfZ">
+                                                    <rect key="frame" x="327" y="16.5" width="18" height="18"/>
+                                                </imageView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Pcu-Sy-yfZ" secondAttribute="trailing" id="CFy-IO-4eb"/>
+                                                <constraint firstItem="OcM-OM-uDE" firstAttribute="centerY" secondItem="BcT-Fs-KNg" secondAttribute="centerY" id="OGl-h4-FPx"/>
+                                                <constraint firstItem="Pcu-Sy-yfZ" firstAttribute="centerY" secondItem="BcT-Fs-KNg" secondAttribute="centerY" id="R7L-4O-lTn"/>
+                                                <constraint firstItem="OcM-OM-uDE" firstAttribute="leading" secondItem="BcT-Fs-KNg" secondAttribute="leadingMargin" id="yoh-C6-UC5"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="1" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="style">
                                                 <integer key="value" value="3"/>
@@ -802,7 +766,6 @@
                         <outlet property="accountNameLabel" destination="CnN-M1-AYK" id="Ldc-Py-Bix"/>
                         <outlet property="accountTypeLabel" destination="434-MW-Den" id="mNB-QE-4Jg"/>
                         <outlet property="backgroundRefreshSwitch" destination="DPu-zD-Als" id="eiG-Hv-Vko"/>
-                        <outlet property="disableAppLimitSwitch" destination="1aa-og-ZXD" id="oVL-Md-yZ8"/>
                         <outlet property="noIdleTimeoutSwitch" destination="iQA-wm-5ag" id="jHC-js-q0Y"/>
                         <outlet property="versionLabel" destination="bUR-rp-Nw2" id="85I-5R-hqz"/>
                     </connections>
@@ -819,7 +782,7 @@
                     <toolbarItems/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" largeTitles="YES" id="Jtn-cs-Tvp" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" name="SettingsBackground"/>
@@ -920,7 +883,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" contentInsetAdjustmentBehavior="never" indicatorStyle="white" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oQQ-pR-oKc">
-                                <rect key="frame" x="0.0" y="64" width="375" height="554"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="574"/>
                                 <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
                                 <string key="text">Jay Freeman (ldid) 
 Copyright (C) 2007-2012 Jay Freeman (saurik)
@@ -1154,7 +1117,7 @@ Settings by i cons from the Noun Project</string>
                                                 </textView>
                                             </subviews>
                                         </stackView>
-                                        <button opaque="NO" contentMode="scaleToFill" showsMenuAsPrimaryAction="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ba2-EY-tf5" customClass="ErrorLogMenuButton">
+                                        <button opaque="NO" contentMode="scaleToFill" showsMenuAsPrimaryAction="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ba2-EY-tf5">
                                             <rect key="frame" x="0.0" y="0.0" width="343" height="107.5"/>
                                             <accessibility key="accessibilityConfiguration">
                                                 <bool key="isElement" value="NO"/>
@@ -1203,73 +1166,11 @@ Settings by i cons from the Noun Project</string>
                             </barButtonItem>
                         </rightBarButtonItems>
                     </navigationItem>
-                    <connections>
-                        <segue destination="7gm-d1-zWK" kind="presentation" identifier="showErrorDetails" id="9vz-y6-evp"/>
-                    </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rU1-TZ-TD8" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1697" y="1774"/>
         </scene>
-        <!--Error Details View Controller-->
-        <scene sceneID="XNO-Yg-I7t">
-            <objects>
-                <viewController id="xB2-Se-VVg" customClass="ErrorDetailsViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="eBQ-se-VIy">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ctd-NB-4ov">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <color key="textColor" systemColor="labelColor"/>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                            </textView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="Nm8-69-Ngi"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="ctd-NB-4ov" firstAttribute="leading" secondItem="eBQ-se-VIy" secondAttribute="leading" id="Cv1-Te-gBH"/>
-                            <constraint firstItem="ctd-NB-4ov" firstAttribute="top" secondItem="eBQ-se-VIy" secondAttribute="top" id="HRY-Rg-iMI"/>
-                            <constraint firstAttribute="trailing" secondItem="ctd-NB-4ov" secondAttribute="trailing" id="Lc1-K7-iuq"/>
-                            <constraint firstAttribute="bottom" secondItem="ctd-NB-4ov" secondAttribute="bottom" id="zCz-Cy-Y5z"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="XpE-V9-EaY">
-                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="rnr-dX-4Ev">
-                            <connections>
-                                <segue destination="ZSp-1n-UJ9" kind="unwind" unwindAction="unwindFromErrorDetails:" id="TFu-zD-QyF"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                    <connections>
-                        <outlet property="textView" destination="ctd-NB-4ov" id="x2C-9R-Xz1"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="8AM-Vx-XTN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-                <exit id="ZSp-1n-UJ9" userLabel="Exit" sceneMemberID="exit"/>
-            </objects>
-            <point key="canvasLocation" x="3389.5999999999999" y="1772.5637181409297"/>
-        </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="4LJ-Od-dCK">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="7gm-d1-zWK" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="dI0-sh-yGf">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="xB2-Se-VVg" kind="relationship" relationship="rootViewController" id="RpP-UM-JfJ"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="OXW-bf-HIj" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2554" y="1773"/>
-        </scene>
     </scenes>
     <resources>
         <image name="Next" width="18" height="18"/>
@@ -1282,10 +1183,7 @@ Settings by i cons from the Noun Project</string>
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="labelColor">
-            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

AltStore/Settings/SettingsViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import SwiftUI
 import SafariServices
 import MessageUI
 import Intents
@@ -31,19 +30,14 @@ extension SettingsViewController
     fileprivate enum AppRefreshRow: Int, CaseIterable
     {
         case backgroundRefresh
-        case noIdleTimeout        
+        case noIdleTimeout
+        
         @available(iOS 14, *)
         case addToSiri
-        case disableAppLimit
         
         static var allCases: [AppRefreshRow] {
-            var c: [AppRefreshRow] = [.backgroundRefresh, .noIdleTimeout]
-            guard #available(iOS 14, *) else { return c }
-            c.append(.addToSiri)
-
-            // conditional entries go at the last to preserve ordering
-            if !ProcessInfo().sparseRestorePatched { c.append(.disableAppLimit) }
-            return c
+            guard #available(iOS 14, *) else { return [.backgroundRefresh, .noIdleTimeout] }
+            return [.backgroundRefresh, .noIdleTimeout, .addToSiri]
         }
     }
     
@@ -60,10 +54,9 @@ extension SettingsViewController
         case sendFeedback
         case refreshAttempts
         case errorLog
-        case refreshSideJITServer
         case clearCache
         case resetPairingFile
-        case anisetteServers
+        case resetAdiPb
         case advancedSettings
     
     }
@@ -84,9 +77,6 @@ final class SettingsViewController: UITableViewController
     
     @IBOutlet private var backgroundRefreshSwitch: UISwitch!
     @IBOutlet private var noIdleTimeoutSwitch: UISwitch!
-    @IBOutlet private var disableAppLimitSwitch: UISwitch!
-    
-    @IBOutlet private var refreshSideJITServer: UILabel!
     
     @IBOutlet private var versionLabel: UILabel!
     
@@ -99,7 +89,6 @@ final class SettingsViewController: UITableViewController
         super.init(coder: aDecoder)
         
         NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.openPatreonSettings(_:)), name: AppDelegate.openPatreonSettingsDeepLinkNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.openErrorLog(_:)), name: ToastView.openErrorLogNotification, object: nil)
     }
     
     override func viewDidLoad()
@@ -117,36 +106,16 @@ final class SettingsViewController: UITableViewController
         debugModeGestureRecognizer.numberOfTouchesRequired = 3
         self.tableView.addGestureRecognizer(debugModeGestureRecognizer)
         
-        var versionString: String = ""
         if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
         {
-            versionString += "SideStore \(version)"
-            if let xcode = Bundle.main.object(forInfoDictionaryKey: "DTXcode") as? String {
-                versionString += " - Xcode \(xcode) - "
-                if let build = Bundle.main.object(forInfoDictionaryKey: "DTXcodeBuild") as? String {
-                    versionString += "\(build)"
-                }
-            }
-            if let pairing = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String {
-                let pair_test = pairing == "<insert pairing file here>"
-                if !pair_test {
-                    versionString += " - \(!pair_test)"
-                }
-            }
+            self.versionLabel.text = NSLocalizedString(String(format: "SideStore %@", version), comment: "SideStore Version")
         }
         else
         {
-            versionString += "SideStore\t"
+            self.versionLabel.text = NSLocalizedString("SideStore", comment: "")
         }
-        versionString += "\n\(Bundle.Info.appbundleIdentifier)"
-
-        self.versionLabel.text = NSLocalizedString(versionString, comment: "SideStore Version")
         
-        self.versionLabel.numberOfLines = 0
-        self.versionLabel.lineBreakMode = .byWordWrapping
-        self.versionLabel.setNeedsUpdateConstraints()
-        
-        self.tableView.contentInset.bottom = 40
+        self.tableView.contentInset.bottom = 20
         
         self.update()
         
@@ -163,18 +132,6 @@ final class SettingsViewController: UITableViewController
         
         self.update()
     }
-    
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        if segue.identifier == "anisetteServers" {
-            let controller = UIHostingController(rootView: AnisetteServers(selected: UserDefaults.standard.menuAnisetteURL, errorCallback: {
-                ToastView(text: "Cleared adi.pb!", detailText: "You will need to log back into Apple ID in SideStore.").show(in: self)
-            }))
-            self.show(controller, sender: nil)
-        } else {
-            super.prepare(for: segue, sender: sender)
-        }
-    }
-
 }
 
 private extension SettingsViewController
@@ -196,7 +153,6 @@ private extension SettingsViewController
         
         self.backgroundRefreshSwitch.isOn = UserDefaults.standard.isBackgroundRefreshEnabled
         self.noIdleTimeoutSwitch.isOn = UserDefaults.standard.isIdleTimeoutDisableEnabled
-        self.disableAppLimitSwitch.isOn = UserDefaults.standard.isAppLimitDisabled
         
         if self.isViewLoaded
         {
@@ -248,7 +204,7 @@ private extension SettingsViewController
             }
             else
             {
-                settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("Enable Background Refresh to automatically refresh apps in the background when connected to Wi-Fi. \n\nEnable Disable Idle Timeout to allow SideStore to keep your device awake during a refresh or install of any apps.", comment: "")
+                settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("Enable Background Refresh to automatically refresh apps in the background when connected to Wi-Fi. \n\nDisable the Idle Timeout toggle to allow SideStore to not let your device go to sleep during a refresh or install of any apps.", comment: "")
             }
             
         case .instructions:
@@ -324,10 +280,6 @@ private extension SettingsViewController
         self.present(alertController, animated: true, completion: nil)
     }
     
-    @IBAction func toggleDisableAppLimit(_ sender: UISwitch) {
-        UserDefaults.standard.isAppLimitDisabled = sender.isOn
-    }
-    
     @IBAction func toggleIsBackgroundRefreshEnabled(_ sender: UISwitch)
     {
         UserDefaults.standard.isBackgroundRefreshEnabled = sender.isOn
@@ -436,15 +388,6 @@ private extension SettingsViewController
             self.performSegue(withIdentifier: "showPatreon", sender: nil)
         }
     }
-
-    @objc func openErrorLog(_: Notification) {
-        guard self.presentedViewController == nil else { return }
-
-        self.navigationController?.popViewController(animated: false)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            self.performSegue(withIdentifier: "showErrorLog", sender: nil)
-        }
-    }
 }
 
 extension SettingsViewController
@@ -477,14 +420,14 @@ extension SettingsViewController
     {
         let cell = super.tableView(tableView, cellForRowAt: indexPath)
         
-        if #available(iOS 14, *) {}
-        else if let cell = cell as? InsetGroupTableViewCell,
-                indexPath.section == Section.appRefresh.rawValue,
-                indexPath.row == AppRefreshRow.backgroundRefresh.rawValue
-        {
-            // Only one row is visible pre-iOS 14.
-            cell.style = .single
-        }
+//        if #available(iOS 14, *) {}
+//        else if let cell = cell as? InsetGroupTableViewCell,
+//                indexPath.section == Section.appRefresh.rawValue,
+//                indexPath.row == AppRefreshRow.backgroundRefresh.rawValue
+//        {
+//            // Only one row is visible pre-iOS 14.
+//            cell.style = .single
+//        }
         
         if AppRefreshRow.AllCases().count == 1
         {
@@ -496,13 +439,6 @@ extension SettingsViewController
             }
         }
         
-        if let cell = cell as? InsetGroupTableViewCell,
-               indexPath.section == Section.appRefresh.rawValue,
-               indexPath.row == AppRefreshRow.allCases.count-1      // last row
-        {
-            cell.setValue(3, forKey: "style")
-        }
-        
         
         return cell
     }
@@ -559,7 +495,7 @@ extension SettingsViewController
         switch section
         {
         case .signIn where self.activeTeam != nil: return 1.0
-        case .account where self.activeTeam == nil: return 1.0
+        case .account where self.activeTeam == nil: return 1.0            
         case .signIn, .patreon, .appRefresh:
             let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: false)
             return height
@@ -584,7 +520,6 @@ extension SettingsViewController
             {
             case .backgroundRefresh: break
             case .noIdleTimeout: break
-            case .disableAppLimit: break
             case .addToSiri:
                 guard #available(iOS 14, *) else { return }
                 self.addRefreshAppsShortcut()
@@ -595,8 +530,8 @@ extension SettingsViewController
             let row = CreditsRow.allCases[indexPath.row]
             switch row
             {
-            case .developer: self.openTwitter(username: "sidestoreio")
-            case .operations: self.openTwitter(username: "sidestoreio")
+            case .developer: self.openTwitter(username: "sidestore_io")
+            case .operations: self.openTwitter(username: "sidestore_io")
             case .designer: self.openTwitter(username: "lit_ritt")
             case .softwareLicenses: break
             }
@@ -606,158 +541,34 @@ extension SettingsViewController
             switch row
             {
             case .sendFeedback:
-                let alertController = UIAlertController(title: "Send Feedback", message: "Choose a method to send feedback:", preferredStyle: .actionSheet)
-                
-                // Option 1: GitHub
-                alertController.addAction(UIAlertAction(title: "GitHub", style: .default) { _ in
-                    if let githubURL = URL(string: "https://github.com/SideStore/SideStore/issues") {
-                        let safariViewController = SFSafariViewController(url: githubURL)
-                        safariViewController.preferredControlTintColor = .altPrimary
-                        self.present(safariViewController, animated: true, completion: nil)
-                    }
-                })
-                
-                // Option 2: Discord
-                alertController.addAction(UIAlertAction(title: "Discord", style: .default) { _ in
-                    if let discordURL = URL(string: "https://discord.gg/sidestore-949183273383395328") {
-                        let safariViewController = SFSafariViewController(url: discordURL)
-                        safariViewController.preferredControlTintColor = .altPrimary
-                        self.present(safariViewController, animated: true, completion: nil)
-                    }
-                })
-                
-                // Option 3: Mail
-                alertController.addAction(UIAlertAction(title: "Send Email", style: .default) { _ in
-                    if MFMailComposeViewController.canSendMail() {
-                        let mailViewController = MFMailComposeViewController()
-                        mailViewController.mailComposeDelegate = self
-                        mailViewController.setToRecipients(["support@sidestore.io"])
-
-                        if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String {
-                            mailViewController.setSubject("SideStore Beta \(version) Feedback")
-                        } else {
-                            mailViewController.setSubject("SideStore Beta Feedback")
-                        }
-
-                       self.present(mailViewController, animated: true, completion: nil)
-                  } else {
-                      let toastView = ToastView(text: NSLocalizedString("Cannot Send Mail", comment: ""), detailText: nil)
-                      toastView.show(in: self)
-                }
-            })
-                
-                // Cancel action
-                alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-                
-                // For iPad: Set the source view if presenting on iPad to avoid crashes
-                if let popoverController = alertController.popoverPresentationController {
-                    popoverController.sourceView = self.view
-                    popoverController.sourceRect = self.view.bounds
-                }
-                
-                // Present the action sheet
-                self.present(alertController, animated: true, completion: nil)
-                
-            case .refreshSideJITServer:
-                if #available(iOS 17, *) {
-                
-                   let alertController = UIAlertController(
-                      title: NSLocalizedString("SideJITServer", comment: ""),
-                      message: NSLocalizedString("Settings for SideJITServer", comment: ""),
-                      preferredStyle: UIAlertController.Style.actionSheet)
+                if MFMailComposeViewController.canSendMail()
+                {
+                    let mailViewController = MFMailComposeViewController()
+                    mailViewController.mailComposeDelegate = self
+                    mailViewController.setToRecipients(["support@sidestore.io"])
                     
-                    
-                    if UserDefaults.standard.sidejitenable {
-                        alertController.addAction(UIAlertAction(title: NSLocalizedString("Disable", comment: ""), style: .default){ _ in
-                            UserDefaults.standard.sidejitenable = false
-                        })
-                    } else {
-                        alertController.addAction(UIAlertAction(title: NSLocalizedString("Enable", comment: ""), style: .default){ _ in
-                            UserDefaults.standard.sidejitenable = true
-                        })
+                    if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
+                    {
+                        mailViewController.setSubject("SideStore Beta \(version) Feedback")
+                    }
+                    else
+                    {
+                        mailViewController.setSubject("SideStore Beta Feedback")
                     }
                     
-                    alertController.addAction(UIAlertAction(title: NSLocalizedString("Server Address", comment: ""), style: .default){ _ in
-                        let alertController1 = UIAlertController(title: "SideJITServer Address", message: "Please Enter the SideJITServer Address Below. (this is not needed if SideJITServer has already been detected)", preferredStyle: .alert)
-                        
-
-                        alertController1.addTextField { textField in
-                            textField.placeholder = "SideJITServer Address"
-                        }
-                        
-                        
-                        let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
-                        alertController1.addAction(cancelAction)
-                        
-
-                        let okAction = UIAlertAction(title: "OK", style: .default) { _ in
-                            if let text = alertController1.textFields?.first?.text {
-                                UserDefaults.standard.textInputSideJITServerurl = text
-                            }
-                        }
-                        
-                        alertController1.addAction(okAction)
-                        
-                        // Present the alert controller
-                        self.present(alertController1, animated: true)
-                    })
-                    
-
-                   alertController.addAction(UIAlertAction(title: NSLocalizedString("Refresh", comment: ""), style: .destructive){ _ in
-                      if UserDefaults.standard.sidejitenable {
-                         var SJSURL = ""
-                          if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-                            SJSURL = "http://sidejitserver._http._tcp.local:8080"
-                         } else {
-                            SJSURL = UserDefaults.standard.textInputSideJITServerurl ?? ""
-                         }
-                        
-                          
-                         let url = URL(string: SJSURL + "/re/")!
-
-                         let task = URLSession.shared.dataTask(with: url) { (data, response, error) in
-                            if let error = error {
-                               print("Error: \(error)")
-                            } else {
-                               // Do nothing with data or response
-                            }
-                         }
-
-                         task.resume()
-                      }
-                   })
-                    
-
-                   let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
-                   alertController.addAction(cancelAction)
-                   //Fix crash on iPad
-                   alertController.popoverPresentationController?.sourceView = self.tableView
-                   alertController.popoverPresentationController?.sourceRect = self.tableView.rectForRow(at: indexPath)
-                   self.present(alertController, animated: true)
-                   self.tableView.deselectRow(at: indexPath, animated: true)
-                } else {
-                   let alertController = UIAlertController(
-                      title: NSLocalizedString("You are not on iOS 17+ This will not work", comment: ""),
-                      message: NSLocalizedString("This is meant for 'SideJITServer' and it only works on iOS 17+ ", comment: ""),
-                      preferredStyle: UIAlertController.Style.actionSheet)
-
-                   alertController.addAction(.cancel)
-                   //Fix crash on iPad
-                   alertController.popoverPresentationController?.sourceView = self.tableView
-                   alertController.popoverPresentationController?.sourceRect = self.tableView.rectForRow(at: indexPath)
-                   self.present(alertController, animated: true)
-                   self.tableView.deselectRow(at: indexPath, animated: true)
+                    self.present(mailViewController, animated: true, completion: nil)
+                }
+                else
+                {
+                    let toastView = ToastView(text: NSLocalizedString("Cannot Send Mail", comment: ""), detailText: nil)
+                    toastView.show(in: self)
                 }
-
                 
             case .clearCache: self.clearCache()
-                
+
             case .resetPairingFile:
-                
                 let filename = "ALTPairingFile.mobiledevicepairing"
-                
                 let fm = FileManager.default
-                
                 let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
                 let alertController = UIAlertController(
                     title: NSLocalizedString("Are you sure to reset the pairing file?", comment: ""),
@@ -766,12 +577,11 @@ extension SettingsViewController
                 
                 alertController.addAction(UIAlertAction(title: NSLocalizedString("Delete and Reset", comment: ""), style: .destructive){ _ in
                     if fm.fileExists(atPath: documentsPath.path), let contents = try? String(contentsOf: documentsPath), !contents.isEmpty {
-                        UserDefaults.standard.isPairingReset = true
                         try? fm.removeItem(atPath: documentsPath.path)
                         NSLog("Pairing File Reseted")
                     }
                     self.tableView.deselectRow(at: indexPath, animated: true)
-                    let dialogMessage = UIAlertController(title: NSLocalizedString("Pairing File Reset", comment: ""), message: NSLocalizedString("Please restart SideStore", comment: ""), preferredStyle: .alert)
+                    let dialogMessage = UIAlertController(title: NSLocalizedString("Pairing File Reseted", comment: ""), message: NSLocalizedString("Please restart SideStore", comment: ""), preferredStyle: .alert)
                     self.present(dialogMessage, animated: true, completion: nil)
                 })
                 alertController.addAction(.cancel)
@@ -780,12 +590,25 @@ extension SettingsViewController
                 alertController.popoverPresentationController?.sourceRect = self.tableView.rectForRow(at: indexPath)
                 self.present(alertController, animated: true)
                 self.tableView.deselectRow(at: indexPath, animated: true)
+            case .resetAdiPb:
+                let alertController = UIAlertController(
+                    title: NSLocalizedString("Are you sure you want to reset the adi.pb file?", comment: ""),
+                    message: NSLocalizedString("The adi.pb file is used to generate anisette data, which is required to log into an Apple ID. If you are having issues with account related things, you can try this. However, you will be required to do 2FA again. This will do nothing if you are using an older anisette server.", comment: ""),
+                    preferredStyle: UIAlertController.Style.actionSheet)
                 
-            case .anisetteServers:
-                self.prepare(for: UIStoryboardSegue(identifier: "anisetteServers", source: self, destination: UIHostingController(rootView: AnisetteServers(selected: "", errorCallback: {
-                    ToastView(text: "Reset adi.pb", detailText: "Buh").show(in: self)
-                }))), sender: nil)
-//                self.performSegue(withIdentifier: "anisetteServers", sender: nil)
+                alertController.addAction(UIAlertAction(title: NSLocalizedString("Reset adi.pb", comment: ""), style: .destructive){ _ in
+                    if Keychain.shared.adiPb != nil {
+                        Keychain.shared.adiPb = nil
+                        print("Cleared adi.pb from keychain")
+                    }
+                    self.tableView.deselectRow(at: indexPath, animated: true)
+                })
+                alertController.addAction(.cancel)
+                //Fix crash on iPad
+                alertController.popoverPresentationController?.sourceView = self.tableView
+                alertController.popoverPresentationController?.sourceRect = self.tableView.rectForRow(at: indexPath)
+                self.present(alertController, animated: true)
+                self.tableView.deselectRow(at: indexPath, animated: true)
             case .advancedSettings:
                 // Create the URL that deep links to your app's custom settings.
                 if let url = URL(string: UIApplication.openSettingsURLString) {

AltStore/Sources/SourcesViewController.swift

@@ -12,22 +12,17 @@ import CoreData
 import AltStoreCore
 import Roxas
 
-struct SourceError: ALTLocalizedError
+struct SourceError: LocalizedError
 {
-    enum Code: Int, ALTErrorCode
+    enum Code
     {
-        typealias Error = SourceError
-
         case unsupported
     }
     
     var code: Code
-    var errorTitle: String?
-    var errorFailure: String?
-
     @Managed var source: Source
     
-    var errorFailureReason: String {
+    var errorDescription: String? {
         switch self.code
         {
         case .unsupported: return String(format: NSLocalizedString("The source “%@” is not supported by this version of SideStore.", comment: ""), self.$source.name)
@@ -202,7 +197,7 @@ private extension SourcesViewController
     {
         let alertController = UIAlertController(title: NSLocalizedString("Add Source", comment: ""), message: nil, preferredStyle: .alert)
         alertController.addTextField { (textField) in
-            textField.placeholder = "https://apps.sidestore.io"
+            textField.placeholder = "https://apps.altstore.io"
             textField.textContentType = .URL
         }
         alertController.addAction(.cancel)
@@ -550,19 +545,19 @@ extension SourcesViewController: UICollectionViewDelegateFlowLayout
                 footerView.textView.delegate = self
                 
                 let attributedText = NSMutableAttributedString(
-                    string: NSLocalizedString("SideStore has reviewed these sources to make sure they meet our safety standards.", comment: ""),
+                    string: NSLocalizedString("SideStore has reviewed these sources to make sure they meet our safety standards.\n\nSupport for untrusted sources is currently in beta, but you can help test them out by", comment: ""),
                     attributes: [.font: font, .foregroundColor: UIColor.gray]
                 )
-                //attributedText.mutableString.append(" ")
+                attributedText.mutableString.append(" ")
                 
-                //let boldedFont = UIFont(descriptor: font.fontDescriptor.withSymbolicTraits(.traitBold)!, size: font.pointSize)
-                //let openPatreonURL = URL(string: "https://SideStore.io/")!
+                let boldedFont = UIFont(descriptor: font.fontDescriptor.withSymbolicTraits(.traitBold)!, size: font.pointSize)
+                let openPatreonURL = URL(string: "https://SideStore.io/patreon")!
                 
-                // let joinPatreonText = NSAttributedString(
-                    // string: NSLocalizedString("", comment: ""),
-                    // attributes: [.font: boldedFont, .link: openPatreonURL, .underlineColor: UIColor.clear]
-                //)
-                //attributedText.append(joinPatreonText)
+                let joinPatreonText = NSAttributedString(
+                    string: NSLocalizedString("joining our Patreon.", comment: ""),
+                    attributes: [.font: boldedFont, .link: openPatreonURL, .underlineColor: UIColor.clear]
+                )
+                attributedText.append(joinPatreonText)
                 
                 footerView.textView.attributedText = attributedText
                 footerView.textView.textAlignment = .natural

AltStore/TabBarController.swift

@@ -33,7 +33,6 @@ final class TabBarController: UITabBarController
         NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.openPatreonSettings(_:)), name: AppDelegate.openPatreonSettingsDeepLinkNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.importApp(_:)), name: AppDelegate.importAppDeepLinkNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.presentSources(_:)), name: AppDelegate.addSourceDeepLinkNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.openErrorLog(_:)), name: ToastView.openErrorLogNotification, object: nil)
     }
     
     override func viewDidAppear(_ animated: Bool)
@@ -142,7 +141,4 @@ private extension TabBarController
     {
         self.selectedIndex = Tab.myApps.rawValue
     }
-    @objc func openErrorLog(_: Notification){
-        self.selectedIndex = Tab.settings.rawValue
-    }
 }

AltStore/Types/Managed.swift

@@ -10,27 +10,23 @@ import Foundation
 import CoreData
 
 @propertyWrapper @dynamicMemberLookup
-struct Managed<ManagedObject>
+struct Managed<ManagedObject: NSManagedObject>
 {
     var wrappedValue: ManagedObject {
         didSet {
-            self.managedObjectContext = self.managedObject?.managedObjectContext
+            self.managedObjectContext = self.wrappedValue.managedObjectContext
         }
     }
-
+    private var managedObjectContext: NSManagedObjectContext?
+    
     var projectedValue: Managed<ManagedObject> {
         return self
     }
     
-    private var managedObjectContext: NSManagedObjectContext?
-    private var managedObject: NSManagedObject? {
-        return self.wrappedValue as? NSManagedObject
-    }
-
     init(wrappedValue: ManagedObject)
     {
         self.wrappedValue = wrappedValue
-        self.managedObjectContext = self.managedObject?.managedObjectContext
+        self.managedObjectContext = wrappedValue.managedObjectContext
     }
     
     subscript<T>(dynamicMember keyPath: KeyPath<ManagedObject, T>) -> T
@@ -50,18 +46,4 @@ struct Managed<ManagedObject>
         
         return result
     }
-
-    // Optionals
-    subscript<Wrapped, T>(dynamicMember keyPath: KeyPath<Wrapped, T>) -> T? where ManagedObject == Optional<Wrapped> {
-        var result: T?
-
-        if let context = self.managedObjectContext {
-            context.performAndWait {
-                result = self.wrappedValue?[keyPath: keyPath] as? T
-            }
-        } else {
-            result = self.wrappedValue?[keyPath: keyPath] as? T
-        }
-        return result
-    }
 }

AltStoreCore/AltStoreCore.h

@@ -23,6 +23,5 @@ FOUNDATION_EXPORT const unsigned char AltStoreCoreVersionString[];
 // Shared
 #import <AltStoreCore/ALTConstants.h>
 #import <AltStoreCore/ALTConnection.h>
-#import <AltStoreCore/ALTWrappedError.h>
 #import <AltStoreCore/NSError+ALTServerError.h>
 #import <AltStoreCore/CFNotificationName+AltStore.h>

AltStoreCore/Extensions/OperatingSystemVersion+Comparable.swift

@@ -1,18 +0,0 @@
-//
-//  OperatingSystemVersion+Comparable.swift
-//  AltStoreCore
-//
-//  Created by nythepegasus on 5/9/24.
-//
-
-import Foundation
-
-extension OperatingSystemVersion: Comparable {
-    public static func ==(lhs: OperatingSystemVersion, rhs: OperatingSystemVersion) -> Bool {
-        return lhs.majorVersion == rhs.majorVersion && lhs.minorVersion == rhs.minorVersion && lhs.patchVersion == rhs.patchVersion
-    }
-    
-    public static func <(lhs: OperatingSystemVersion, rhs: OperatingSystemVersion) -> Bool {
-        return lhs.stringValue.compare(rhs.stringValue, options: .numeric) == .orderedAscending
-    }
-}

AltStoreCore/Extensions/String+SideStore.swift

@@ -1,14 +0,0 @@
-//
-//  String+SideStore.swift
-//  AltStoreCore
-//
-//  Created by nythepegasus on 5/9/24.
-//
-
-import Foundation
-
-public extension String {
-    init(formatted: String, comment: String? = nil, _ args: String...) {
-        self.init(format: NSLocalizedString(formatted, comment: comment ?? ""), args)
-    }
-}

AltStoreCore/Extensions/UserDefaults+AltStore.swift

@@ -22,19 +22,12 @@ public extension UserDefaults
     @NSManaged var firstLaunch: Date?
     @NSManaged var requiresAppGroupMigration: Bool
     @NSManaged var textServer: Bool
-    @NSManaged var sidejitenable: Bool
-    @NSManaged var textInputSideJITServerurl: String?
     @NSManaged var textInputAnisetteURL: String?
     @NSManaged var customAnisetteURL: String?
-    @NSManaged var menuAnisetteURL: String
-    @NSManaged var menuAnisetteList: String
-    @NSManaged var menuAnisetteServersList: [String]
     @NSManaged var preferredServerID: String?
     
     @NSManaged var isBackgroundRefreshEnabled: Bool
     @NSManaged var isIdleTimeoutDisableEnabled: Bool
-    @NSManaged var isAppLimitDisabled: Bool
-    @NSManaged var isPairingReset: Bool
     @NSManaged var isDebugModeEnabled: Bool
     @NSManaged var presentedLaunchReminderNotification: Bool
     
@@ -79,17 +72,13 @@ public extension UserDefaults
         let localServerSupportsRefreshing = !ProcessInfo.processInfo.isOperatingSystemAtLeast(ios14)
         
         let defaults = [
-            #keyPath(UserDefaults.isAppLimitDisabled): false,
             #keyPath(UserDefaults.isBackgroundRefreshEnabled): true,
             #keyPath(UserDefaults.isIdleTimeoutDisableEnabled): true,
-            #keyPath(UserDefaults.isPairingReset): true,
             #keyPath(UserDefaults.isLegacyDeactivationSupported): isLegacyDeactivationSupported,
             #keyPath(UserDefaults.activeAppLimitIncludesExtensions): activeAppLimitIncludesExtensions,
             #keyPath(UserDefaults.localServerSupportsRefreshing): localServerSupportsRefreshing,
-            #keyPath(UserDefaults.requiresAppGroupMigration): true,
-            #keyPath(UserDefaults.menuAnisetteList): "https://servers.sidestore.io/servers.json",
-            #keyPath(UserDefaults.menuAnisetteURL): "https://ani.sidestore.io"
-        ] as [String : Any]
+            #keyPath(UserDefaults.requiresAppGroupMigration): true
+        ]
         
         UserDefaults.standard.register(defaults: defaults)
         UserDefaults.shared.register(defaults: defaults)

AltStoreCore/Model/AppVersion.swift

@@ -40,7 +40,7 @@ public class AppVersion: NSManagedObject, Decodable, Fetchable
     
     /* Relationships */
     @NSManaged public private(set) var app: StoreApp?
-    @NSManaged @objc(latestVersionApp) public internal(set) var latestSupportedVersionApp: StoreApp?
+    @NSManaged public private(set) var latestVersionApp: StoreApp?
     
     private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
     {
@@ -54,8 +54,6 @@ public class AppVersion: NSManagedObject, Decodable, Fetchable
         case localizedDescription
         case downloadURL
         case size
-        case minOSVersion
-        case maxOSVersion
     }
     
     public required init(from decoder: Decoder) throws
@@ -74,9 +72,6 @@ public class AppVersion: NSManagedObject, Decodable, Fetchable
             
             self.downloadURL = try container.decode(URL.self, forKey: .downloadURL)
             self.size = try container.decode(Int64.self, forKey: .size)
-
-            self._minOSVersion = try container.decodeIfPresent(String.self, forKey: .minOSVersion)
-            self._maxOSVersion = try container.decodeIfPresent(String.self, forKey: .maxOSVersion)
         }
         catch
         {
@@ -118,13 +113,4 @@ public extension AppVersion
 
         return appVersion
     }
-    
-    var isSupported: Bool {
-        if let minOSVersion = self.minOSVersion, !ProcessInfo.processInfo.isOperatingSystemAtLeast(minOSVersion) {
-            return false
-        } else if let maxOSVersion = self.maxOSVersion, ProcessInfo.processInfo.operatingSystemVersion > maxOSVersion {
-            return false
-        }
-        return true
-    }
 }

AltStoreCore/Model/DatabaseManager.swift

@@ -13,11 +13,11 @@ import Roxas
 
 extension CFNotificationName
 {
-    fileprivate static let willMigrateDatabase = CFNotificationName("com.rileytestut.AltStore.WillMigrateDatabase" as CFString)
+    fileprivate static let willAccessDatabase = CFNotificationName("com.rileytestut.AltStore.WillAccessDatabase" as CFString)
 }
 
-private let ReceivedWillMigrateDatabaseNotification: @convention(c) (CFNotificationCenter?, UnsafeMutableRawPointer?, CFNotificationName?, UnsafeRawPointer?, CFDictionary?) -> Void = { (center, observer, name, object, userInfo) in
-    DatabaseManager.shared.receivedWillMigrateDatabaseNotification()
+private let ReceivedWillAccessDatabaseNotification: @convention(c) (CFNotificationCenter?, UnsafeMutableRawPointer?, CFNotificationName?, UnsafeRawPointer?, CFDictionary?) -> Void = { (center, observer, name, object, userInfo) in
+    DatabaseManager.shared.receivedWillAccessDatabaseNotification()
 }
 
 fileprivate class PersistentContainer: RSTPersistentContainer
@@ -52,15 +52,15 @@ public class DatabaseManager
     private let coordinator = NSFileCoordinator()
     private let coordinatorQueue = OperationQueue()
     
-    private var ignoreWillMigrateDatabaseNotification = false
-
+    private var ignoreWillAccessDatabaseNotification = false
+    
     private init()
     {
         self.persistentContainer = PersistentContainer(name: "AltStore", bundle: Bundle(for: DatabaseManager.self))
         self.persistentContainer.preferredMergePolicy = MergePolicy()
         
         let observer = Unmanaged.passUnretained(self).toOpaque()
-        CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), observer, ReceivedWillMigrateDatabaseNotification, CFNotificationName.willMigrateDatabase.rawValue, nil, .deliverImmediately)
+        CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), observer, ReceivedWillAccessDatabaseNotification, CFNotificationName.willAccessDatabase.rawValue, nil, .deliverImmediately)
     }
 }
 
@@ -87,13 +87,10 @@ public extension DatabaseManager
             
             guard !self.isStarted else { return finish(nil) }
             
-            if self.persistentContainer.isMigrationRequired {
-
-                // Quit any other running AltStore processes to prevent concurrent database access during and after migration.
-                self.ignoreWillMigrateDatabaseNotification = true
-                CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), .willMigrateDatabase, nil, nil, true)
-            }
-
+            // Quit any other running AltStore processes to prevent concurrent database access during and after migration.
+            self.ignoreWillAccessDatabaseNotification = true
+            CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), .willAccessDatabase, nil, nil, true)
+            
             self.migrateDatabaseToAppGroupIfNeeded { (result) in
                 switch result
                 {
@@ -232,7 +229,7 @@ private extension DatabaseManager
             else
             {
                 storeApp = StoreApp.makeAltStoreApp(in: context)
-                storeApp.latestSupportedVersion?.version = localApp.version
+                storeApp.latestVersion?.version = localApp.version
                 storeApp.source = altStoreSource
             }
                         
@@ -407,10 +404,7 @@ private extension DatabaseManager
                 // Migrate apps
                 if FileManager.default.fileExists(atPath: previousAppsDirectoryURL.path, isDirectory: nil)
                 {
-                    if(previousAppsDirectoryURL.path != appsDirectoryURL.path)
-                    {
-                        _ = try FileManager.default.replaceItemAt(appsDirectoryURL, withItemAt: previousAppsDirectoryURL)
-                    }
+                    _ = try FileManager.default.replaceItemAt(appsDirectoryURL, withItemAt: previousAppsDirectoryURL)
                 }
                 
                 finish(.success(()))
@@ -423,13 +417,13 @@ private extension DatabaseManager
         }
     }
     
-    func receivedWillMigrateDatabaseNotification()
+    func receivedWillAccessDatabaseNotification()
     {
-        defer { self.ignoreWillMigrateDatabaseNotification = false }
-
+        defer { self.ignoreWillAccessDatabaseNotification = false }
+        
         // Ignore notifications sent by the current process.
-        guard !self.ignoreWillMigrateDatabaseNotification else { return }
-
+        guard !self.ignoreWillAccessDatabaseNotification else { return }
+        
         exit(104)
     }
 }

AltStoreCore/Model/InstalledApp.swift

@@ -62,14 +62,14 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
     
     @objc public var hasUpdate: Bool {
         if self.storeApp == nil { return false }
-        if self.storeApp!.latestSupportedVersion == nil { return false }
-
+        if self.storeApp!.latestVersion == nil { return false }
+        
         let currentVersion = SemanticVersion(self.version)
-        let latestVersion = SemanticVersion(self.storeApp!.latestSupportedVersion!.version)
-
+        let latestVersion = SemanticVersion(self.storeApp!.latestVersion!.version)
+        
         if currentVersion == nil || latestVersion == nil {
             // One of the versions is not valid SemVer, fall back to comparing the version strings by character
-            return self.version < self.storeApp!.latestSupportedVersion!.version
+            return self.version < self.storeApp!.latestVersion!.version
         }
         
         return currentVersion! < latestVersion!
@@ -165,7 +165,6 @@ public extension InstalledApp
         let fetchRequest = InstalledApp.fetchRequest() as NSFetchRequest<InstalledApp>
         fetchRequest.predicate = NSPredicate(format: "%K == YES AND %K == YES",
                                              #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.hasUpdate))
-
         return fetchRequest
     }
     
@@ -276,12 +275,14 @@ public extension InstalledApp
         
         do { try FileManager.default.createDirectory(at: appsDirectoryURL, withIntermediateDirectories: true, attributes: nil) }
         catch { print("Creating App Directory Error: \(error)") }
+        print("`appsDirectoryURL` is set to: \(appsDirectoryURL.absoluteString)")
         return appsDirectoryURL
     }
     
     class var legacyAppsDirectoryURL: URL {
         let baseDirectory = FileManager.default.applicationSupportDirectory
         let appsDirectoryURL = baseDirectory.appendingPathComponent("Apps")
+        print("legacy `appsDirectoryURL` is set to: \(appsDirectoryURL.absoluteString)")
         return appsDirectoryURL
     }
     

AltStoreCore/Model/LoggedError.swift

@@ -19,8 +19,6 @@ extension LoggedError
         case deactivate
         case backup
         case restore
-        case connection
-        case enableJIT
     }
 }
 
@@ -68,12 +66,7 @@ public class LoggedError: NSManagedObject, Fetchable
         self.date = date
         self._operation = operation?.rawValue
         
-        let nsError: NSError
-        if let error = error as? ALTServerError, error.code == .underlyingError, let underlyingError = error.underlyingError {
-            nsError = underlyingError as NSError
-        } else {
-            nsError = error as NSError
-        }
+        let nsError = error as NSError
         self.domain = nsError.domain
         self.code = Int32(nsError.code)
         self.userInfo = nsError.userInfo
@@ -98,7 +91,7 @@ public extension LoggedError
         return app
     }
     
-    var error: NSError {
+    var error: Error {
         let nsError = NSError(domain: self.domain, code: Int(self.code), userInfo: self.userInfo)
         return nsError
     }
@@ -120,8 +113,6 @@ public extension LoggedError
         case .deactivate: return String(format: NSLocalizedString("Deactivate %@ Failed", comment: ""), self.appName)
         case .backup: return String(format: NSLocalizedString("Backup %@ Failed", comment: ""), self.appName)
         case .restore: return String(format: NSLocalizedString("Restore %@ Failed", comment: ""), self.appName)
-        case .connection: return String(format: NSLocalizedString("Connection during %@ Failed", comment: ""), self.appName)
-        case .enableJIT: return String(format: NSLocalizedString("Enabling JIT for %@ Failed", comment: ""), self.appName)
         }
     }
 }

AltStoreCore/Model/MergePolicy.swift

@@ -44,7 +44,7 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
                     let conflictingAppVersions = conflict.conflictingObjects.lazy.compactMap { $0 as? AppVersion }
                     
                     // Primary AppVersion == AppVersion whose latestVersionApp.latestVersion points back to itself.
-                    if let primaryAppVersion = conflictingAppVersions.first(where: { $0.latestSupportedVersionApp?.latestSupportedVersion == $0 }),
+                    if let primaryAppVersion = conflictingAppVersions.first(where: { $0.latestVersionApp?.latestVersion == $0 }),
                        let secondaryAppVersion = conflictingAppVersions.first(where: { $0 != primaryAppVersion })
                     {
                         secondaryAppVersion.managedObjectContext?.delete(secondaryAppVersion)

AltStoreCore/Model/Migrations/Policies/StoreApp10ToStoreApp11Policy.swift

@@ -48,7 +48,7 @@ fileprivate extension NSManagedObject
     
     func setStoreAppLatestVersion(_ appVersion: NSManagedObject)
     {
-        self.setValue(appVersion, forKey: #keyPath(StoreApp.latestSupportedVersion))
+        self.setValue(appVersion, forKey: #keyPath(StoreApp.latestVersion))
         
         let versions = NSOrderedSet(array: [appVersion])
         self.setValue(versions, forKey: #keyPath(StoreApp._versions))

AltStoreCore/Model/Source.swift

@@ -20,17 +20,17 @@ public extension Source
     #if STAGING
     
     #if ALPHA
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
+    static let altStoreSourceURL = URL(string: "https://connect.sidestore.io/")!
     #else
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
+    static let altStoreSourceURL = URL(string: "https://connect.sidestore.io/")!
     #endif
     
     #else
     
     #if ALPHA
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
+    static let altStoreSourceURL = URL(string: "https://connect.sidestore.io/")!
     #else
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
+    static let altStoreSourceURL = URL(string: "https://connect.sidestore.io/")!
     #endif
     
     #endif

AltStoreCore/Model/StoreApp.swift

@@ -146,7 +146,7 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
     @NSManaged @objc(source) public var _source: Source?
     @NSManaged @objc(permissions) public var _permissions: NSOrderedSet
     
-    @NSManaged @objc(latestVersion) public private(set) var latestSupportedVersion: AppVersion?
+    @NSManaged public private(set) var latestVersion: AppVersion?
     @NSManaged @objc(versions) public private(set) var _versions: NSOrderedSet
     
     @NSManaged public private(set) var loggedErrors: NSSet /* Set<LoggedError> */ // Use NSSet to avoid eagerly fetching values.
@@ -170,27 +170,27 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
     }
     
     @nonobjc public var size: Int64? {
-        guard let version = self.latestSupportedVersion else { return nil }
+        guard let version = self.latestVersion else { return nil }
         return version.size
     }
     
     @nonobjc public var version: String? {
-        guard let version = self.latestSupportedVersion else { return nil }
+        guard let version = self.latestVersion else { return nil }
         return version.version
     }
     
     @nonobjc public var versionDescription: String? {
-        guard let version = self.latestSupportedVersion else { return nil }
+        guard let version = self.latestVersion else { return nil }
         return version.localizedDescription
     }
     
     @nonobjc public var versionDate: Date? {
-        guard let version = self.latestSupportedVersion else { return nil }
+        guard let version = self.latestVersion else { return nil }
         return version.date
     }
     
     @nonobjc public var downloadURL: URL? {
-        guard let version = self.latestSupportedVersion else { return nil }
+        guard let version = self.latestVersion else { return nil }
         return version.downloadURL
     }
     
@@ -240,7 +240,7 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
             self.iconURL = try container.decode(URL.self, forKey: .iconURL)
             self.screenshotURLs = try container.decodeIfPresent([URL].self, forKey: .screenshotURLs) ?? []
             
-            var downloadURL = try container.decodeIfPresent(URL.self, forKey: .downloadURL)
+            let downloadURL = try container.decodeIfPresent(URL.self, forKey: .downloadURL)
             let platformURLs = try container.decodeIfPresent(PlatformURLs.self.self, forKey: .platformURLs)
             if let platformURLs = platformURLs {
                 self.platformURLs = platformURLs
@@ -255,22 +255,7 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
             } else if let downloadURL = downloadURL {
                 self._downloadURL = downloadURL
             } else {
-                let version = try container.decode(String.self, forKey: .version)
-                    if let versions = try container.decodeIfPresent([AppVersion].self, forKey: .versions){
-                        for ver in versions {
-                            if ver.version == version {
-                                self._downloadURL = ver.downloadURL
-                                downloadURL = ver.downloadURL // not sure if this is needed
-                            }
-                        }
-                        throw DecodingError.dataCorruptedError(forKey: .downloadURL, in: container, debugDescription: "E downloadURL:String or downloadURLs:[[Platform:URL]] key required.")
-                    } else {
-                        throw DecodingError.dataCorruptedError(forKey: .downloadURL, in: container, debugDescription: "E downloadURL:String or downloadURLs:[[Platform:URL]] key required.")
-                    }
-                    
-//                 else {
-//                throw DecodingError.dataCorruptedError(forKey: .downloadURL, in: container, debugDescription: "E downloadURL:String or downloadURLs:[[Platform:URL]] key required.")
-//                }
+                throw DecodingError.dataCorruptedError(forKey: .downloadURL, in: container, debugDescription: "E downloadURL:String or downloadURLs:[[Platform:URL]] key required.")
             }
             
             if let tintColorHex = try container.decodeIfPresent(String.self, forKey: .tintColor)
@@ -290,9 +275,6 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
             if let versions = try container.decodeIfPresent([AppVersion].self, forKey: .versions)
             {
                 //TODO: Throw error if there isn't at least one version.
-                if (versions.count == 0){
-                    throw DecodingError.dataCorruptedError(forKey: .versions, in: container, debugDescription: "At least one version is required in key: versions")
-                }
                 
                 for version in versions
                 {
@@ -332,30 +314,16 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable
     }
 }
 
-internal extension StoreApp
+private extension StoreApp
 {
     func setVersions(_ versions: [AppVersion])
     {
+        guard let latestVersion = versions.first else { preconditionFailure("StoreApp must have at least one AppVersion.") }
+        
+        self.latestVersion = latestVersion
         self._versions = NSOrderedSet(array: versions)
         
-        let latestSupportedVersion = versions.first(where: { $0.isSupported })
-        self.latestSupportedVersion = latestSupportedVersion
-        
-        for case let version as AppVersion in self._versions
-        {
-            if version == latestSupportedVersion
-            {
-                version.latestSupportedVersionApp = self
-            }
-            else
-            {
-                // Ensure we replace any previous relationship when merging.
-                version.latestSupportedVersionApp = nil
-            }
-        }
-                
         // Preserve backwards compatibility by assigning legacy property values.
-        guard let latestVersion = versions.first else { preconditionFailure("StoreApp must have at least one AppVersion.") }
         self._version = latestVersion.version
         self._versionDate = latestVersion.date
         self._versionDescription = latestVersion.localizedDescription
@@ -366,10 +334,6 @@ internal extension StoreApp
 
 public extension StoreApp
 {
-    var latestAvailableVersion: AppVersion? {
-        return self._versions.firstObject as? AppVersion
-    }
-    
     @nonobjc class func fetchRequest() -> NSFetchRequest<StoreApp>
     {
         return NSFetchRequest<StoreApp>(entityName: "StoreApp")

AltStoreCore/Patreon/PatreonAPI.swift

@@ -10,30 +10,29 @@ import Foundation
 import AuthenticationServices
 import CoreData
 
-private let clientID = "my4hpHHG4iVRme6QALnQGlhSBQiKdB_AinrVgPpIpiC-xiHstTYiLKO5vfariFo1"
-private let clientSecret = "Zow0ggt9YgwIyd4DVLoO9Z02KuuIXW44xhx4lfL27x2u-_u4FE4rYR48bEKREPS5"
+private let clientID = "ZMx0EGUWe4TVWYXNZZwK_fbIK5jHFVWoUf1Qb-sqNXmT-YzAGwDPxxq7ak3_W5Q2"
+private let clientSecret = "1hktsZB89QyN69cB4R0tu55R4TCPQGXxvebYUUh7Y-5TLSnRswuxs6OUjdJ74IJt"
 
-private let campaignID = "12794837"
-
-typealias PatreonAPIError = PatreonAPIErrorCode.Error
-enum PatreonAPIErrorCode: Int, ALTErrorEnum, CaseIterable
-{
-    case unknown
-    case notAuthenticated
-    case invalidAccessToken
-    
-        var errorFailureReason: String {
-        switch self
-        {
-        case .unknown: return NSLocalizedString("An unknown error occurred.", comment: "")
-        case .notAuthenticated: return NSLocalizedString("No connected Patreon account.", comment: "")
-        case .invalidAccessToken: return NSLocalizedString("Invalid access token.", comment: "")
-        }
-    }
-}
+private let campaignID = "2863968"
 
 extension PatreonAPI
 {
+    enum Error: LocalizedError
+    {
+        case unknown
+        case notAuthenticated
+        case invalidAccessToken
+        
+        var errorDescription: String? {
+            switch self
+            {
+            case .unknown: return NSLocalizedString("An unknown error occurred.", comment: "")
+            case .notAuthenticated: return NSLocalizedString("No connected Patreon account.", comment: "")
+            case .invalidAccessToken: return NSLocalizedString("Invalid access token.", comment: "")
+            }
+        }
+    }
+    
     enum AuthorizationType
     {
         case none
@@ -111,7 +110,7 @@ public extension PatreonAPI
                     let components = URLComponents(url: callbackURL, resolvingAgainstBaseURL: false),
                     let codeQueryItem = components.queryItems?.first(where: { $0.name == "code" }),
                     let code = codeQueryItem.value
-                else { throw PatreonAPIError(.unknown) }
+                else { throw Error.unknown }
                 
                 self.fetchAccessToken(oauthCode: code) { (result) in
                     switch result
@@ -152,9 +151,9 @@ public extension PatreonAPI
         self.send(request, authorizationType: .user) { (result: Result<AccountResponse, Swift.Error>) in
             switch result
             {
-            case .failure(~PatreonAPIErrorCode.notAuthenticated):
+            case .failure(Error.notAuthenticated):
                 self.signOut() { (result) in
-                    completion(.failure(PatreonAPIError(.notAuthenticated)))
+                    completion(.failure(Error.notAuthenticated))
                 }
                 
             case .failure(let error): completion(.failure(error))
@@ -358,11 +357,11 @@ private extension PatreonAPI
         {
         case .none: break
         case .creator:
-            guard let creatorAccessToken = Keychain.shared.patreonCreatorAccessToken else { return completion(.failure(PatreonAPIError(.invalidAccessToken))) }
+            guard let creatorAccessToken = Keychain.shared.patreonCreatorAccessToken else { return completion(.failure(Error.invalidAccessToken)) }
             request.setValue("Bearer " + creatorAccessToken, forHTTPHeaderField: "Authorization")
             
         case .user:
-            guard let accessToken = Keychain.shared.patreonAccessToken else { return completion(.failure(PatreonAPIError(.notAuthenticated))) }
+            guard let accessToken = Keychain.shared.patreonAccessToken else { return completion(.failure(Error.notAuthenticated)) }
             request.setValue("Bearer " + accessToken, forHTTPHeaderField: "Authorization")
         }
         
@@ -375,8 +374,8 @@ private extension PatreonAPI
                 {
                     switch authorizationType
                     {
-                    case .creator: completion(.failure(PatreonAPIError(.invalidAccessToken)))
-                    case .none: completion(.failure(PatreonAPIError(.notAuthenticated)))
+                    case .creator: completion(.failure(Error.invalidAccessToken))
+                    case .none: completion(.failure(Error.notAuthenticated))
                     case .user:
                         self.refreshAccessToken() { (result) in
                             switch result

AltStoreCore/Protocols/AppProtocol.swift

@@ -40,7 +40,7 @@ extension ALTApplication: AppProtocol
 extension StoreApp: AppProtocol
 {
     public var url: URL? {
-        return self.latestAvailableVersion?.downloadURL
+        return self.downloadURL
     }
 }
 
@@ -50,17 +50,3 @@ extension InstalledApp: AppProtocol
         return self.fileURL
     }
 }
-
-extension AppVersion: AppProtocol {
-    public var name: String {
-        return self.app?.name ?? self.bundleIdentifier
-    }
-
-    public var bundleIdentifier: String {
-        return self.appBundleID
-    }
-
-    public var url: URL? {
-        return self.downloadURL
-    }
-}

AltWidget/ComplicationView.swift

@@ -82,7 +82,6 @@ struct ComplicationView: View
         }
         .gaugeStyle(.accessoryCircularCapacity)
         .unredacted()
-        .widgetBackground(Color.clear)
     }
 }
 

AltWidget/Extensions/View+AltWidget.swift

@@ -1,27 +0,0 @@
-//
-//  View+AltWidget.swift
-//  AltStore
-//
-//  Created by Riley Testut on 8/18/23.
-//  Copyright © 2023 Riley Testut. All rights reserved.
-//
-
-import SwiftUI
-
-extension View
-{
-    @ViewBuilder
-    func widgetBackground(_ backgroundView: some View) -> some View
-    {
-        if #available(iOSApplicationExtension 17, *)
-        {
-            containerBackground(for: .widget) {
-                backgroundView
-            }
-        }
-        else
-        {
-            background(backgroundView)
-        }
-    }
-}

AltWidget/WidgetView.swift

@@ -104,8 +104,7 @@ struct WidgetView : View
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
             }
         }
-        .widgetBackground(backgroundView(icon: entry.app?.icon, tintColor: entry.app?.tintColor))
-
+        .background(backgroundView(icon: entry.app?.icon, tintColor: entry.app?.tintColor))
     }
 }
 

Build.xcconfig

@@ -1,8 +1,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 0.5.10
-CURRENT_PROJECT_VERSION = 5100
+MARKETING_VERSION = 0.5.5
+CURRENT_PROJECT_VERSION = 5050
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ
@@ -25,6 +25,3 @@ PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_PREFIX).SideStore.$(DEVELOPMENT_
 EXTENSION_PREFIX            = $(PRODUCT_BUNDLE_IDENTIFIER)
 APP_GROUP_IDENTIFIER        = $(PRODUCT_BUNDLE_IDENTIFIER)
 ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME)
-
-// Suppress noise from os activity in xcode console log for release builds
-DEBUG_ACTIVITY_MODE = disable

CERTIFICATE-OF-ORIGIN.md

@@ -1,37 +0,0 @@
-
-
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-

CONTRIBUTING.md

@@ -2,8 +2,6 @@
 
 Thank you for your interest in contributing to SideStore! SideStore is a community driven project, and it's made possible by people like you.
 
-By contributing to this Project (SideStore), you agree to the Developer's Certificate of Origin found in [CERTIFICATE-OF-ORIGIN.md](CERTIFICATE-OF-ORIGIN.md). Any contributions to this project after the addition of the Developer's Certificate of Origin are subject to its policy.
-
 There are many ways to contribute to SideStore, so if you aren't a developer, there are still many other ways you can help out:
 
 -   [Writing documentation](https://github.com/SideStore/SideStore-Docs)

Dependencies/em_proxy.xcodeproj/project.pbxproj

@@ -23,7 +23,7 @@
 			outputFiles = (
 				"$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
 			);
-			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./em_proxy/$LIB_FILE_NAME.a\"\necho Generating Static lib: $BUILT_SRC\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
+			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./em_proxy/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
 		};
 /* End PBXBuildRule section */
 
@@ -223,7 +223,7 @@
 				INSTALL_MODE_FLAG = "";
 				INSTALL_OWNER = "";
 				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = "libem_proxy-ios";
+				"LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy;
 				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim";
 				PRODUCT_NAME = em_proxy_static;
 				SKIP_INSTALL = YES;
@@ -299,7 +299,7 @@
 				INSTALL_MODE_FLAG = "";
 				INSTALL_OWNER = "";
 				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = "libem_proxy-ios";
+				"LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy;
 				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim";
 				PRODUCT_NAME = em_proxy_static;
 				SKIP_INSTALL = YES;

Dependencies/fetch-prebuilt.sh

@@ -3,34 +3,6 @@
 # Ensure we are in Dependencies directory
 cd "$(dirname "$0")"
 
-# Detect if Homebrew is in /opt/homebrew (Apple Silicon) or /usr/local (Intel)
-if [[ -d "/opt/homebrew" ]]; then
-    export PATH="/opt/homebrew/bin:$PATH"
-elif [[ -d "/usr/local" ]]; then
-    export PATH="/usr/local/bin:$PATH"
-fi
-
-# Check if wget and curl are installed; if not, install them via Homebrew
-if ! command -v wget &> /dev/null; then
-    echo "wget not found, attempting to install via Homebrew..."
-    if command -v brew &> /dev/null; then
-        brew install wget
-    else
-        echo "Homebrew is not installed. Please install Homebrew and rerun the script."
-        exit 1
-    fi
-fi
-
-if ! command -v curl &> /dev/null; then
-    echo "curl not found, attempting to install via Homebrew..."
-    if command -v brew &> /dev/null; then
-        brew install curl
-    else
-        echo "Homebrew is not installed. Please install Homebrew and rerun the script."
-        exit 1
-    fi
-fi
-
 check_for_update() {
     if [ -f ".skip-prebuilt-fetch-$1" ]; then
         echo "Skipping prebuilt fetch for $1 since .skip-prebuilt-fetch-$1 exists. If you are developing $1 alongside SideStore, don't remove this file, or this script will replace your locally built binaries with the ones built by GitHub Actions."
@@ -44,40 +16,20 @@ check_for_update() {
     LAST_FETCH=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $1'`
     LAST_COMMIT=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $2'`
 
-    # Check if required library files exist
-    FORCE_DOWNLOAD=false
-    if [ ! -f "$1/lib$1-sim.a" ] || [ ! -f "$1/lib$1-ios.a" ]; then
-        echo "Required libraries missing for $1, forcing download..."
-        FORCE_DOWNLOAD=true
-    fi
-
-    # Download if:
-    # 1. Libraries are missing (FORCE_DOWNLOAD), or
-    # 2. Last fetch was over 1 hour ago, or
-    # 3. Force flag was passed
-    if [ "$FORCE_DOWNLOAD" = true ] || [[ $LAST_FETCH -lt $(expr $(date +%s) - 3600) ]] || [[ "$2" == "force" ]]; then
+    # fetch if last fetch was over 1 hour ago
+    if [[ $LAST_FETCH -lt $(expr $(date +%s) - 3600) ]] || [[ "$2" == "force" ]]; then
         echo "Checking $1 for update"
         echo
         LATEST_COMMIT=`curl https://api.github.com/repos/SideStore/$1/releases/latest | perl -n -e '/Commit: https:\\/\\/github\\.com\\/[^\\/]*\\/[^\\/]*\\/commit\\/([^"]*)/ && print $1'`
         echo
         echo "Last commit: $LAST_COMMIT"
         echo "Latest commit: $LATEST_COMMIT"
-    
-        NOT_UPTODATE=false
         if [[ "$LAST_COMMIT" != "$LATEST_COMMIT" ]]; then
-            echo "Found update on the remote: https://api.github.com/repos/SideStore/$1/releases/latest"
-            NOT_UPTODATE=true
-        fi
-
-        # Download if:
-        # 1. Libraries are missing (FORCE_DOWNLOAD), or
-        # 2. New commit is available
-        if [ "$FORCE_DOWNLOAD" = true ] || [ "$NOT_UPTODATE" = true ] ;then
-            echo "downloading binaries"
+            echo "Found update, downloading binaries"
             echo
             wget -O "$1/lib$1-sim.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1-sim.a"
             if [[ "$1" != "minimuxer" ]]; then
-                wget -O "$1/lib$1-ios.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1.a"
+                wget -O "$1/lib$1.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1.a"
                 wget -O "$1/$1.h" "https://github.com/SideStore/$1/releases/latest/download/$1.h"
                 echo
             else
@@ -87,9 +39,7 @@ check_for_update() {
                 echo "Unzipping generated.zip"
                 cd "$1"
                 unzip ./generated.zip
-                cp -v generated/* .
-                # Remove all files except ones that comes checked-in from minimuxer repository
-                find generated -type f ! -name 'minimuxer-Bridging-Header.h' ! -name 'minimuxer-helpers.swift' -exec rm -v {} \;
+                mv -v generated/* .
                 rm generated.zip
                 rmdir generated/
                 cd ..

Dependencies/minimuxer.xcodeproj/project.pbxproj

@@ -24,7 +24,7 @@
 			outputFiles = (
 				"$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
 			);
-			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./minimuxer/${LIB_FILE_NAME}.a\"\necho Generating Static lib: $BUILT_SRC\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
+			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./minimuxer/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
 		};
 /* End PBXBuildRule section */
 

Makefile

@@ -158,7 +158,7 @@ test:
 
 build:
 	@xcodebuild -project AltStore.xcodeproj \
-				-scheme SideStore \
+				-scheme AltStore \
 				-sdk iphoneos \
 				archive -archivePath ./archive \
 				CODE_SIGNING_REQUIRED=NO \

README.md

@@ -6,7 +6,6 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://makeapullrequest.com)
 [![Nightly SideStore build](https://github.com/SideStore/SideStore/actions/workflows/nightly.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/nightly.yml)
 [![.github/workflows/beta.yml](https://github.com/SideStore/SideStore/actions/workflows/beta.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/beta.yml)
-[![Discord](https://img.shields.io/discord/949183273383395328?label=Discord)](https://discord.gg/sidestore)
 
 ![Alt](https://repobeats.axiom.co/api/embed/3a329ce95955690b9a9366f8d5598626a847d96c.svg "Repobeats analytics image")
 

Shared/Categories/NSError+ALTServerError.m

@@ -8,16 +8,9 @@
 
 #import "NSError+ALTServerError.h"
 
-#if TARGET_OS_OSX
-#import "AltServer-Swift.h"
-#else
-#import "AltStoreCore/AltStoreCore-Swift.h"
-#endif
-
-NSErrorDomain const AltServerErrorDomain = @"AltServer.ServerError";
-NSErrorDomain const AltServerInstallationErrorDomain = @"AltServer.InstallationError";
-NSErrorDomain const AltServerConnectionErrorDomain = @"AltServer.ConnectionError";
-
+NSErrorDomain const AltServerErrorDomain = @"com.rileytestut.AltServer";
+NSErrorDomain const AltServerInstallationErrorDomain = @"com.rileytestut.AltServer.Installation";
+NSErrorDomain const AltServerConnectionErrorDomain = @"com.rileytestut.AltServer.Connection";
 
 NSErrorUserInfoKey const ALTUnderlyingErrorDomainErrorKey = @"underlyingErrorDomain";
 NSErrorUserInfoKey const ALTUnderlyingErrorCodeErrorKey = @"underlyingErrorCode";
@@ -31,16 +24,8 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
 
 + (void)load
 {
-    [NSError alt_setUserInfoValueProviderForDomain:AltServerErrorDomain provider:^id _Nullable(NSError * _Nonnull error, NSErrorUserInfoKey _Nonnull userInfoKey) {
-        if ([userInfoKey isEqualToString:NSLocalizedDescriptionKey])
-        {
-            return [error altserver_localizedDescription];
-        }
-        else if ([userInfoKey isEqualToString:NSLocalizedFailureErrorKey])
-        {
-            return [error altserver_localizedFailure];
-        }
-        else if ([userInfoKey isEqualToString:NSLocalizedFailureReasonErrorKey])
+    [NSError setUserInfoValueProviderForDomain:AltServerErrorDomain provider:^id _Nullable(NSError * _Nonnull error, NSErrorUserInfoKey  _Nonnull userInfoKey) {
+        if ([userInfoKey isEqualToString:NSLocalizedFailureReasonErrorKey])
         {
             return [error altserver_localizedFailureReason];
         }
@@ -56,10 +41,10 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
         return nil;
     }];
     
-    [NSError alt_setUserInfoValueProviderForDomain:AltServerConnectionErrorDomain provider:^id _Nullable(NSError * _Nonnull error, NSErrorUserInfoKey  _Nonnull userInfoKey) {
-        if ([userInfoKey isEqualToString:NSLocalizedFailureReasonErrorKey])
+    [NSError setUserInfoValueProviderForDomain:AltServerConnectionErrorDomain provider:^id _Nullable(NSError * _Nonnull error, NSErrorUserInfoKey  _Nonnull userInfoKey) {
+        if ([userInfoKey isEqualToString:NSLocalizedDescriptionKey])
         {
-            return [error altserver_connection_localizedFailureReason];
+            return [error altserver_connection_localizedDescription];
         }
         else if ([userInfoKey isEqualToString:NSLocalizedRecoverySuggestionErrorKey])
         {
@@ -70,53 +55,6 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
     }];
 }
 
-- (nullable NSString *)altserver_localizedDescription
-{
-    switch ((ALTServerError)self.code)
-    {
-        case ALTServerErrorUnderlyingError:
-        {
-            // We're wrapping another error, so return the wrapped error's localized description.
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            return underlyingError.localizedDescription;
-        }
-
-        default:
-            return nil;
-    }
-}
-
-- (nullable NSString *)altserver_localizedFailure
-{
-    switch ((ALTServerError)self.code)
-    {
-        case ALTServerErrorUnderlyingError:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            return underlyingError.alt_localizedFailure;
-        }
-
-        case ALTServerErrorConnectionFailed:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            if (underlyingError.localizedFailureReason != nil)
-            {
-                // Only return localized failure if there is an underlying error with failure reason.
-#if TARGET_OS_OSX
-                return NSLocalizedString(@"There was an error connecting to the device.", @"");
-#else
-                return NSLocalizedString(@"AltServer could not establish a connection to SideStore.", @"");
-#endif
-            }
-
-            return nil;
-        }
-
-        default:
-            return nil;
-    }
-}
-
 - (nullable NSString *)altserver_localizedFailureReason
 {
     switch ((ALTServerError)self.code)
@@ -142,21 +80,12 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
             return NSLocalizedString(@"An unknown error occured.", @"");
             
         case ALTServerErrorConnectionFailed:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            if (underlyingError.localizedFailureReason != nil)
-            {
-                return underlyingError.localizedFailureReason;
-            }
-
-            // Return fallback failure reason if there isn't an underlying error with failure reason.
 #if TARGET_OS_OSX
             return NSLocalizedString(@"There was an error connecting to the device.", @"");
 #else
             return NSLocalizedString(@"Could not connect to SideStore.", @"");
 #endif
-        }
-
+            
         case ALTServerErrorLostConnection:
             return NSLocalizedString(@"Lost connection to SideStore.", @"");
             
@@ -164,8 +93,8 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
             return NSLocalizedString(@"SideStore could not find this device.", @"");
             
         case ALTServerErrorDeviceWriteFailed:
-            return NSLocalizedString(@"SideStore could not write data to this device.", @"");
-
+            return NSLocalizedString(@"Failed to write app data to device.", @"");
+            
         case ALTServerErrorInvalidRequest:
             return NSLocalizedString(@"SideStore received an invalid request.", @"");
             
@@ -173,20 +102,14 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
             return NSLocalizedString(@"SideStore sent an invalid response.", @"");
             
         case ALTServerErrorInvalidApp:
-            return NSLocalizedString(@"The app is in an invalid format.", @"");
-
+            return NSLocalizedString(@"The app is invalid.", @"");
+            
         case ALTServerErrorInstallationFailed:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            if (underlyingError != nil) {
-                return underlyingError.localizedFailureReason ?: underlyingError.localizedDescription;
-            }
             return NSLocalizedString(@"An error occured while installing the app.", @"");
-        }
-
+            
         case ALTServerErrorMaximumFreeAppLimitReached:
-            return NSLocalizedString(@"You cannot activate more than 3 apps with a non-developer Apple ID.", @"");
-
+            return NSLocalizedString(@"Cannot activate more than 3 apps with a non-developer Apple ID.", @"");
+            
         case ALTServerErrorUnsupportediOSVersion:
             return NSLocalizedString(@"Your device must be running iOS 12.2 or later to install SideStore.", @"");
             
@@ -194,8 +117,8 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
             return NSLocalizedString(@"SideStore does not support this request.", @"");
             
         case ALTServerErrorUnknownResponse:
-            return NSLocalizedString(@"SideStore received an unknown response from SideStore.", @"");
-
+            return NSLocalizedString(@"Received an unknown response from SideStore.", @"");
+            
         case ALTServerErrorInvalidAnisetteData:
             return NSLocalizedString(@"The provided anisette data is invalid.", @"");
             
@@ -230,19 +153,7 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
 {
     switch ((ALTServerError)self.code)
     {
-        case ALTServerErrorUnderlyingError:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            return underlyingError.localizedRecoverySuggestion;
-        }
         case ALTServerErrorConnectionFailed:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            if (underlyingError.localizedRecoverySuggestion != nil){
-                return underlyingError.localizedRecoverySuggestion;
-            }
-			// If there is no underlying error found, fall through to AltServerErrorDeviceNotFound
-        }
         case ALTServerErrorDeviceNotFound:
             return NSLocalizedString(@"Make sure you have trusted this device with your computer and Wi-Fi sync is enabled.", @"");
             
@@ -271,13 +182,6 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
 {
     switch ((ALTServerError)self.code)
     {
-        case ALTServerErrorUnderlyingError:
-        {
-            NSError *underlyingError = self.userInfo[NSUnderlyingErrorKey];
-            return underlyingError.alt_localizedDebugDescription;
-
-        }
-
         case ALTServerErrorIncompatibleDeveloperDisk:
         {
             NSString *path = self.userInfo[NSFilePathErrorKey];
@@ -287,7 +191,7 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
             }
 
             NSString *osVersion = [self altserver_osVersion] ?: NSLocalizedString(@"this device's OS version", @"");
-            NSString *debugDescription = [NSString stringWithFormat:NSLocalizedString(@"The Developer disk located at %@ is incompatible with %@.", @""), path, osVersion];
+            NSString *debugDescription = [NSString stringWithFormat:NSLocalizedString(@"The Developer disk located at\n\n%@\n\nis incompatible with %@.", @""), path, osVersion];
             return debugDescription;
         }
             
@@ -328,7 +232,7 @@ NSErrorUserInfoKey const ALTOperatingSystemVersionErrorKey = @"ALTOperatingSyste
 
 #pragma mark - AltServerConnectionErrorDomain -
 
-- (nullable NSString *)altserver_connection_localizedFailureReason
+- (nullable NSString *)altserver_connection_localizedDescription
 {
     switch ((ALTServerConnectionError)self.code)
     {

Shared/Errors/ALTLocalizedError.swift

@@ -1,182 +0,0 @@
-//
-//  ALTLocalizedError.swift
-//  AltStore
-//
-//  Created by Riley Testut on 10/14/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import Foundation
-import AltSign
-
-public let ALTLocalizedTitleErrorKey = "ALTLocalizedTitle"
-public let ALTLocalizedDescriptionKey = "ALTLocalizedDescription"
-
-public protocol ALTLocalizedError<Code>: LocalizedError, CustomNSError, CustomStringConvertible
-{
-    associatedtype Code: ALTErrorCode
-
-    var code: Code { get }
-    var errorFailureReason: String { get }
-
-    var errorTitle: String? { get set }
-    var errorFailure: String? { get set }
-
-    var sourceFile: String? { get set }
-    var sourceLine: UInt? { get set }
-}
-
-public extension ALTLocalizedError
-{
-    var sourceFile: String? {
-        get { nil }
-        set {}
-    }
-
-    var sourceLine: UInt? {
-        get { nil }
-        set {}
-    }
-}
-
-public protocol ALTErrorCode: RawRepresentable where RawValue == Int
-{
-    associatedtype Error: ALTLocalizedError where Error.Code == Self
-
-    static var errorDomain: String { get } // Optional
-}
-
-public protocol ALTErrorEnum: ALTErrorCode
-{
-    associatedtype Error = DefaultLocalizedError<Self>
-
-    var errorFailureReason: String { get }
-}
-
-/// LocalizedError & CustomNSError & CustomStringConvertible
-public extension ALTLocalizedError
-{
-    var errorCode: Int { self.code.rawValue }
-
-    var errorDescription: String? {
-        guard (self as NSError).localizedFailure == nil else {
-            // Error has localizedFailure, so return nil to construct localizedDescription from it + localizedFailureReason.
-            return nil
-        }
-
-        // Otherwise, return failureReason for localizedDescription to avoid system prepending "Operation Failed" message.
-        return self.failureReason
-    }
-
-    var failureReason: String? {
-        return self.errorFailureReason
-    }
-
-    var errorUserInfo: [String : Any] {
-        let userInfo: [String: Any?] = [
-            NSLocalizedFailureErrorKey: self.errorFailure,
-            ALTLocalizedTitleErrorKey: self.errorTitle,
-//            ALTSourceFileErrorKey: self.sourceFile, // TODO: Figure out where these come from
-//            ALTSourceLineErrorKey: self.sourceLine,
-        ]
-
-        return userInfo.compactMapValues { $0 }
-    }
-
-    var description: String {
-        let description = "\(self.localizedErrorCode) “\(self.localizedDescription)”"
-        return description
-    }
-}
-
-/// Default Implementations
-public extension ALTLocalizedError where Code: ALTErrorEnum
-{
-    static var errorDomain: String {
-        return Code.errorDomain
-    }
-
-    // ALTErrorEnum Codes provide their failure reason directly.
-    var errorFailureReason: String {
-        return self.code.errorFailureReason
-    }
-}
-
-/// Default Implementations
-public extension ALTErrorCode
-{
-    static var errorDomain: String {
-        let typeName = String(reflecting: Self.self) // "\(Self.self)" doesn't include module name, but String(reflecting:) does.
-        let errorDomain = typeName.replacingOccurrences(of: "ErrorCode", with: "Error")
-        return errorDomain
-    }
-}
-
-public extension ALTLocalizedError
-{
-    // Allows us to initialize errors with localizedTitle + localizedFailure
-    // while still using the error's custom initializer at callsite.
-    init(_ error: Self, localizedTitle: String? = nil, localizedFailure: String? = nil)
-    {
-        self = error
-
-        if let localizedTitle
-        {
-            self.errorTitle = localizedTitle
-        }
-
-        if let localizedFailure
-        {
-            self.errorFailure = localizedFailure
-        }
-    }
-}
-
-public struct DefaultLocalizedError<Code: ALTErrorEnum>: ALTLocalizedError
-{
-    public let code: Code
-
-    public var errorTitle: String?
-    public var errorFailure: String?
-    public var sourceFile: String?
-    public var sourceLine: UInt?
-
-    public init(_ code: Code, localizedTitle: String? = nil, localizedFailure: String? = nil, sourceFile: String? = #fileID, sourceLine: UInt? = #line)
-    {
-        self.code = code
-        self.errorTitle = localizedTitle
-        self.errorFailure = localizedFailure
-        self.sourceFile = sourceFile
-        self.sourceLine = sourceLine
-    }
-}
-
-/// Custom Operators
-/// These allow us to pattern match ALTErrorCodes against arbitrary errors via ~ prefix.
-prefix operator ~
-public prefix func ~<Code: ALTErrorCode>(expression: Code) -> NSError
-{
-    let nsError = NSError(domain: Code.errorDomain, code: expression.rawValue)
-    return nsError
-}
-
-public func ~=(pattern: any Swift.Error, value: any Swift.Error) -> Bool
-{
-    let isMatch = pattern._domain == value._domain && pattern._code == value._code
-    return isMatch
-}
-
-// These operators *should* allow us to match ALTErrorCodes against arbitrary errors,
-// but they don't work as of iOS 16.1 and Swift 5.7.
-//
-//public func ~=<Error: ALTLocalizedError>(pattern: Error, value: Swift.Error) -> Bool
-//{
-//    let isMatch = pattern._domain == value._domain && pattern._code == value._code
-//    return isMatch
-//}
-//
-//public func ~=<Code: ALTErrorCode>(pattern: Code, value: Swift.Error) -> Bool
-//{
-//    let isMatch = Code.errorDomain == value._domain && pattern.rawValue == value._code
-//    return isMatch
-//}

Shared/Errors/ALTWrappedError.h

@@ -1,25 +0,0 @@
-//
-//  ALTWrappedError.h
-//  AltStoreCore
-//
-//  Created by Riley Testut on 11/28/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-// Overrides localizedDescription to check userInfoValueProvider for failure reason
-// instead of default behavior which just returns NSLocalizedFailureErrorKey if present.
-//
-// Must be written in Objective-C for Swift.Error <-> NSError bridging to work correctly.
-@interface ALTWrappedError : NSError
-
-@property (copy, nonatomic) NSError *wrappedError;
-
-- (instancetype)initWithError:(NSError *)error userInfo:(NSDictionary<NSString *, id> *)userInfo;
-
-@end
-
-NS_ASSUME_NONNULL_END

Shared/Errors/ALTWrappedError.m

@@ -1,73 +0,0 @@
-//
-//  ALTWrappedError.m
-//  AltStoreCore
-//
-//  Created by Riley Testut on 11/28/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-#import "ALTWrappedError.h"
-
-@implementation ALTWrappedError
-
-+ (BOOL)supportsSecureCoding
-{
-    // Required in order to serialize errors for legacy AltServer communication.
-    return YES;
-}
-
-- (instancetype)initWithError:(NSError *)error userInfo:(NSDictionary<NSString *,id> *)userInfo
-{
-    self = [super initWithDomain:error.domain code:error.code userInfo:userInfo];
-    if (self)
-    {
-        if ([error isKindOfClass:[ALTWrappedError class]])
-        {
-            _wrappedError = [(ALTWrappedError *)error wrappedError];
-        }
-        else
-        {
-            _wrappedError = [error copy];
-        }
-    }
-
-    return self;
-}
-
-- (NSString *)localizedDescription
-{
-    NSString *localizedFailure = self.userInfo[NSLocalizedFailureErrorKey];
-    if (localizedFailure != nil)
-    {
-        NSString *wrappedLocalizedDescription = self.wrappedError.userInfo[NSLocalizedDescriptionKey];
-        NSString *localizedFailureReason = wrappedLocalizedDescription ?: self.wrappedError.localizedFailureReason ?: self.wrappedError.localizedDescription;
-
-        NSString *localizedDescription = [NSString stringWithFormat:@"%@ %@", localizedFailure, localizedFailureReason];
-        return localizedDescription;
-    }
-
-    // localizedFailure is nil, so return wrappedError's localizedDescription.
-    return self.wrappedError.localizedDescription;
-}
-
-- (NSString *)localizedFailureReason
-{
-    return self.wrappedError.localizedFailureReason;
-}
-
-- (NSString *)localizedRecoverySuggestion
-{
-    return self.wrappedError.localizedRecoverySuggestion;
-}
-
-- (NSString *)debugDescription
-{
-    return self.wrappedError.debugDescription;
-}
-
-- (NSString *)helpAnchor
-{
-    return self.wrappedError.helpAnchor;
-}
-
-@end

Shared/Extensions/ALTServerError+Conveniences.swift

@@ -22,8 +22,12 @@ public extension ALTServerError
         case is EncodingError: self = ALTServerError(.invalidResponse, underlyingError: error)
         case let error as NSError:
             var userInfo = error.userInfo
-            userInfo[NSUnderlyingErrorKey] = error
-
+            if !userInfo.keys.contains(NSUnderlyingErrorKey)
+            {
+                // Assign underlying error (if there isn't already one).
+                userInfo[NSUnderlyingErrorKey] = error
+            }
+            
             self = ALTServerError(.underlyingError, userInfo: userInfo)
         }
     }

Shared/Extensions/NSError+AltStore.swift

@@ -8,17 +8,7 @@
 
 import Foundation
 
-#if canImport(UIKit)
-import UIKit
-public typealias ALTFont = UIFont
-#elseif canImport(AppKit)
-import AppKit
-public typealias ALTFont = NSFont
-#endif
-
-import AltSign
-
-public extension NSError
+extension NSError
 {
     @objc(alt_localizedFailure)
     var localizedFailure: String? {
@@ -31,53 +21,52 @@ public extension NSError
         let debugDescription = (self.userInfo[NSDebugDescriptionErrorKey] as? String) ?? (NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSDebugDescriptionErrorKey) as? String)
         return debugDescription
     }
-
-    @objc(alt_localizedTitle)
-    var localizedTitle: String? {
-        return self.userInfo[ALTLocalizedTitleErrorKey] as? String
-    }
-
+    
     @objc(alt_errorWithLocalizedFailure:)
     func withLocalizedFailure(_ failure: String) -> NSError
     {
-        switch self
+        var userInfo = self.userInfo
+        userInfo[NSLocalizedFailureErrorKey] = failure
+        
+        if let failureReason = self.localizedFailureReason
         {
-        case var error as any ALTLocalizedError:
-            error.errorFailure = failure
-            return error as NSError
-
-        default:
-            var userInfo = self.userInfo
-            userInfo[NSLocalizedFailureReasonErrorKey] = failure
-
-            return ALTWrappedError(error: self, userInfo: userInfo)
+            userInfo[NSLocalizedFailureReasonErrorKey] = failureReason
         }
-    }
-    @objc(alt_errorWithLocalizedTitle:)
-    func withLocalizedTitle(_ title: String) -> NSError {
-		switch self
+        else if self.localizedFailure == nil && self.localizedFailureReason == nil && self.localizedDescription.contains(self.localizedErrorCode)
         {
-        case var error as any ALTLocalizedError:
-            error.errorTitle = title
-            return error as NSError
-
-        default:
-            var userInfo = self.userInfo
-            userInfo[ALTLocalizedTitleErrorKey] = title
-            return ALTWrappedError(error: self, userInfo: userInfo)
-
+            // Default localizedDescription, so replace with just the localized error code portion.
+            userInfo[NSLocalizedFailureReasonErrorKey] = "(\(self.localizedErrorCode).)"
         }
+        else
+        {
+            userInfo[NSLocalizedFailureReasonErrorKey] = self.localizedDescription
+        }
+        
+        if let localizedDescription = NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSLocalizedDescriptionKey) as? String
+        {
+            userInfo[NSLocalizedDescriptionKey] = localizedDescription
+        }
+        
+        // Don't accidentally remove localizedDescription from dictionary
+        // userInfo[NSLocalizedDescriptionKey] = NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSLocalizedDescriptionKey) as? String
+        
+        if let recoverySuggestion = self.localizedRecoverySuggestion
+        {
+            userInfo[NSLocalizedRecoverySuggestionErrorKey] = recoverySuggestion
+        }
+        
+        let error = NSError(domain: self.domain, code: self.code, userInfo: userInfo)
+        return error
     }
     
-    func sanitizedForSerialization() -> NSError
+    func sanitizedForCoreData() -> NSError
     {
         var userInfo = self.userInfo
-        userInfo[NSLocalizedDescriptionKey] = self.localizedDescription
         userInfo[NSLocalizedFailureErrorKey] = self.localizedFailure
+        userInfo[NSLocalizedDescriptionKey] = self.localizedDescription
         userInfo[NSLocalizedFailureReasonErrorKey] = self.localizedFailureReason
         userInfo[NSLocalizedRecoverySuggestionErrorKey] = self.localizedRecoverySuggestion
-        userInfo[NSDebugDescriptionErrorKey] = self.localizedDebugDescription
-
+        
         // Remove userInfo values that don't conform to NSSecureEncoding.
         userInfo = userInfo.filter { (key, value) in
             return (value as AnyObject) is NSSecureCoding
@@ -86,166 +75,69 @@ public extension NSError
         // Sanitize underlying errors.
         if let underlyingError = userInfo[NSUnderlyingErrorKey] as? Error
         {
-            let sanitizedError = (underlyingError as NSError).sanitizedForSerialization()
+            let sanitizedError = (underlyingError as NSError).sanitizedForCoreData()
             userInfo[NSUnderlyingErrorKey] = sanitizedError
         }
         
         if #available(iOS 14.5, macOS 11.3, *), let underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey] as? [Error]
         {
-            let sanitizedErrors = underlyingErrors.map { ($0 as NSError).sanitizedForSerialization() }
+            let sanitizedErrors = underlyingErrors.map { ($0 as NSError).sanitizedForCoreData() }
             userInfo[NSMultipleUnderlyingErrorsKey] = sanitizedErrors
         }
         
         let error = NSError(domain: self.domain, code: self.code, userInfo: userInfo)
         return error
     }
-    func formattedDetailedDescription(with font: ALTFont) -> NSAttributedString {
-#if canImport(UIKit)
-        let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitBold) ?? font.fontDescriptor
-#else
-        let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.bold)
-#endif
-        let boldFont = ALTFont(descriptor: boldFontDescriptor, size: font.pointSize) ?? font
-
-        var preferredKeyOrder = [
-            NSDebugDescriptionErrorKey,
-            NSLocalizedDescriptionKey,
-            NSLocalizedFailureErrorKey,
-            NSLocalizedFailureReasonErrorKey,
-            NSLocalizedRecoverySuggestionErrorKey,
-            ALTLocalizedTitleErrorKey,
-//            ALTSourceFileErrorKey,
-//            ALTSourceLineErrorKey,
-            NSUnderlyingErrorKey
-        ]
-
-        if #available(iOS 14.5, macOS 11.3, *) {
-            preferredKeyOrder.append(NSMultipleUnderlyingErrorsKey)
-        }
-
-        var userInfo = self.userInfo
-        userInfo[NSDebugDescriptionErrorKey] = self.localizedDebugDescription
-        userInfo[NSLocalizedDescriptionKey] = self.localizedDescription
-        userInfo[NSLocalizedFailureErrorKey] = self.localizedFailure
-        userInfo[NSLocalizedFailureReasonErrorKey] = self.localizedFailureReason
-        userInfo[NSLocalizedRecoverySuggestionErrorKey] = self.localizedRecoverySuggestion
-
-        let sortedUserInfo = userInfo.sorted { a, b in
-            let indexA = preferredKeyOrder.firstIndex(of: a.key)
-            let indexB = preferredKeyOrder.firstIndex(of: b.key)
-            switch (indexA, indexB) {
-            case (let indexA?, let indexB?): return indexA < indexB
-            case (_?, nil): return true // indexA exists, indexB is nil, indexA should come first
-            case (nil, _?): return false // indexB exists, indexB is nil, indexB should come first
-            case (nil, nil): return a.key < b.key // both nil, so sort alphabetically
-            }
-        }
-
-        let detailedDescription = NSMutableAttributedString()
-
-        for (key, value) in sortedUserInfo
-        {
-            let keyName: String
-            switch key
-            {
-            case NSDebugDescriptionErrorKey: keyName = NSLocalizedString("Debug Description", comment: "")
-            case NSLocalizedDescriptionKey: keyName = NSLocalizedString("Error Description", comment: "")
-            case NSLocalizedFailureErrorKey: keyName = NSLocalizedString("Failure", comment: "")
-            case NSLocalizedFailureReasonErrorKey: keyName = NSLocalizedString("Failure Reason", comment: "")
-            case NSLocalizedRecoverySuggestionErrorKey: keyName = NSLocalizedString("Recovery Suggestion", comment: "")
-            case ALTLocalizedTitleErrorKey: keyName = NSLocalizedString("Title", comment: "")
-//            case ALTSourceFileErrorKey: keyName = NSLocalizedString("Source File", comment: "")
-//            case ALTSourceLineErrorKey: keyName = NSLocalizedString("Source Line", comment: "")
-            case NSUnderlyingErrorKey: keyName = NSLocalizedString("Underlying Error", comment: "")
-            default:
-                if #available(iOS 14.5, macOS 11.3, *), key == NSMultipleUnderlyingErrorsKey
-                {
-                    keyName = NSLocalizedString("Underlying Errors", comment: "")
-                }
-                else
-                {
-                    keyName = key
-                }
-            }
-
-            let attributedKey = NSAttributedString(string: keyName, attributes: [.font: boldFont])
-            let attributedValue = NSAttributedString(string: String(describing: value), attributes: [.font: font])
-
-            let attributedString = NSMutableAttributedString(attributedString: attributedKey)
-            attributedString.mutableString.append("\n")
-            attributedString.append(attributedValue)
-
-            if !detailedDescription.string.isEmpty
-            {
-                detailedDescription.mutableString.append("\n\n")
-            }
-
-            detailedDescription.append(attributedString)
-        }
-
-        // Support dark mode
-		#if canImport(UIKit)
-        if #available(iOS 13, *)
-        {
-            detailedDescription.addAttribute(.foregroundColor, value: UIColor.label, range: NSMakeRange(0, detailedDescription.length))
-        }
-		#else
-        detailedDescription.addAttribute(.foregroundColor, value: NSColor.labelColor, range: NSMakeRange(0, detailedDescription.length))
-		#endif
-
-        return detailedDescription
-    }
 }
 
-public extension NSError
-{
-    typealias UserInfoProvider = (Error, String) -> Any?
-
-    @objc
-    class func alt_setUserInfoValueProvider(forDomain domain: String, provider: UserInfoProvider?) {
-        NSError.setUserInfoValueProvider(forDomain: domain) { error, key in
-			let nsError = error as NSError
-
-            switch key{
-            case NSLocalizedDescriptionKey:
-                if nsError.localizedFailure != nil {
-                    // Error has localizedFailure, so return nil to construct localizedDescription from it + localizedFailureReason
-                    return nil
-                } else if let localizedDescription = provider?(error, NSLocalizedDescriptionKey) as? String {
-                    // Only call provider() if there is no localizedFailure
-                    return localizedDescription
-                }
-
-                /* Otherwise return failureReason for localizedDescription to avoid system prepending "Operation Failed" message
-                   Do NOT return provider(NSLocalizedFailureReason) which might be unexpectedly nil if unrecognized error code. */
-
-                return nsError.localizedFailureReason
-
-            default:
-                return provider?(error, key)
-            }
-        }
-    }
-}
-
-public extension Error
+extension Error
 {
     var underlyingError: Error? {
-		return (self as NSError).userInfo[NSUnderlyingErrorKey] as? Error
+        let underlyingError = (self as NSError).userInfo[NSUnderlyingErrorKey] as? Error
+        return underlyingError
     }
-
+    
     var localizedErrorCode: String {
-        return String(format: NSLocalizedString("%@ %@", comment: ""), (self as NSError).domain, self.displayCode as NSNumber)
-    }
-
-    var displayCode: Int {
-        guard let serverError = self as? ALTServerError else {
-            return (self as NSError).code
-        }
-
-        /* We want AltServerError codes to start at 2000, but we can't change them without breaking AltServer compatibility.
-           Instead we just add 2000 when displaying code to the user to make it appear as if the codes start at 2000 anyway.
-         */
-        return 2000 + serverError.code.rawValue
+        let localizedErrorCode = String(format: NSLocalizedString("%@ error %@", comment: ""), (self as NSError).domain, (self as NSError).code as NSNumber)
+        return localizedErrorCode
     }
 }
+
+protocol ALTLocalizedError: LocalizedError, CustomNSError
+{
+    var failure: String? { get }
+    
+    var underlyingError: Error? { get }
+}
+
+extension ALTLocalizedError
+{
+    var errorUserInfo: [String : Any] {
+        let userInfo = ([
+            NSLocalizedDescriptionKey: self.errorDescription,
+            NSLocalizedFailureReasonErrorKey: self.failureReason,
+            NSLocalizedFailureErrorKey: self.failure,
+            NSUnderlyingErrorKey: self.underlyingError
+        ] as [String: Any?]).compactMapValues { $0 }
+        return userInfo
+    }
+    
+    var underlyingError: Error? {
+        // Error's default implementation calls errorUserInfo,
+        // but ALTLocalizedError.errorUserInfo calls underlyingError.
+        // Return nil to prevent infinite recursion.
+        return nil
+    }
+    
+    var errorDescription: String? {
+        guard let errorFailure = self.failure else { return (self.underlyingError as NSError?)?.localizedDescription }
+        guard let failureReason = self.failureReason else { return errorFailure }
+        
+        let errorDescription = errorFailure + " " + failureReason
+        return errorDescription
+    }
+    
+    var failureReason: String? { (self.underlyingError as NSError?)?.localizedDescription }
+    var recoverySuggestion: String? { (self.underlyingError as NSError?)?.localizedRecoverySuggestion }
+    var helpAnchor: String? { (self.underlyingError as NSError?)?.helpAnchor }
+}

Shared/Server Protocol/CodableError.swift

@@ -1,249 +0,0 @@
-//
-//  CodableError.swift
-//  AltKit
-//
-//  Created by Riley Testut on 3/5/20.
-//  Copyright © 2020 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-// Can only automatically conform ALTServerError.Code to Codable, not ALTServerError itself
-extension ALTServerError.Code: Codable {}
-
-private extension ErrorUserInfoKey
-{
-    static let altLocalizedDescription: String = "ALTLocalizedDescription"
-    static let altLocalizedFailureReason: String = "ALTLocalizedFailureReason"
-    static let altLocalizedRecoverySuggestion: String = "ALTLocalizedRecoverySuggestion"
-    static let altDebugDescription: String = "ALTDebugDescription"
-}
-
-extension CodableError
-{
-    enum UserInfoValue: Codable
-    {
-        case unknown
-        case string(String)
-        case number(Int)
-        case error(NSError)
-        case codableError(CodableError)
-        indirect case array([UserInfoValue])
-        indirect case dictionary([String: UserInfoValue])
-
-        var value: Any? {
-            switch self
-            {
-            case .unknown: return nil
-            case .string(let string): return string
-            case .number(let number): return number
-            case .error(let error): return error
-            case .codableError(let error): return error.error
-            case .array(let array): return array.compactMap { $0.value } // .compactMap instead of .map to ensure nil values are removed.
-            case .dictionary(let dictionary): return dictionary.compactMapValues { $0.value } // .compactMapValues instead of .mapValues to ensure nil values are removed.
-            }
-        }
-
-        var codableValue: Codable? {
-            switch self
-            {
-            case .unknown, .string, .number: return self.value as? Codable
-            case .codableError(let error): return error
-            case .error(let nsError):
-                // Ignore error because we don't want to fail completely if error contains invalid user info value.
-                let sanitizedError = nsError.sanitizedForSerialization()
-                let data = try? NSKeyedArchiver.archivedData(withRootObject: sanitizedError, requiringSecureCoding: true)
-                return data
-
-            case .array(let array): return array
-            case .dictionary(let dictionary): return dictionary
-            }
-        }
-
-        init(_ rawValue: Any?)
-        {
-            switch rawValue
-            {
-            case let string as String: self = .string(string)
-            case let number as Int: self = .number(number)
-            case let error as NSError: self = .codableError(CodableError(error: error))
-            case let array as [Any]: self = .array(array.compactMap(UserInfoValue.init))
-            case let dictionary as [String: Any]: self = .dictionary(dictionary.compactMapValues(UserInfoValue.init))
-            default: self = .unknown
-            }
-        }
-
-        init(from decoder: Decoder) throws
-        {
-            let container = try decoder.singleValueContainer()
-
-            if
-                let data = try? container.decode(Data.self),
-                let error = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSError.self, from: data)
-            {
-                self = .error(error)
-            }
-            else if let codableError = try? container.decode(CodableError.self)
-            {
-                self = .codableError(codableError)
-            }
-            else if let string = try? container.decode(String.self)
-            {
-                self = .string(string)
-            }
-            else if let number = try? container.decode(Int.self)
-            {
-                self = .number(number)
-            }
-            else if let array = try? container.decode([UserInfoValue].self)
-            {
-                self = .array(array)
-            }
-            else if let dictionary = try? container.decode([String: UserInfoValue].self)
-            {
-                self = .dictionary(dictionary)
-            }
-            else
-            {
-                self = .unknown
-            }
-        }
-
-        func encode(to encoder: Encoder) throws
-        {
-            var container = encoder.singleValueContainer()
-
-            if let value = self.codableValue
-            {
-                try container.encode(value)
-            }
-            else
-            {
-                try container.encodeNil()
-            }
-        }
-    }
-}
-
-struct CodableError: Codable
-{
-    var error: Error {
-        return self.rawError ?? NSError(domain: self.errorDomain, code: self.errorCode, userInfo: self.userInfo ?? [:])
-    }
-    private var rawError: Error?
-
-    private var errorDomain: String
-    private var errorCode: Int
-    private var userInfo: [String: Any]?
-
-    private enum CodingKeys: String, CodingKey
-    {
-        case errorDomain
-        case errorCode
-        case legacyUserInfo = "userInfo"
-        case errorUserInfo
-    }
-
-    init(error: Error)
-    {
-        self.rawError = error
-
-        let nsError = error as NSError
-        self.errorDomain = nsError.domain
-        self.errorCode = nsError.code
-
-        if !nsError.userInfo.isEmpty
-        {
-            self.userInfo = nsError.userInfo
-        }
-    }
-
-    init(from decoder: Decoder) throws
-    {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        // Assume ALTServerError.errorDomain if no explicit domain provided.
-        self.errorDomain = try container.decodeIfPresent(String.self, forKey: .errorDomain) ?? ALTServerError.errorDomain
-        self.errorCode = try container.decode(Int.self, forKey: .errorCode)
-
-        if let rawUserInfo = try container.decodeIfPresent([String: UserInfoValue].self, forKey: .errorUserInfo)
-        {
-            // Attempt decoding from .errorUserInfo first, because it will gracefully handle unknown user info values.
-
-            // Copy ALTLocalized... values to NSLocalized... if provider is nil or if error is unrecognized.
-            // This ensures we preserve error messages if receiving an unknown error.
-            var userInfo = rawUserInfo.compactMapValues { $0.value }
-
-            // Recognized == the provider returns value for NSLocalizedFailureReasonErrorKey, or error is ALTServerError.underlyingError.
-            let provider = NSError.userInfoValueProvider(forDomain: self.errorDomain)
-            let isRecognizedError = (
-                provider?(self.error, NSLocalizedFailureReasonErrorKey) != nil ||
-                (self.error._domain == ALTServerError.errorDomain && self.error._code == ALTServerError.underlyingError.rawValue)
-            )
-
-            if !isRecognizedError
-            {
-                // Error not recognized, so copy over NSLocalizedDescriptionKey and NSLocalizedFailureReasonErrorKey.
-                userInfo[NSLocalizedDescriptionKey] = userInfo[ErrorUserInfoKey.altLocalizedDescription]
-                userInfo[NSLocalizedFailureReasonErrorKey] = userInfo[ErrorUserInfoKey.altLocalizedFailureReason]
-            }
-
-            // Copy over NSLocalizedRecoverySuggestionErrorKey and NSDebugDescriptionErrorKey if provider returns nil.
-            if provider?(self.error, NSLocalizedRecoverySuggestionErrorKey) == nil
-            {
-                userInfo[NSLocalizedRecoverySuggestionErrorKey] = userInfo[ErrorUserInfoKey.altLocalizedRecoverySuggestion]
-            }
-
-            if provider?(self.error, NSDebugDescriptionErrorKey) == nil
-            {
-                userInfo[NSDebugDescriptionErrorKey] = userInfo[ErrorUserInfoKey.altDebugDescription]
-            }
-
-            userInfo[ErrorUserInfoKey.altLocalizedDescription] = nil
-            userInfo[ErrorUserInfoKey.altLocalizedFailureReason] = nil
-            userInfo[ErrorUserInfoKey.altLocalizedRecoverySuggestion] = nil
-            userInfo[ErrorUserInfoKey.altDebugDescription] = nil
-
-            self.userInfo = userInfo
-        }
-        else if let rawUserInfo = try container.decodeIfPresent([String: UserInfoValue].self, forKey: .legacyUserInfo)
-        {
-            // Fall back to decoding .legacyUserInfo, which only supports String and NSError values.
-            let userInfo = rawUserInfo.compactMapValues { $0.value }
-            self.userInfo = userInfo
-        }
-    }
-
-    func encode(to encoder: Encoder) throws
-    {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.errorDomain, forKey: .errorDomain)
-        try container.encode(self.errorCode, forKey: .errorCode)
-
-        let rawLegacyUserInfo = self.userInfo?.compactMapValues { (value) -> UserInfoValue? in
-            // .legacyUserInfo only supports String and NSError values.
-            switch value
-            {
-            case let string as String: return .string(string)
-            case let error as NSError: return .error(error) // Must use .error, not .codableError for backwards compatibility.
-            default: return nil
-            }
-        }
-        try container.encodeIfPresent(rawLegacyUserInfo, forKey: .legacyUserInfo)
-
-        let nsError = self.error as NSError
-
-        var userInfo = self.userInfo ?? [:]
-        userInfo[ErrorUserInfoKey.altLocalizedDescription] = nsError.localizedDescription
-        userInfo[ErrorUserInfoKey.altLocalizedFailureReason] = nsError.localizedFailureReason
-        userInfo[ErrorUserInfoKey.altLocalizedRecoverySuggestion] = nsError.localizedRecoverySuggestion
-        userInfo[ErrorUserInfoKey.altDebugDescription] = nsError.localizedDebugDescription
-
-        // No need to use alternate key. This is a no-op if userInfo already contains localizedFailure,
-        // but it caches the UserInfoProvider value if one exists.
-        userInfo[NSLocalizedFailureErrorKey] = nsError.localizedFailure
-
-        let rawUserInfo = userInfo.compactMapValues { UserInfoValue($0) }
-        try container.encodeIfPresent(rawUserInfo, forKey: .errorUserInfo)
-    }
-}