Update pairing file help link in alert (#1147)

Signed-off-by: basketshoe <54729294+basketshoe@users.noreply.github.com>

.github/maintenance/cache.py

@@ -0,0 +1,63 @@
+import requests
+import sys
+import os
+
+# Your GitHub Personal Access Token
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
+
+# Repository details
+REPO_OWNER = "SideStore"
+REPO_NAME = "SideStore"
+
+
+API_URL = f"https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/actions/caches"
+
+# Common headers for GitHub API calls
+HEADERS = {
+    "Accept": "application/vnd.github+json",
+    "Authorization": f"Bearer {GITHUB_TOKEN}"
+}
+
+def list_caches():
+    response = requests.get(API_URL, headers=HEADERS)
+    if response.status_code != 200:
+        print(f"Failed to list caches. HTTP {response.status_code}")
+        print("Response:", response.text)
+        sys.exit(1)
+    data = response.json()
+    return data.get("actions_caches", [])
+
+def delete_cache(cache_id):
+    delete_url = f"{API_URL}/{cache_id}"
+    response = requests.delete(delete_url, headers=HEADERS)
+    return response.status_code
+
+def main():
+    caches = list_caches()
+    if not caches:
+        print("No caches found.")
+        return
+
+    print("Found caches:")
+    for cache in caches:
+        print(f"ID: {cache.get('id')}, Key: {cache.get('key')}")
+    
+    print("\nDeleting caches...")
+    for cache in caches:
+        cache_id = cache.get("id")
+        status = delete_cache(cache_id)
+        if status == 204:
+            print(f"Successfully deleted cache with ID: {cache_id}")
+        else:
+            print(f"Failed to delete cache with ID: {cache_id}. HTTP status code: {status}")
+    
+    print("All caches processed.")
+
+if __name__ == "__main__":
+    main()
+
+
+### How to use
+'''
+just export the GITHUB_TOKEN and then run this script via `python3 cache.py' to delete the caches 
+'''

.github/workflows/alpha.yml

@@ -10,8 +10,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  Reuseable-build:
-    uses: ./.github/workflows/reusable-build-workflow.yml
+  Reusable-build:
+    uses: ./.github/workflows/reusable-sidestore-build.yml
     with:
       # bundle_id: "com.SideStore.SideStore.Alpha"
       bundle_id: "com.SideStore.SideStore"

.github/workflows/nightly.yml

@@ -58,13 +58,13 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LAST_SUCCESS: ${{ env.last_success }}
 
-  Reuseable-build:
+  Reusable-build:
     if: |
       always() &&
       (github.event_name == 'push' || 
       (github.event_name == 'schedule' && needs.check-changes.result == 'success' && needs.check-changes.outputs.has_changes == 'true'))
     needs: check-changes
-    uses: ./.github/workflows/reusable-build-workflow.yml
+    uses: ./.github/workflows/reusable-sidestore-build.yml
     with:
       # bundle_id: "com.SideStore.SideStore.Nightly"
       bundle_id: "com.SideStore.SideStore"

.github/workflows/pr.yml

@@ -54,57 +54,12 @@ jobs:
           swiftpm-cache-restore-keys: |
             xcode-cache-sourcedata-
 
-
-      - name: Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-${{ hashFiles('Podfile') }}
-          # restore-keys: |         # commented out to strictly check cache for this particular podfile
-          #   pods-cache-
-          
-      - name: Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} 
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-
-
-      - name: Install CocoaPods
-        # if: ${{ steps.pods-restore.outputs.cache-hit != 'true'}}
-        id: pods-install
-        run: |
-          pod install
-
-      - name: Save Pods to Cache
-        id: save-pods
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-${{ hashFiles('Podfile') }}
-    
       - name: List Files and derived data
         run: |
           echo ">>>>>>>>> Workdir <<<<<<<<<<"
           ls -la .
           echo ""
           
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists    
-          echo ""
-          
           echo ">>>>>>>>> SideStore <<<<<<<<<<"
           find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
           echo ""

.github/workflows/reusable-build-workflow.yml

@@ -1,909 +0,0 @@
-name: Reusable SideStore Build
-
-on:
-  workflow_call:
-    inputs:
-      is_beta:
-        required: false
-        default: false
-        type: boolean
-      publish:
-        required: false
-        default: false
-        type: boolean
-      is_shared_build_num:
-        required: false
-        default: true
-        type: boolean
-      release_name:
-        required: true
-        type: string
-      release_tag:
-        required: true
-        type: string
-      upstream_tag:
-        required: true
-        type: string
-      upstream_name:
-        required: true
-        type: string
-      bundle_id:
-        default: com.SideStore.SideStore
-        required: true
-        type: string
-      bundle_id_suffix:
-        default: ''
-        required: false
-        type: string
-
-    secrets:
-    #   GITHUB_TOKEN:
-    #     required: true
-      CROSS_REPO_PUSH_KEY:
-        required: true
-      BUILD_LOG_ZIP_PASSWORD:
-        required: false
-
-jobs:
-  common:
-    name: Wait for other jobs
-    # since build cache, test-build cache, test-run cache are involved, out of order exec if serialization is on individual jobs will wreak all sorts of havoc
-    # so we serialize on the entire workflow
-    concurrency:                  
-      group: serialize-workflow
-    strategy:
-      fail-fast: false
-    runs-on: 'macos-15'
-    steps:
-    - run: echo "No other contending jobs are running now..."
-    - name: Set short commit hash
-      id: commit-id
-      run: |
-        # SHORT_COMMIT="${{ github.sha }}"
-        SHORT_COMMIT=${GITHUB_SHA:0:7}
-        echo "Short commit hash: $SHORT_COMMIT"
-        echo "SHORT_COMMIT=$SHORT_COMMIT" >> $GITHUB_OUTPUT
-    outputs:
-      short-commit: ${{ steps.commit-id.outputs.SHORT_COMMIT }}
-
-  build:
-    name: Build SideStore - ${{ inputs.release_tag }}
-    needs: common
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.1'
-
-    runs-on: ${{ matrix.os }}
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      marketing-version: ${{ steps.marketing-version.outputs.MARKETING_VERSION }}
-      release-channel: ${{ steps.release-channel.outputs.RELEASE_CHANNEL }}
-
-    steps:
-      - name: Set beta status
-        run: echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Install dependencies - ldid & xcbeautify
-        run: |
-          brew install ldid xcbeautify
-
-      - name: Set ref based on is_shared_build_num
-        if: ${{ inputs.is_beta }}
-        id: set_ref
-        run: |
-          if [ "${{ inputs.is_shared_build_num }}" == "true" ]; then
-            echo "ref=main" >> $GITHUB_ENV
-          else
-            echo "ref=${{ inputs.release_tag }}" >> $GITHUB_ENV
-          fi
-
-      - name: Checkout SideStore/beta-build-num repo
-        if: ${{ inputs.is_beta }}
-        uses: actions/checkout@v4
-        with:
-          repository: 'SideStore/beta-build-num'
-          ref: ${{ env.ref }}
-          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-          path: 'SideStore/beta-build-num'
-
-      - name: Copy build_number.txt to repo root
-        if: ${{ inputs.is_beta }}
-        run: |
-          cp SideStore/beta-build-num/build_number.txt .
-          echo "cat build_number.txt"
-          cat build_number.txt
-
-      - name: Echo Build.xcconfig
-        run: |
-          echo "cat Build.xcconfig"
-          cat Build.xcconfig
-
-      - name: Set Release Channel info for build number bumper
-        id: release-channel
-        run: |
-          RELEASE_CHANNEL="${{ inputs.release_tag }}"
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_ENV
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_OUTPUT
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}"
-          
-          
-      - name: Increase build number for beta builds
-        if: ${{ inputs.is_beta }}
-        run: |
-          bash .github/workflows/increase-beta-build-num.sh
-
-      - name: Extract MARKETING_VERSION from Build.xcconfig
-        id: version
-        run: |
-          version=$(grep MARKETING_VERSION Build.xcconfig | sed -e 's/MARKETING_VERSION = //g')
-          echo "version=$version" >> $GITHUB_OUTPUT
-          echo "version=$version"
-
-      - name: Set MARKETING_VERSION
-        if: ${{ inputs.is_beta }}
-        id: marketing-version
-        run: |
-          # Extract version number (e.g., "0.6.0")
-          version=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-          # Extract date (YYYYMMDD) (e.g., "20250205")
-          date=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]{4})\.([0-9]{2})\.([0-9]{2})\..*/\1\2\3/')
-          # Extract build number (e.g., "2")
-          build_num=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]+)\+.*/\1/')
-
-          # Combine them into the final output
-          MARKETING_VERSION="${version}-${date}.${build_num}+${{ needs.common.outputs.short-commit }}"
-
-          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_ENV
-          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_OUTPUT
-          echo "MARKETING_VERSION=$MARKETING_VERSION"
-
-      - name: Echo Updated Build.xcconfig, build_number.txt
-        if: ${{ inputs.is_beta }}
-        run: |
-          cat Build.xcconfig
-          cat build_number.txt
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: ${{ matrix.version }}
-
-      - name: (Build) Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-build-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-build-${{ github.ref_name }}-
-          swiftpm-cache-key: xcode-cache-sourcedata-build-${{ github.ref_name }}-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-build-${{ github.ref_name }}-
-
-      - name: (Build) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-          # restore-keys: |         # commented out to strictly check cache for this particular podfile
-          #   pods-cache-
-
-      - name: (Build) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-
-
-
-      - name: (Build) Install CocoaPods
-        run: pod install
-
-      - name: (Build) Save Pods to Cache
-        id: save-pods
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Build) Clean previous build artifacts
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          make clean
-          mkdir -p build/logs
-
-      - name: (Build) List Files and derived data
-        if: always()
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      - name: Set BundleID Suffix for Sidestore build
-        run: |
-          echo "BUNDLE_ID_SUFFIX=${{ inputs.bundle_id_suffix }}" >> $GITHUB_ENV
-
-
-      - name: Build SideStore.xcarchive
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          NSUnbufferedIO=YES make -B build 2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-
-      - name: Fakesign app
-        run: make fakesign | tee -a build/logs/build.log
-
-      - name: Convert to IPA
-        run: make ipa | tee -a build/logs/build.log
-
-      - name: (Build) List Files and Build artifacts
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore.xcarchive <<<<<<<<<<"
-          find SideStore.xcarchive -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-      - name: Encrypt build-logs for upload
-        id: encrypt-build-log
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-          
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-build-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-      
-      - name: Upload encrypted-build-logs.zip
-        id: attach-encrypted-build-log
-        if: ${{ always() && steps.encrypt-build-log.outputs.encrypted == 'true' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-build-logs-${{ steps.version.outputs.version }}.zip
-          path: encrypted-build-logs.zip
-
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
-
-      - name: Zip dSYMs
-        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs
-  
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYMs.zip
-          path: SideStore.dSYMs.zip
-
-      - name: Keep rolling the build numbers for each successful build
-        if: ${{ inputs.is_beta }}
-        run: |
-          pushd SideStore/beta-build-num/
-  
-          echo "Configure Git user (committer details)"
-          git config user.name "GitHub Actions"
-          git config user.email "github-actions@github.com"
-          
-          echo "Adding files to commit"
-          git add --verbose build_number.txt
-          git commit -m " - updated for ${{ inputs.release_tag }} - ${{ needs.common.outputs.short-commit }} deployment" || echo "No changes to commit"
-
-          echo "Pushing to remote repo"
-          git push --verbose
-          popd
-  
-      - name: Get last successful commit
-        id: get_last_commit
-        run: |
-          # Try to get the last successful workflow run commit
-          LAST_SUCCESS_SHA=$(gh run list --branch "${{ github.ref_name }}" --status success --json headSha --jq '.[0].headSha')
-          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_OUTPUT
-          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Create release notes
-        run: |
-          LAST_SUCCESS_SHA=${{ steps.get_last_commit.outputs.LAST_SUCCESS_SHA}}
-          echo "Last successful commit SHA: $LAST_SUCCESS_SHA"
-          
-          FROM_COMMIT=$LAST_SUCCESS_SHA
-          # Check if we got a valid SHA
-          if [ -z "$LAST_SUCCESS_SHA" ] || [ "$LAST_SUCCESS_SHA" = "null" ]; then
-            echo "No successful run found, using initial commit of branch"
-            # Get the first commit of the branch (initial commit)
-            FROM_COMMIT=$(git rev-list --max-parents=0 HEAD)
-          fi
-  
-          python3 update_release_notes.py $FROM_COMMIT ${{ inputs.release_tag }} ${{ github.ref_name }}
-          # cat release-notes.md
-
-      - name: Upload release-notes.md
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-notes-${{ needs.common.outputs.short-commit }}.md
-          path: release-notes.md
-
-      - name: Upload update_release_notes.py
-        uses: actions/upload-artifact@v4
-        with:
-          name: update_release_notes-${{ needs.common.outputs.short-commit }}.py
-          path: update_release_notes.py
-
-      - name: Upload update_apps.py
-        uses: actions/upload-artifact@v4
-        with:
-          name: update_apps-${{ needs.common.outputs.short-commit }}.py
-          path: update_apps.py
-
-  tests-build:
-    name: Tests-Build SideStore - ${{ inputs.release_tag }}
-    needs: common
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.1'
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install dependencies - xcbeautify
-        run: |
-          brew install xcbeautify
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: '16.1'
-
-      - name: (Tests-Build) Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-test-${{ github.ref_name }}-
-          swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-test-${{ github.ref_name }}-
-
-      - name: (Tests-Build) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Build) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-
-
-      - name: (Tests-Build) Install CocoaPods
-        run: pod install
-
-      - name: (Tests-Build) Save Pods to Cache
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Build) Clean previous build artifacts
-        run: |
-          make clean
-          mkdir -p build/logs
-
-      - name: (Tests-Build) List Files and derived data
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      - name: Build SideStore Tests
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          NSUnbufferedIO=YES make -B build-tests 2>&1 | tee -a build/logs/tests-build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-
-      - name: (Tests-Build) List Files and Build artifacts
-        if: always()
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-      - name: Encrypt tests-build-logs for upload
-        id: encrypt-test-log
-        if: always()
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-build-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-      
-      - name: Upload encrypted-tests-build-logs.zip
-        id: attach-encrypted-test-log
-        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-tests-build-logs-${{ needs.common.outputs.short-commit }}.zip
-          path: encrypted-tests-build-logs.zip
-
-  tests-run:
-    name: Tests-Run SideStore - ${{ inputs.release_tag }}
-    needs: [common, tests-build]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.1'
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Boot Simulator async(nohup) for testing
-        run: |
-          mkdir -p build/logs
-          nohup make -B boot-sim-async </dev/null >> build/logs/tests-run.log 2>&1 &
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: '16.1'
-
-      - name: (Tests-Run) Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-test-${{ github.ref_name }}-
-          swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-test-${{ github.ref_name }}-
-
-      - name: (Tests-Run) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Run) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-
-
-      - name: (Tests-Run) Install CocoaPods
-        run: pod install
-
-      - name: (Tests-Run) Save Pods to Cache
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Run) Clean previous build artifacts
-        run: |
-          make clean
-          mkdir -p build/logs
-
-      - name: (Tests-Run) List Files and derived data
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      # we expect simulator to have been booted by now, so exit otherwise
-      - name: Simulator Boot Check
-        run: |
-          mkdir -p build/logs
-          make -B sim-boot-check | tee -a build/logs/tests-run.log
-          exit ${PIPESTATUS[0]}
-
-      - name: Start Recording UI tests (if DEBUG_RECORD_TESTS is set to 1)
-        if: ${{ vars.DEBUG_RECORD_TESTS == '1' }}
-        run: |
-          nohup xcrun simctl io booted recordVideo -f tests-recording.mp4 --codec h264 </dev/null > tests-recording.log 2>&1 &
-          RECORD_PID=$!
-          echo "RECORD_PID=$RECORD_PID" >> $GITHUB_ENV
-
-      - name: Run SideStore Tests
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          make run-tests 2>&1 | tee -a build/logs/tests-run.log && exit ${PIPESTATUS[0]}
-        # NSUnbufferedIO=YES make -B run-tests 2>&1 | tee build/logs/tests-run.log | xcpretty -r junit --output ./build/tests/test-results.xml && exit ${PIPESTATUS[0]}
-
-      - name: Stop Recording tests
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          kill -INT ${{ env.RECORD_PID }}
-
-      - name: (Tests-Run) List Files and Build artifacts
-        if: always()
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-      - name: Encrypt tests-run-logs for upload
-        id: encrypt-test-log
-        if: always()
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-run-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-      
-      - name: Upload encrypted-tests-run-logs.zip
-        id: attach-encrypted-test-log
-        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-tests-run-logs-${{ needs.common.outputs.short-commit }}.zip
-          path: encrypted-tests-run-logs.zip
-
-      - name: Print tests-recording.log contents (if exists)
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          if [ -f tests-recording.log ]; then
-            echo "tests-recording.log found. Its contents:"
-            cat tests-recording.log
-          else
-            echo "tests-recording.log not found."
-          fi
-
-      - name: Check for tests-recording.mp4 presence
-        id: check-recording
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          if [ -f tests-recording.mp4 ]; then
-            echo "::set-output name=found::true"
-            echo "tests-recording.mp4 found."
-          else
-            echo "tests-recording.mp4 not found, skipping upload."
-            echo "::set-output name=found::false"
-          fi
-
-      - name: Upload tests-recording.mp4
-        id: upload-recording
-        if: ${{ always() && steps.check-recording.outputs.found == 'true' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: tests-recording-${{ needs.common.outputs.short-commit }}.mp4
-          path: tests-recording.mp4
-
-      - name: Zip test-results
-        run: zip -r -9 ./test-results.zip ./build/tests
-  
-      - name: Upload Test Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-results-${{ needs.common.outputs.short-commit }}.zip
-          path: test-results.zip
-
-  deploy:
-    name: Deploy SideStore - ${{ inputs.release_tag }}
-    runs-on: macos-15
-    # needs: [common, build]
-    needs: [common, build, tests-build, tests-run]
-    steps:
-      - name: Download IPA artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: SideStore-${{ needs.build.outputs.version }}.ipa
-
-      - name: Download dSYM artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: SideStore-${{ needs.build.outputs.version }}-dSYMs.zip
-
-      - name: Download encrypted-build-logs artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-build-logs-${{ needs.build.outputs.version }}.zip
-
-      - name: Download encrypted-tests-build-logs artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-tests-build-logs-${{ needs.common.outputs.short-commit }}.zip
-
-      - name: Download encrypted-tests-run-logs artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-tests-run-logs-${{ needs.common.outputs.short-commit }}.zip
-
-      - name: Download tests-recording artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: tests-recording-${{ needs.common.outputs.short-commit }}.mp4
-
-      - name: Download test-results artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: test-results-${{ needs.common.outputs.short-commit }}.zip  
-  
-      - name: Download release-notes.md
-        uses: actions/download-artifact@v4
-        with:
-          name: release-notes-${{ needs.common.outputs.short-commit }}.md
-
-      - name: Download update_release_notes.py
-        uses: actions/download-artifact@v4
-        with:
-          name: update_release_notes-${{ needs.common.outputs.short-commit }}.py
-
-      - name: Download update_apps.py
-        uses: actions/download-artifact@v4
-        with:
-          name: update_apps-${{ needs.common.outputs.short-commit }}.py
-
-      - name: Read release notes
-        id: release_notes
-        run: |
-          CONTENT=$(python3 update_release_notes.py --retrieve ${{ inputs.release_tag }})
-          echo "content<<EOF" >> $GITHUB_OUTPUT
-          echo "$CONTENT" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-  
-      - name: List files before upload
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          find . -maxdepth 4 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-  
-      - name: Get current date
-        id: date
-        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
-
-      - name: Get current date in AltStore date form
-        id: date_altstore
-        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Upload to releases
-        uses: IsaacShelton/update-existing-release@v1.3.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          release: ${{ inputs.release_name }}
-          tag: ${{ inputs.release_tag }}
-          prerelease: ${{ inputs.is_beta }}
-          files: SideStore.ipa SideStore.dSYMs.zip encrypted-build-logs.zip encrypted-tests-build-logs.zip encrypted-tests-run-logs.zip test-results.zip tests-recording.mp4
-          body: |
-              This is an ⚠️ **EXPERIMENTAL** ⚠️ ${{ inputs.release_name }} build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
-
-              ${{ inputs.release_name }} builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. Use at your own risk!**
-
-              If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore ${{ inputs.upstream_name }}](https://github.com/${{ github.repository }}/releases?q=${{ inputs.upstream_tag }}).
-
-              ## Build Info
-
-              Built at (UTC): `${{ steps.date.outputs.date }}`
-              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-              Commit SHA: `${{ github.sha }}`
-              Version: `${{ needs.build.outputs.version }}`
-
-              ${{ steps.release_notes.outputs.content }}
-
-      - name: Get formatted date
-        run: |
-          FORMATTED_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-          echo "Formatted date: $FORMATTED_DATE"
-          echo "FORMATTED_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
-
-      - name: Get size of IPA in bytes (macOS/Linux)
-        run: |
-          if [[ "$(uname)" == "Darwin" ]]; then
-            # macOS
-            IPA_SIZE=$(stat -f %z SideStore.ipa)
-          else
-            # Linux
-            IPA_SIZE=$(stat -c %s SideStore.ipa)
-          fi
-          echo "IPA size in bytes: $IPA_SIZE"
-          echo "IPA_SIZE=$IPA_SIZE" >> $GITHUB_ENV
-
-      - name: Compute SHA-256 of IPA
-        run: |
-          SHA256_HASH=$(shasum -a 256 SideStore.ipa | awk '{ print $1 }')
-          echo "SHA-256 Hash: $SHA256_HASH"
-          echo "SHA256_HASH=$SHA256_HASH" >> $GITHUB_ENV
-
-      - name: Set Release Info variables
-        run: |
-          # Format localized description
-          LOCALIZED_DESCRIPTION=$(cat <<EOF
-          This is release for:
-            - version: "${{ needs.build.outputs.version }}"
-            - revision: "${{ needs.common.outputs.short-commit }}"
-            - timestamp: "${{ steps.date.outputs.date }}"
-          
-          Release Notes:
-          ${{ steps.release_notes.outputs.content }}
-          EOF
-          )
-
-          echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
-          echo "BUNDLE_IDENTIFIER=${{ inputs.bundle_id }}" >> $GITHUB_ENV
-          echo "VERSION_IPA=${{ needs.build.outputs.marketing-version }}" >> $GITHUB_ENV
-          echo "VERSION_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
-          echo "RELEASE_CHANNEL=${{ needs.build.outputs.release-channel }}" >> $GITHUB_ENV
-          echo "SIZE=$IPA_SIZE" >> $GITHUB_ENV
-          echo "SHA256=$SHA256_HASH" >> $GITHUB_ENV
-          echo "DOWNLOAD_URL=https://github.com/SideStore/SideStore/releases/download/${{ inputs.release_tag }}/SideStore.ipa" >> $GITHUB_ENV
-
-          # multiline strings
-          echo "LOCALIZED_DESCRIPTION<<EOF" >> $GITHUB_ENV
-          echo "$LOCALIZED_DESCRIPTION" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Check if Publish updates is set
-        id: check_publish
-        run: |
-          echo "Publish updates to source.json = ${{ inputs.publish }}"
-
-      - name: Checkout SideStore/apps-v2.json
-        if: ${{ inputs.is_beta && inputs.publish }}
-        uses: actions/checkout@v4
-        with:
-          repository: 'SideStore/apps-v2.json'
-          ref: 'main'   # this branch is shared by all beta builds, so beta build workflows are serialized
-          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-          path: 'SideStore/apps-v2.json'
-
-      # for stable builds, let the user manually edit the source.json
-      - name: Publish to SideStore/apps-v2.json
-        if: ${{ inputs.is_beta && inputs.publish }}
-        id: publish-release
-        run: |
-          # Copy and execute the update script
-          pushd SideStore/apps-v2.json/
-
-          # Configure Git user (committer details)
-          git config user.name "GitHub Actions"
-          git config user.email "github-actions@github.com"
-
-          # update the source.json
-          python3 ../../update_apps.py "./_includes/source.json"
-
-          # Commit changes and push using SSH
-          git add --verbose ./_includes/source.json
-          git commit -m " - updated for ${{ needs.common.outputs.short-commit }} deployment" || echo "No changes to commit"
-
-          git push --verbose
-          popd

.github/workflows/reusable-sidestore-build.yml

@@ -0,0 +1,104 @@
+name: Reusable SideStore Build
+
+on:
+  workflow_call:
+    inputs:
+      is_beta:
+        required: false
+        default: false
+        type: boolean
+      publish:
+        required: false
+        default: false
+        type: boolean
+      is_shared_build_num:
+        required: false
+        default: true
+        type: boolean
+      release_name:
+        required: true
+        type: string
+      release_tag:
+        required: true
+        type: string
+      upstream_tag:
+        required: true
+        type: string
+      upstream_name:
+        required: true
+        type: string
+      bundle_id:
+        default: com.SideStore.SideStore
+        required: true
+        type: string
+      bundle_id_suffix:
+        default: ''
+        required: false
+        type: string
+
+    secrets:
+    #   GITHUB_TOKEN:
+    #     required: true
+      CROSS_REPO_PUSH_KEY:
+        required: true
+      BUILD_LOG_ZIP_PASSWORD:
+        required: false
+
+
+# since build cache, test-build cache, test-run cache are involved, out of order exec if serialization is on individual jobs will wreak all sorts of havoc
+# so we serialize on the entire workflow
+concurrency:                  
+  group: serialize-workflow
+    
+jobs:
+  shared:
+    uses: ./.github/workflows/sidestore-shared.yml
+    secrets: inherit
+
+  build:
+    needs: shared
+    uses: ./.github/workflows/sidestore-build.yml
+    with:
+      is_beta: ${{ inputs.is_beta }}
+      is_shared_build_num: ${{ inputs.is_shared_build_num }}
+      release_tag: ${{ inputs.release_tag }}
+      short_commit: ${{ needs.shared.outputs.short-commit }}
+      bundle_id: ${{ inputs.bundle_id }}
+      bundle_id_suffix: ${{ inputs.bundle_id_suffix }}
+    secrets: inherit
+
+  tests-build:
+    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
+    needs: shared
+    uses: ./.github/workflows/sidestore-tests-build.yml
+    with:
+      release_tag: ${{ inputs.release_tag }}
+      short_commit: ${{ needs.shared.outputs.short-commit }}
+    secrets: inherit
+
+  tests-run:
+    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
+    needs: [shared, tests-build]
+    uses: ./.github/workflows/sidestore-tests-run.yml
+    with:
+      release_tag: ${{ inputs.release_tag }}
+      short_commit: ${{ needs.shared.outputs.short-commit }}
+    secrets: inherit
+
+  deploy:
+    needs: [shared, build, tests-build, tests-run]  # Keep tests-run in needs
+    if: ${{ always() && (needs.tests-run.result == 'skipped' || needs.tests-run.result == 'success') }}
+    uses: ./.github/workflows/sidestore-deploy.yml
+    with:
+      is_beta: ${{ inputs.is_beta }}
+      publish: ${{ inputs.publish }}
+      release_name: ${{ inputs.release_name }}
+      release_tag: ${{ inputs.release_tag }}
+      upstream_tag: ${{ inputs.upstream_tag }}
+      upstream_name: ${{ inputs.upstream_name }}
+      version: ${{ needs.build.outputs.version }}
+      short_commit: ${{ needs.shared.outputs.short-commit }}
+      release_channel: ${{ needs.build.outputs.release-channel }}
+      marketing_version: ${{ needs.build.outputs.marketing-version }}
+      bundle_id: ${{ inputs.bundle_id }}
+    secrets: inherit

.github/workflows/sidestore-build.yml

@@ -0,0 +1,358 @@
+name: SideStore Build
+
+on:
+  workflow_call:
+    inputs:
+      is_beta:
+        type: boolean
+      is_shared_build_num:
+        type: boolean
+      release_tag:
+        type: string
+      bundle_id:
+        type: string
+      bundle_id_suffix:
+        type: string
+      short_commit:
+        type: string
+    secrets:
+      CROSS_REPO_PUSH_KEY:
+        required: true
+      BUILD_LOG_ZIP_PASSWORD:
+        required: false
+    outputs:
+      version: 
+        value: ${{ jobs.build.outputs.version }}
+      marketing-version: 
+        value: ${{ jobs.build.outputs.marketing-version }}
+      release-channel:
+        value: ${{ jobs.build.outputs.release-channel }}
+          
+jobs:
+  build:
+    name: Build SideStore - ${{ inputs.release_tag }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: 'macos-26'
+            version: '26.0'
+    runs-on: ${{ matrix.os }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      marketing-version: ${{ steps.marketing-version.outputs.MARKETING_VERSION }}
+      release-channel: ${{ steps.release-channel.outputs.RELEASE_CHANNEL }}
+
+    steps:
+      - name: Set beta status
+        run: echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Install dependencies - ldid & xcbeautify
+        run: |
+          brew install ldid xcbeautify
+
+      - name: Set ref based on is_shared_build_num
+        if: ${{ inputs.is_beta }}
+        id: set_ref
+        run: |
+          if [ "${{ inputs.is_shared_build_num }}" == "true" ]; then
+            echo "ref=main" >> $GITHUB_ENV
+          else
+            echo "ref=${{ inputs.release_tag }}" >> $GITHUB_ENV
+          fi
+        shell: bash
+
+      - name: Checkout SideStore/beta-build-num repo
+        if: ${{ inputs.is_beta }}
+        uses: actions/checkout@v4
+        with:
+          repository: 'SideStore/beta-build-num'
+          ref: ${{ env.ref }}
+          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+          path: 'SideStore/beta-build-num'
+
+      - name: Copy build_number.txt to repo root
+        if: ${{ inputs.is_beta }}
+        run: |
+          cp SideStore/beta-build-num/build_number.txt .
+          echo "cat build_number.txt"
+          cat build_number.txt
+        shell: bash
+
+      - name: Echo Build.xcconfig
+        run: |
+          echo "cat Build.xcconfig"
+          cat Build.xcconfig
+        shell: bash
+
+      - name: Set Release Channel info for build number bumper
+        id: release-channel
+        run: |
+          RELEASE_CHANNEL="${{ inputs.release_tag }}"
+          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_ENV
+          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_OUTPUT
+          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}"
+        shell: bash
+          
+      - name: Increase build number for beta builds
+        if: ${{ inputs.is_beta }}
+        run: |
+          bash .github/workflows/increase-beta-build-num.sh
+        shell: bash
+
+      - name: Extract MARKETING_VERSION from Build.xcconfig
+        id: version
+        run: |
+          version=$(grep MARKETING_VERSION Build.xcconfig | sed -e 's/MARKETING_VERSION = //g')
+          echo "version=$version" >> $GITHUB_OUTPUT
+          echo "version=$version"
+        shell: bash
+
+      - name: Set MARKETING_VERSION
+        if: ${{ inputs.is_beta }}
+        id: marketing-version
+        run: |
+          # Extract version number (e.g., "0.6.0")
+          version=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+          # Extract date (YYYYMMDD) (e.g., "20250205")
+          date=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]{4})\.([0-9]{2})\.([0-9]{2})\..*/\1\2\3/')
+          # Extract build number (e.g., "2")
+          build_num=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]+)\+.*/\1/')
+
+          # Combine them into the final output
+          MARKETING_VERSION="${version}-${date}.${build_num}+${{ inputs.short_commit }}"
+
+          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_ENV
+          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_OUTPUT
+          echo "MARKETING_VERSION=$MARKETING_VERSION"
+        shell: bash
+
+      - name: Echo Updated Build.xcconfig, build_number.txt
+        if: ${{ inputs.is_beta }}
+        run: |
+          cat Build.xcconfig
+          cat build_number.txt
+        shell: bash
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: ${{ matrix.version }}
+
+      - name: (Build) Restore Xcode & SwiftPM Cache (Exact match)
+        id: xcode-cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: (Build) Restore Xcode & SwiftPM Cache (Last Available)
+        id: xcode-cache-restore-recent
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-${{ github.ref_name }}-
+
+      # - name: (Build) Cache Build
+      #   uses: irgaly/xcode-cache@v1.8.1
+      #   with:
+      #     key: xcode-cache-deriveddata-build-${{ github.ref_name }}-${{ github.sha }}
+      #     restore-keys: xcode-cache-deriveddata-build-${{ github.ref_name }}-
+      #     swiftpm-cache-key: xcode-cache-sourcedata-build-${{ github.ref_name }}-${{ github.sha }}
+      #     swiftpm-cache-restore-keys: |
+      #       xcode-cache-sourcedata-build-${{ github.ref_name }}-
+
+      - name: (Build) Clean previous build artifacts
+        # using 'tee' to intercept stdout and log for detailed build-log
+        run: |
+          make clean
+          mkdir -p build/logs
+        shell: bash
+
+      - name: (Build) List Files and derived data
+        if: always()
+        shell: bash
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
+          echo ""
+
+      - name: Set BundleID Suffix for Sidestore build
+        run: |
+          echo "BUNDLE_ID_SUFFIX=${{ inputs.bundle_id_suffix }}" >> $GITHUB_ENV
+        shell: bash
+
+
+      - name: Build SideStore.xcarchive
+        # using 'tee' to intercept stdout and log for detailed build-log
+        run: |
+          NSUnbufferedIO=YES make -B build 2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        shell: bash
+
+      - name: Fakesign app
+        run: make fakesign | tee -a build/logs/build.log
+        shell: bash
+
+      - name: Convert to IPA
+        run: make ipa | tee -a build/logs/build.log
+        shell: bash
+
+      - name: (Build) Save Xcode & SwiftPM Cache
+        id: cache-save
+        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-${{ github.ref_name }}-${{ github.sha }}
+        
+      - name: (Build) List Files and Build artifacts
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> Build <<<<<<<<<<"
+          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> SideStore.xcarchive <<<<<<<<<<"
+          find SideStore.xcarchive -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
+          echo ""
+        shell: bash
+
+      - name: Encrypt build-logs for upload
+        id: encrypt-build-log
+        run: |
+          DEFAULT_BUILD_LOG_PASSWORD=12345
+
+          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
+
+          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
+            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
+          fi
+          
+          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-build-logs.zip * || popd
+          echo "::set-output name=encrypted::true"
+        shell: bash
+
+      - name: Upload encrypted-build-logs.zip
+        id: attach-encrypted-build-log
+        if: ${{ always() && steps.encrypt-build-log.outputs.encrypted == 'true' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: encrypted-build-logs-${{ steps.version.outputs.version }}.zip
+          path: encrypted-build-logs.zip
+
+      - name: Upload SideStore.ipa Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
+          path: SideStore.ipa
+
+      - name: Zip dSYMs
+        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs
+        shell: bash
+
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}-dSYMs.zip
+          path: SideStore.dSYMs.zip
+
+      - name: Keep rolling the build numbers for each successful build
+        if: ${{ inputs.is_beta }}
+        run: |
+          pushd SideStore/beta-build-num/
+  
+          echo "Configure Git user (committer details)"
+          git config user.name "GitHub Actions"
+          git config user.email "github-actions@github.com"
+          
+          echo "Adding files to commit"
+          git add --verbose build_number.txt
+          git commit -m " - updated for ${{ inputs.release_tag }} - ${{ inputs.short_commit }} deployment" || echo "No changes to commit"
+
+          echo "Pushing to remote repo"
+          git push --verbose
+          popd
+        shell: bash
+
+      - name: Get last successful commit
+        id: get_last_commit
+        run: |
+          # Try to get the last successful workflow run commit
+          LAST_SUCCESS_SHA=$(gh run list --branch "${{ github.ref_name }}" --status success --json headSha --jq '.[0].headSha')
+          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_OUTPUT
+          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_ENV
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+
+      - name: Create release notes
+        run: |
+          LAST_SUCCESS_SHA=${{ steps.get_last_commit.outputs.LAST_SUCCESS_SHA}}
+          echo "Last successful commit SHA: $LAST_SUCCESS_SHA"
+          
+          FROM_COMMIT=$LAST_SUCCESS_SHA
+          # Check if we got a valid SHA
+          if [ -z "$LAST_SUCCESS_SHA" ] || [ "$LAST_SUCCESS_SHA" = "null" ]; then
+            echo "No successful run found, using initial commit of branch"
+            # Get the first commit of the branch (initial commit)
+            FROM_COMMIT=$(git rev-list --max-parents=0 HEAD)
+          fi
+  
+          python3 update_release_notes.py $FROM_COMMIT ${{ inputs.release_tag }} ${{ github.ref_name }}
+          # cat release-notes.md
+        shell: bash
+
+      - name: Upload release-notes.md
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-notes-${{ inputs.short_commit }}.md
+          path: release-notes.md
+
+      - name: Upload update_release_notes.py
+        uses: actions/upload-artifact@v4
+        with:
+          name: update_release_notes-${{ inputs.short_commit }}.py
+          path: update_release_notes.py
+
+      - name: Upload update_apps.py
+        uses: actions/upload-artifact@v4
+        with:
+          name: update_apps-${{ inputs.short_commit }}.py
+          path: update_apps.py

.github/workflows/sidestore-deploy.yml

@@ -0,0 +1,264 @@
+name: SideStore Deploy
+
+on:
+  workflow_call:
+    inputs:
+      is_beta:
+        type: boolean
+      publish:
+        type: boolean
+      release_name:
+        type: string
+      release_tag:
+        type: string
+      upstream_tag:
+        type: string
+      upstream_name:
+        type: string
+      version:
+        type: string
+      short_commit:
+        type: string
+      marketing_version:
+        type: string
+      release_channel:
+        type: string
+      bundle_id:
+        type: string
+    secrets:
+      CROSS_REPO_PUSH_KEY:
+        required: true
+      # GITHUB_TOKEN:
+        # required: true
+
+jobs:
+  deploy:
+    name: Deploy SideStore - ${{ inputs.release_tag }}
+    runs-on: macos-15
+    steps:
+      - name: Download IPA artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: SideStore-${{ inputs.version }}.ipa
+
+      - name: Download dSYM artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: SideStore-${{ inputs.version }}-dSYMs.zip
+
+      - name: Download encrypted-build-logs artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: encrypted-build-logs-${{ inputs.version }}.zip
+
+      - name: Download encrypted-tests-build-logs artifact
+        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: encrypted-tests-build-logs-${{ inputs.short_commit }}.zip
+
+      - name: Download encrypted-tests-run-logs artifact
+        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: encrypted-tests-run-logs-${{ inputs.short_commit }}.zip
+
+      - name: Download tests-recording artifact
+        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: tests-recording-${{ inputs.short_commit }}.mp4
+
+      - name: Download test-results artifact
+        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: test-results-${{ inputs.short_commit }}.zip  
+  
+      - name: Download release-notes.md
+        uses: actions/download-artifact@v4
+        with:
+          name: release-notes-${{ inputs.short_commit }}.md
+
+      - name: Download update_release_notes.py
+        uses: actions/download-artifact@v4
+        with:
+          name: update_release_notes-${{ inputs.short_commit }}.py
+
+      - name: Download update_apps.py
+        uses: actions/download-artifact@v4
+        with:
+          name: update_apps-${{ inputs.short_commit }}.py
+
+      - name: Read release notes
+        id: release_notes
+        run: |
+          CONTENT=$(python3 update_release_notes.py --retrieve ${{ inputs.release_tag }})
+          echo "content<<EOF" >> $GITHUB_OUTPUT
+          echo "$CONTENT" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: List files before upload
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          find . -maxdepth 4 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+        shell: bash
+
+      - name: Get current date
+        id: date
+        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Get current date in AltStore date form
+        id: date_altstore
+        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+        shell: bash
+
+
+      - name: List files to upload
+        id: list_uploads
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          find . -maxdepth 4 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          FILES="SideStore.ipa SideStore.dSYMs.zip encrypted-build-logs.zip"
+
+          if [[ "${{ vars.ENABLE_TESTS }}" == "1" && "${{ vars.ENABLE_TESTS_BUILD }}" == "1" ]]; then
+            FILES="$FILES encrypted-tests-build-logs.zip"
+          fi
+
+          if [[ "${{ vars.ENABLE_TESTS }}" == "1" && "${{ vars.ENABLE_TESTS_RUN }}" == "1" ]]; then
+            FILES="$FILES encrypted-tests-run-logs.zip test-results.zip tests-recording.mp4"
+          fi
+
+          echo "Final upload list:"
+          for f in $FILES; do
+            if [[ -f "$f" ]]; then
+              echo "  ✓ $f"
+            else
+              echo "  - $f (missing)"
+            fi
+          done
+
+          echo "files=$FILES" >> $GITHUB_OUTPUT
+
+      - name: Upload to releases
+        uses: IsaacShelton/update-existing-release@v1.3.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          release: ${{ inputs.release_name }}
+          tag: ${{ inputs.release_tag }}
+          prerelease: ${{ inputs.is_beta }}
+          files: ${{ steps.list_uploads.outputs.files }}
+          body: |
+              This is an ⚠️ **EXPERIMENTAL** ⚠️ ${{ inputs.release_name }} build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
+
+              ${{ inputs.release_name }} builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. Use at your own risk!**
+
+              If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore ${{ inputs.upstream_name }}](https://github.com/${{ github.repository }}/releases?q=${{ inputs.upstream_tag }}).
+
+              ## Build Info
+
+              Built at (UTC): `${{ steps.date.outputs.date }}`
+              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
+              Commit SHA: `${{ github.sha }}`
+              Version: `${{ inputs.version }}`
+
+              ${{ steps.release_notes.outputs.content }}
+
+      - name: Get formatted date
+        run: |
+          FORMATTED_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+          echo "Formatted date: $FORMATTED_DATE"
+          echo "FORMATTED_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Get size of IPA in bytes (macOS/Linux)
+        run: |
+          if [[ "$(uname)" == "Darwin" ]]; then
+            # macOS
+            IPA_SIZE=$(stat -f %z SideStore.ipa)
+          else
+            # Linux
+            IPA_SIZE=$(stat -c %s SideStore.ipa)
+          fi
+          echo "IPA size in bytes: $IPA_SIZE"
+          echo "IPA_SIZE=$IPA_SIZE" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Compute SHA-256 of IPA
+        run: |
+          SHA256_HASH=$(shasum -a 256 SideStore.ipa | awk '{ print $1 }')
+          echo "SHA-256 Hash: $SHA256_HASH"
+          echo "SHA256_HASH=$SHA256_HASH" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Set Release Info variables
+        run: |
+          # Format localized description
+          LOCALIZED_DESCRIPTION=$(cat <<EOF
+          This is release for:
+            - version: "${{ inputs.version }}"
+            - revision: "${{ inputs.short_commit }}"
+            - timestamp: "${{ steps.date.outputs.date }}"
+          
+          Release Notes:
+          ${{ steps.release_notes.outputs.content }}
+          EOF
+          )
+
+          echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
+          echo "BUNDLE_IDENTIFIER=${{ inputs.bundle_id }}" >> $GITHUB_ENV
+          echo "VERSION_IPA=${{ inputs.marketing_version }}" >> $GITHUB_ENV
+          echo "VERSION_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
+          echo "RELEASE_CHANNEL=${{ inputs.release_channel }}" >> $GITHUB_ENV
+          echo "SIZE=$IPA_SIZE" >> $GITHUB_ENV
+          echo "SHA256=$SHA256_HASH" >> $GITHUB_ENV
+          echo "DOWNLOAD_URL=https://github.com/SideStore/SideStore/releases/download/${{ inputs.release_tag }}/SideStore.ipa" >> $GITHUB_ENV
+
+          # multiline strings
+          echo "LOCALIZED_DESCRIPTION<<EOF" >> $GITHUB_ENV
+          echo "$LOCALIZED_DESCRIPTION" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Check if Publish updates is set
+        id: check_publish
+        run: |
+          echo "Publish updates to source.json = ${{ inputs.publish }}"
+        shell: bash
+
+      - name: Checkout SideStore/apps-v2.json
+        if: ${{ inputs.is_beta && inputs.publish }}
+        uses: actions/checkout@v4
+        with:
+          repository: 'SideStore/apps-v2.json'
+          ref: 'main'   # this branch is shared by all beta builds, so beta build workflows are serialized
+          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+          path: 'SideStore/apps-v2.json'
+
+      # for stable builds, let the user manually edit the source.json
+      - name: Publish to SideStore/apps-v2.json
+        if: ${{ inputs.is_beta && inputs.publish }}
+        id: publish-release
+        shell: bash
+        run: |
+          # Copy and execute the update script
+          pushd SideStore/apps-v2.json/
+
+          # Configure Git user (committer details)
+          git config user.name "GitHub Actions"
+          git config user.email "github-actions@github.com"
+
+          # update the source.json
+          python3 ../../update_apps.py "./_includes/source.json"
+
+          # Commit changes and push using SSH
+          git add --verbose ./_includes/source.json
+          git commit -m " - updated for ${{ inputs.short_commit }} deployment" || echo "No changes to commit"
+
+          git push --verbose
+          popd

.github/workflows/sidestore-shared.yml

@@ -0,0 +1,24 @@
+name: SideStore Shared
+
+on:
+  workflow_call:
+    outputs:
+      short-commit: 
+        value: ${{ jobs.shared.outputs.short-commit }}
+
+jobs:
+  shared:
+    name: Shared Steps
+    strategy:
+      fail-fast: false
+    runs-on: 'macos-15'
+    steps:
+      - name: Set short commit hash
+        id: commit-id
+        run: |
+          # SHORT_COMMIT="${{ github.sha }}"
+          SHORT_COMMIT=${GITHUB_SHA:0:7}
+          echo "Short commit hash: $SHORT_COMMIT"
+          echo "SHORT_COMMIT=$SHORT_COMMIT" >> $GITHUB_OUTPUT
+    outputs:
+      short-commit: ${{ steps.commit-id.outputs.SHORT_COMMIT }}

.github/workflows/sidestore-tests-build.yml

@@ -0,0 +1,165 @@
+name: SideStore Tests Build
+
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        type: string
+      short_commit:
+        type: string
+    secrets:
+      BUILD_LOG_ZIP_PASSWORD:
+        required: false
+
+jobs:
+  tests-build:
+    name: Tests-Build SideStore - ${{ inputs.release_tag }}
+    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: 'macos-26'
+            version: '26.0'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies - xcbeautify
+        run: |
+          brew install xcbeautify
+        shell: bash
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: '26.0'
+
+      # - name: (Tests-Build) Cache Build
+      #   uses: irgaly/xcode-cache@v1.8.1
+      #   with:
+      #     key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
+      #     # tests shouldn't restore cache unless it is same build
+      #     # restore-keys: xcode-cache-deriveddata-test-${{ github.ref_name }}-
+      #     swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
+      #     swiftpm-cache-restore-keys: |
+      #       xcode-cache-sourcedata-test-${{ github.ref_name }}-
+      #     delete-used-deriveddata-cache: true
+
+      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Exact match)
+        id: xcode-cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Last Available)
+        id: xcode-cache-restore-recent
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-tests-${{ github.ref_name }}-
+
+      - name: Clean Derived Data (if required)
+        if: ${{ vars.PERFORM_CLEAN_TESTS_BUILD == '1' }}
+        run: |
+          rm -rf ~/Library/Developer/Xcode/DerivedData/
+          make clean
+          xcodebuild clean
+        shell: bash
+
+      - name: (Tests-Build) Clean previous build artifacts
+        run: |
+          make clean
+          mkdir -p build/logs
+        shell: bash
+
+      - name: (Tests-Build) List Files and derived data
+        shell: bash
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
+          echo ""
+
+      - name: Build SideStore Tests
+        # using 'tee' to intercept stdout and log for detailed build-log
+        shell: bash
+        run: |
+          NSUnbufferedIO=YES make -B build-tests 2>&1 | tee -a build/logs/tests-build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+
+      - name: (Tests-Build) Save Xcode & SwiftPM Cache
+        id: cache-save
+        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
+        
+      - name: (Tests-Build) List Files and Build artifacts
+        if: always()
+        shell: bash
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> Build <<<<<<<<<<"
+          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          find ~/Library/Developer/Xcode/DerivedData -maxdepth 8 -exec ls -ld {} + | grep "Build/Products"  >> tests-build-deriveddata.txt || true
+          echo ""
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with: 
+          name: tests-build-deriveddata-${{ inputs.short_commit }}.txt
+          path: tests-build-deriveddata.txt
+
+      - name: Encrypt tests-build-logs for upload
+        id: encrypt-test-log
+        if: always()
+        shell: bash
+        run: |
+          DEFAULT_BUILD_LOG_PASSWORD=12345
+
+          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
+
+          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
+            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
+          fi
+
+          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-build-logs.zip * || popd
+          echo "::set-output name=encrypted::true"
+      
+      - name: Upload encrypted-tests-build-logs.zip
+        id: attach-encrypted-test-log
+        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: encrypted-tests-build-logs-${{ inputs.short_commit }}.zip
+          path: encrypted-tests-build-logs.zip

.github/workflows/sidestore-tests-run.yml

@@ -0,0 +1,196 @@
+name: SideStore Tests Run
+
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        type: string
+      short_commit:
+        type: string
+    secrets:
+      BUILD_LOG_ZIP_PASSWORD:
+        required: false
+
+jobs:
+  tests-run:
+    name: Tests-Run SideStore - ${{ inputs.release_tag }}
+    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: 'macos-26'
+            version: '26.0'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Boot Simulator async(nohup) for testing
+        run: |
+          mkdir -p build/logs
+          nohup make -B boot-sim-async </dev/null >> build/logs/tests-run.log 2>&1 &
+        shell: bash
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: '26.0'
+
+      # - name: (Tests-Run) Cache Build
+      #   uses: irgaly/xcode-cache@v1.8.1
+      #   with:
+      #     # This comes from 
+      #     key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
+      #     swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
+      
+      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Exact match) [from tests-build job]
+        id: xcode-cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: (Tests-Run) Clean previous build artifacts
+        run: |
+          make clean
+          mkdir -p build/logs
+        shell: bash
+
+      - name: (Tests-Run) List Files and derived data
+        shell: bash
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          find ~/Library/Developer/Xcode/DerivedData -maxdepth 8 -exec ls -ld {} + | grep "Build/Products" >> tests-run-deriveddata.txt || true
+          echo ""
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with: 
+          name: tests-run-deriveddata-${{ inputs.short_commit }}.txt
+          path: tests-run-deriveddata.txt
+
+      # we expect simulator to have been booted by now, so exit otherwise
+      - name: Simulator Boot Check
+        run: |
+          mkdir -p build/logs
+          make -B sim-boot-check | tee -a build/logs/tests-run.log
+          exit ${PIPESTATUS[0]}
+        shell: bash
+
+      - name: Start Recording UI tests (if DEBUG_RECORD_TESTS is set to 1)
+        if: ${{ vars.DEBUG_RECORD_TESTS == '1' }}
+        run: |
+          nohup xcrun simctl io booted recordVideo -f tests-recording.mp4 --codec h264 </dev/null > tests-recording.log 2>&1 &
+          RECORD_PID=$!
+          echo "RECORD_PID=$RECORD_PID" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Run SideStore Tests
+        # using 'tee' to intercept stdout and log for detailed build-log
+        run: |
+          make run-tests 2>&1 | tee -a build/logs/tests-run.log && exit ${PIPESTATUS[0]}
+        # NSUnbufferedIO=YES make -B run-tests 2>&1 | tee build/logs/tests-run.log | xcpretty -r junit --output ./build/tests/test-results.xml && exit ${PIPESTATUS[0]}
+        shell: bash
+
+      - name: Stop Recording tests
+        if: ${{ always() && env.RECORD_PID != '' }}
+        run: |
+          kill -INT ${{ env.RECORD_PID }}
+        shell: bash
+
+      - name: (Tests-Run) List Files and Build artifacts
+        if: always()
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> Build <<<<<<<<<<"
+          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+        shell: bash
+
+      - name: Encrypt tests-run-logs for upload
+        id: encrypt-test-log
+        if: always()
+        run: |
+          DEFAULT_BUILD_LOG_PASSWORD=12345
+
+          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
+
+          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
+            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
+          fi
+
+          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-run-logs.zip * || popd
+          echo "::set-output name=encrypted::true"
+        shell: bash
+
+      - name: Upload encrypted-tests-run-logs.zip
+        id: attach-encrypted-test-log
+        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: encrypted-tests-run-logs-${{ inputs.short_commit }}.zip
+          path: encrypted-tests-run-logs.zip
+
+      - name: Print tests-recording.log contents (if exists)
+        if: ${{ always() && env.RECORD_PID != '' }}
+        run: |
+          if [ -f tests-recording.log ]; then
+            echo "tests-recording.log found. Its contents:"
+            cat tests-recording.log
+          else
+            echo "tests-recording.log not found."
+          fi
+        shell: bash
+
+      - name: Check for tests-recording.mp4 presence
+        id: check-recording
+        if: ${{ always() && env.RECORD_PID != '' }}
+        run: |
+          if [ -f tests-recording.mp4 ]; then
+            echo "::set-output name=found::true"
+            echo "tests-recording.mp4 found."
+          else
+            echo "tests-recording.mp4 not found, skipping upload."
+            echo "::set-output name=found::false"
+          fi
+        shell: bash
+
+      - name: Upload tests-recording.mp4
+        id: upload-recording
+        if: ${{ always() && steps.check-recording.outputs.found == 'true' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-recording-${{ inputs.short_commit }}.mp4
+          path: tests-recording.mp4
+
+      - name: Zip test-results
+        run: zip -r -9 ./test-results.zip ./build/tests
+        shell: bash
+
+      - name: Upload Test Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-${{ inputs.short_commit }}.zip
+          path: test-results.zip

.github/workflows/stable.yml

@@ -7,97 +7,236 @@ on:
 
 jobs:
   build:
-    name: Build and upload SideStore
+    name: Build SideStore - stable (on tag push)
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: 'macos-14'
-            version: '15.4'
-
+          - os: 'macos-26'
+            version: '26.0'
     runs-on: ${{ matrix.os }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install dependencies
-        run: brew install ldid
+      - name: Echo Build.xcconfig
+        run: |
+          echo "cat Build.xcconfig"
+          cat Build.xcconfig
+        shell: bash
 
-      - name: Change version to tag
-        run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
+      # - name: Change MARKETING_VERSION to the pushed tag that triggered this build
+      #   run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
 
-      - name: Get version
+      - name: Echo Updated Build.xcconfig
+        run: |
+          cat Build.xcconfig
+        shell: bash
+
+      - name: Extract MARKETING_VERSION from Build.xcconfig
         id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+        run: |
+          version=$(grep MARKETING_VERSION Build.xcconfig | sed -e 's/MARKETING_VERSION = //g')
+          echo "version=$version" >> $GITHUB_OUTPUT
+          echo "version=$version"
 
-      - name: Echo version
-        run: echo "${{ steps.version.outputs.version }}"
+          echo "MARKETING_VERSION=$version" >> $GITHUB_ENV
+          echo "MARKETING_VERSION=$version" >> $GITHUB_OUTPUT
+          echo "MARKETING_VERSION=$version"
+
+        shell: bash
+
+      - name: Fail the build if pushed tag and embedded MARKETING_VERSION in Build.xcconfig are mismatching
+        run: |
+          if [ "$MARKETING_VERSION" != "${{ github.ref_name }}" ]; then
+            echo 'Version mismatch: $tag != $marketing_version ... '
+            echo "    expected-tag  : $MARKETING_VERSION"
+            echo "    pushed-tag    : ${{ github.ref_name }}"
+            exit 1
+          fi
+          echo 'Version matches: $tag == $marketing_version ... '
+          echo "    expected-tag  : $MARKETING_VERSION"
+          echo "    pushed-tag    : ${{ github.ref_name }}"
+        shell: bash
+
+      - name: Install dependencies - ldid & xcbeautify
+        run: |
+          brew install ldid xcbeautify
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
           xcode-version: ${{ matrix.version }}
 
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
+      - name: (Build) Restore Xcode & SwiftPM Cache (Exact match)
+        id: xcode-cache-restore
+        uses: actions/cache/restore@v3
         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-
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-stable-${{ github.sha }}
 
-      - name: Build SideStore
-        run: NSUnbufferedIO=YES make build | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+      - name: (Build) Restore Xcode & SwiftPM Cache (Last Available)
+        id: xcode-cache-restore-recent
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-stable-
+
+      - name: (Build) Clean previous build artifacts
+        run: |
+          make clean
+          mkdir -p build/logs
+        shell: bash
+
+      - name: (Build) List Files and derived data
+        if: always()
+        shell: bash
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
+          echo ""
+
+      - name: Build SideStore.xcarchive
+        # using 'tee' to intercept stdout and log for detailed build-log
+        run: |
+          NSUnbufferedIO=YES make -B build 2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        shell: bash
 
       - name: Fakesign app
-        run: make fakesign
+        run: make fakesign | tee -a build/logs/build.log
+        shell: bash
 
       - name: Convert to IPA
-        run: make ipa
+        run: make ipa | tee -a build/logs/build.log
+        shell: bash
 
-      - name: Get current date
-        id: date
-        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
-
-      - name: Get current date in AltStore date form
-        id: date_altstore
-        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Upload to new stable release
-        uses: softprops/action-gh-release@v1
+      - name: (Build) Save Xcode & SwiftPM Cache
+        id: cache-save
+        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref_name }}
-          draft: true
-          files: SideStore.ipa
-          body: |
-            <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
-            ## Changelog
-            
-            - TODO
-            
-            ## Build Info
-            
-            Built at (UTC): `${{ steps.date.outputs.date }}`
-            Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-            Commit SHA: `${{ github.sha }}`
-            Version: `${{ steps.version.outputs.version }}`
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-cache-build-stable-${{ github.sha }}
+        
+      - name: (Build) List Files and Build artifacts
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
 
-      - name: Add version to IPA file name
-        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
+          echo ">>>>>>>>> Build <<<<<<<<<<"
+          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> SideStore.xcarchive <<<<<<<<<<"
+          find SideStore.xcarchive -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
+          echo ""
+
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
+          echo ""
+        shell: bash
+
+      - name: Encrypt build-logs for upload
+        id: encrypt-build-log
+        run: |
+          DEFAULT_BUILD_LOG_PASSWORD=12345
+
+          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
+
+          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
+            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
+          fi
+          
+          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-build-logs.zip * || popd
+          echo "::set-output name=encrypted::true"
+        shell: bash
+
+      - name: Upload encrypted-build-logs.zip
+        id: attach-encrypted-build-log
+        if: ${{ always() && steps.encrypt-build-log.outputs.encrypted == 'true' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: encrypted-build-logs-${{ steps.version.outputs.version }}.zip
+          path: encrypted-build-logs.zip
 
       - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v4
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore-${{ steps.version.outputs.version }}.ipa
+          path: SideStore.ipa
+
+      - name: Zip dSYMs
+        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs
+        shell: bash
 
       - name: Upload *.dSYM Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./*.dSYM/
+          name: SideStore-${{ steps.version.outputs.version }}-dSYMs.zip
+          path: SideStore.dSYMs.zip
+
+      - name: Get current date
+        id: date
+        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Get current date in AltStore date form
+        id: date_altstore
+        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Upload to releases
+        uses: IsaacShelton/update-existing-release@v1.3.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          release: ${{ github.ref_name }}   # name
+          tag: ${{ github.ref_name  }}
+           # stick with what the user pushed, do not use latest commit or anything, 
+           # ex: if we want to go back to previous release due to hot issue, dev can create a new tag pointing to that older working tag/commit so as to keep it as an update (to revert major issue)
+           #     in this case we do not want the tag to be auto-updated to latest
+          updateTag: false 
+          prerelease: false
+          files: >
+            SideStore.ipa 
+            SideStore.dSYMs.zip 
+            encrypted-build-logs.zip
+          body: |
+              <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
+              ## Changelog
+              
+              - TODO
+              
+              ## Build Info
+
+              Built at (UTC): `${{ steps.date.outputs.date }}`
+              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
+              Commit SHA: `${{ github.sha }}`
+              Version: `${{ steps.version.outputs.version }}`

.gitmodules

@@ -30,7 +30,7 @@
     url = https://github.com/rileytestut/Roxas.git
 [submodule "Dependencies/libimobiledevice"]
     path = Dependencies/libimobiledevice
-    url = https://github.com/libimobiledevice/libimobiledevice
+    url = https://github.com/SideStore/libimobiledevice
 [submodule "Dependencies/libusbmuxd"]
     path = Dependencies/libusbmuxd
     url = https://github.com/libimobiledevice/libusbmuxd.git
@@ -51,8 +51,8 @@
     url = https://github.com/SideStore/minimuxer
     branch = master
 [submodule "SideStore/em_proxy"]
-    path = SideStore/em_proxy
-    url = https://github.com/SideStore/em_proxy
+	path = SideStore/em_proxy
+	url = https://github.com/SideStore/em_proxy
     branch = master
 [submodule "SideStore/libfragmentzip"]
     path = SideStore/libfragmentzip

AltBackup/AltBackup.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.$(APP_GROUP_IDENTIFIER)</string>
+		<string>group.$(GROUP_ID)</string>
 	</array>
 </dict>
 </plist>

AltStore.xcworkspace/contents.xcworkspacedata

@@ -10,7 +10,4 @@
    <FileRef
       location = "group:Dependencies/Roxas/Roxas.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

AltStore/AltStore.entitlements

@@ -2,24 +2,14 @@
 <!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.security.files.user-selected.read-write</key>
-	<array>
-		<string></string>
-	</array>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string></string>
-	</array> -->
+	<key>aps-environment</key>
+	<string>development</string>
 	<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>
 	<array>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>

AltStore/AltStoreFree.entitlements

@@ -0,0 +1,10 @@
+<?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>com.apple.security.application-groups</key>
+    <array>
+        <string>group.$(APP_GROUP_IDENTIFIER)</string>
+    </array>
+</dict>
+</plist>

AltStore/App Detail/AppContentViewController.swift

@@ -43,8 +43,10 @@ final class AppContentViewController: UITableViewController
     }()
     
     @IBOutlet private var subtitleLabel: UILabel!
-    @IBOutlet private var descriptionTextView: CollapsingTextView!
-    @IBOutlet private var versionDescriptionTextView: CollapsingTextView!
+//    @IBOutlet private var descriptionTextView: CollapsingTextView!
+    @IBOutlet private var descriptionTextView: CollapsingMarkdownView!
+//    @IBOutlet private var versionDescriptionTextView: CollapsingTextView!
+    @IBOutlet private var versionDescriptionTextView: CollapsingMarkdownView!
     @IBOutlet private var versionLabel: UILabel!
     @IBOutlet private var versionDateLabel: UILabel!
     @IBOutlet private var sizeLabel: UILabel!
@@ -55,35 +57,32 @@ final class AppContentViewController: UITableViewController
     @IBOutlet private(set) var appDetailCollectionViewController: AppDetailCollectionViewController!
     @IBOutlet private var appDetailCollectionViewHeightConstraint: NSLayoutConstraint!
     
-    override func viewDidLoad()
-    {
+    override func viewDidLoad() {
         super.viewDidLoad()
         
         self.tableView.contentInset.bottom = 20
         
         self.subtitleLabel.text = self.app.subtitle
-        self.descriptionTextView.text = self.app.localizedDescription
+        let desc = self.app.localizedDescription
+        self.descriptionTextView.text = desc
         
-        if let version = self.app.latestAvailableVersion
-        {
-            self.versionDescriptionTextView.text = version.localizedDescription
+        if let version = self.app.latestAvailableVersion {
+            self.versionDescriptionTextView.text = version.localizedDescription ?? "nil"
             self.versionLabel.text = String(format: NSLocalizedString("Version %@", comment: ""), version.localizedVersion)
             self.versionDateLabel.text = Date().relativeDateString(since: version.date)
-            self.sizeLabel.text = self.byteCountFormatter.string(fromByteCount: version.size)
-        }
-        else
-        {
-            self.versionDescriptionTextView.text = nil
+            self.sizeLabel.text = ByteCountFormatter.string(fromByteCount: version.size, countStyle: .file)
+        } else {
+            self.versionDescriptionTextView.text = "nil"
             self.versionLabel.text = nil
             self.versionDateLabel.text = nil
-            self.sizeLabel.text = self.byteCountFormatter.string(fromByteCount: 0)
+            self.sizeLabel.text = ByteCountFormatter.string(fromByteCount: 0, countStyle: .file)
         }
         
         self.descriptionTextView.maximumNumberOfLines = 5
-        self.descriptionTextView.moreButton.addTarget(self, action: #selector(AppContentViewController.toggleCollapsingSection(_:)), for: .primaryActionTriggered)
+        self.versionDescriptionTextView.maximumNumberOfLines = 5
         
-        self.versionDescriptionTextView.maximumNumberOfLines = 3
-        self.versionDescriptionTextView.moreButton.addTarget(self, action: #selector(AppContentViewController.toggleCollapsingSection(_:)), for: .primaryActionTriggered)
+        self.descriptionTextView.toggleButton.addTarget(self, action: #selector(AppContentViewController.toggleCollapsingSection(_:)), for: .primaryActionTriggered)
+        self.versionDescriptionTextView.toggleButton.addTarget(self, action: #selector(AppContentViewController.toggleCollapsingSection(_:)), for: .primaryActionTriggered)
     }
     
     override func viewDidLayoutSubviews()
@@ -162,8 +161,12 @@ private extension AppContentViewController
         
         switch sender
         {
-        case self.descriptionTextView.moreButton: indexPath = IndexPath(row: Row.description.rawValue, section: 0)
-        case self.versionDescriptionTextView.moreButton: indexPath = IndexPath(row: Row.versionDescription.rawValue, section: 0)
+        case self.descriptionTextView.toggleButton:
+            indexPath = IndexPath(row: Row.description.rawValue, section: 0)
+            
+        case self.versionDescriptionTextView.toggleButton:
+            indexPath = IndexPath(row: Row.versionDescription.rawValue, section: 0)
+
         default: return
         }
         

AltStore/AppDelegate.swift

@@ -27,10 +27,12 @@ extension AppDelegate
     static let addSourceDeepLinkNotification = Notification.Name(Bundle.Info.appbundleIdentifier + ".AddSourceDeepLinkNotification")
     
     static let appBackupDidFinish = Notification.Name(Bundle.Info.appbundleIdentifier + ".AppBackupDidFinish")
+    static let exportCertificateNotification = Notification.Name(Bundle.Info.appbundleIdentifier + ".ExportCertificateNotification")
     
     static let importAppDeepLinkURLKey = "fileURL"
     static let appBackupResultKey = "result"
     static let addSourceDeepLinkURLKey = "sourceURL"
+    static let exportCertificateCallbackTemplateKey = "callback"
 }
 
 @UIApplicationMain
@@ -97,7 +99,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         self.prepareImageCache()
 
         // TODO: @mahee96: find if we need to start em_proxy as in altstore?
-        // start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        if UserDefaults.standard.enableEMPforWireguard {
+            start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        }
 
         SecureValueTransformer.register()        
         
@@ -122,7 +126,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     {
         // Make sure to update SceneDelegate.sceneDidEnterBackground() as well.
         // TODO: @mahee96: find if we need to stop em_proxy as in altstore?
-        // stop_em_proxy()
+        if UserDefaults.standard.enableEMPforWireguard {
+            stop_em_proxy()
+        }
         guard let oneMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date()) else { return }
         
         let midnightOneMonthAgo = Calendar.current.startOfDay(for: oneMonthAgo)
@@ -139,7 +145,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication)
     {
         AppManager.shared.update()
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        if UserDefaults.standard.enableEMPforWireguard {
+            start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        }
 
         PatreonAPI.shared.refreshPatreonAccount()
     }
@@ -292,6 +300,26 @@ private extension AppDelegate
                 
                 return true
                 
+            case "pairing":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                guard let callbackTemplate = queryItems["urlName"]?.removingPercentEncoding else { return false }
+                
+                DispatchQueue.main.async {
+                    exportPairingFile(callbackTemplate)
+                }
+                
+                return true
+            
+            case "certificate":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                guard let callbackTemplate = queryItems["callback_template"]?.removingPercentEncoding else { return false }
+                
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: AppDelegate.exportCertificateNotification, object: nil, userInfo: [AppDelegate.exportCertificateCallbackTemplateKey: callbackTemplate])
+                }
+                
+                return true
+                
             default: return false
             }
         }

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="23504" 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="23506"/>
         <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"/>
@@ -14,7 +14,7 @@
             <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="0.0" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" name="SettingsBackground"/>
@@ -42,13 +42,13 @@
                         <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="44" width="375" height="623"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                             </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="623"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                                         <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,13 +57,13 @@
                                                         <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="333.5" height="41"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="343" height="41"/>
                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="34"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign in with your Apple ID to get started." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SNU-tv-8Au">
-                                                                <rect key="frame" x="0.0" y="47" width="308.5" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="47" width="306.5" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -160,7 +160,7 @@
                                                                     </stackView>
                                                                 </subviews>
                                                             </stackView>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2N5-zd-fUj">
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2N5-zd-fUj">
                                                                 <rect key="frame" x="0.0" y="191" width="343" height="51"/>
                                                                 <color key="backgroundColor" name="SettingsHighlighted"/>
                                                                 <constraints>
@@ -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="518.5" width="343" height="96.5"/>
+                                                <rect key="frame" x="16" y="498.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,6 +198,10 @@
                                             </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>
@@ -215,19 +219,15 @@
                         <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>
@@ -264,7 +264,7 @@
                         <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="44" width="375" height="564"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="544"/>
                                 <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="168" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="161" 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="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="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"/>
@@ -318,7 +318,7 @@
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <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">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable LocalDevVPN and 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="38.5"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -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="300.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="287.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="16" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="15.5" 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="433.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="413.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"/>
@@ -372,7 +372,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Xs6-pJ-PUz">
-                                                <rect key="frame" x="79" y="16" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="17" width="264" height="62"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apps Refresh Automatically" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="nvb-Aq-sYa">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -381,7 +381,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apps are refreshed in the background while you are on SideStore VPN!" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="HU5-Hv-E3d">
-                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="38.5"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="36.5"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
@@ -431,7 +431,7 @@
             </objects>
             <point key="canvasLocation" x="1353" y="736"/>
         </scene>
-        <!--Refresh AltStore-->
+        <!--Refresh SideStore-->
         <scene sceneID="9Vh-dM-OqX">
             <objects>
                 <viewController storyboardIdentifier="refreshAltStoreViewController" id="aoK-yE-UVT" customClass="RefreshAltStoreViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
@@ -485,7 +485,7 @@
                             <constraint firstItem="tDQ-ao-1Jg" firstAttribute="leading" secondItem="R83-kV-365" secondAttribute="leadingMargin" id="zEt-Xr-kJx"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" title="Refresh AltStore" largeTitleDisplayMode="always" id="5nk-NR-jtV"/>
+                    <navigationItem key="navigationItem" title="Refresh SideStore" largeTitleDisplayMode="always" id="5nk-NR-jtV"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
                         <outlet property="placeholderView" destination="fpO-Bf-gFY" id="q7d-au-d94"/>

AltStore/Base.lproj/Main.storyboard

@@ -287,7 +287,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="98"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Hello Me" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Pyt-8D-BZA" customClass="CollapsingTextView" customModule="SideStore" customModuleProvider="target">
+                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Hello Me" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Pyt-8D-BZA" customClass="CollapsingMarkdownView" customModule="SideStore" customModuleProvider="target">
                                                     <rect key="frame" x="20" y="20" width="335" height="34"/>
                                                     <color key="backgroundColor" name="Background"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -353,7 +353,7 @@
                                                                 </stackView>
                                                             </subviews>
                                                         </stackView>
-                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wQF-WY-Gdz" customClass="CollapsingTextView" customModule="SideStore" customModuleProvider="target">
+                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wQF-WY-Gdz" customClass="CollapsingMarkdownView" customModule="SideStore" customModuleProvider="target">
                                                             <rect key="frame" x="20" y="59.5" width="335" height="34"/>
                                                             <color key="backgroundColor" name="Background"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -532,6 +532,7 @@
                         <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" name="Primary"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -561,6 +562,7 @@
                     <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"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -913,6 +915,7 @@
                     <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"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>

AltStore/Components/CollapsingTextView.swift

@@ -13,21 +13,18 @@ final class CollapsingTextView: UITextView
     var isCollapsed = true {
         didSet {
             guard self.isCollapsed != oldValue else { return }
-            self.shouldResetLayout = true
             self.setNeedsLayout()
         }
     }
     
     var maximumNumberOfLines = 2 {
         didSet {
-            self.shouldResetLayout = true
             self.setNeedsLayout()
         }
     }
     
     var lineSpacing: Double = 2 {
         didSet {
-            self.shouldResetLayout = true
             
             if #available(iOS 16, *)
             {
@@ -42,7 +39,6 @@ final class CollapsingTextView: UITextView
     
     override var text: String! {
         didSet {
-            self.shouldResetLayout = true
             
             guard #available(iOS 16, *) else { return }
             self.updateText()
@@ -51,9 +47,6 @@ final class CollapsingTextView: UITextView
     
     let moreButton = UIButton(type: .system)
     
-    private var shouldResetLayout: Bool = false
-    private var previousSize: CGSize?
-    
     override init(frame: CGRect, textContainer: NSTextContainer?)
     {
         super.init(frame: frame, textContainer: textContainer)
@@ -115,45 +108,39 @@ final class CollapsingTextView: UITextView
                                      height: font.lineHeight)
         self.moreButton.frame = moreButtonFrame
         
-        if self.shouldResetLayout || self.previousSize != self.bounds.size
+        if self.isCollapsed
         {
-            if self.isCollapsed
+            let boundingSize = self.attributedText.boundingRect(with: CGSize(width: self.textContainer.size.width, height: .infinity), options: [.usesLineFragmentOrigin, .usesFontLeading], context: nil)
+            let maximumCollapsedHeight = font.lineHeight * Double(self.maximumNumberOfLines) + self.lineSpacing * Double(self.maximumNumberOfLines - 1)
+            
+            if boundingSize.height.rounded() > maximumCollapsedHeight.rounded()
             {
-                let boundingSize = self.attributedText.boundingRect(with: CGSize(width: self.textContainer.size.width, height: .infinity), options: [.usesLineFragmentOrigin, .usesFontLeading], context: nil)
-                let maximumCollapsedHeight = font.lineHeight * Double(self.maximumNumberOfLines) + self.lineSpacing * Double(self.maximumNumberOfLines - 1)
+                self.textContainer.maximumNumberOfLines = self.maximumNumberOfLines
                 
-                if boundingSize.height.rounded() > maximumCollapsedHeight.rounded()
-                {
-                    self.textContainer.maximumNumberOfLines = self.maximumNumberOfLines
-                    
-                    var exclusionFrame = moreButtonFrame
-                    exclusionFrame.origin.y += self.moreButton.bounds.midY
-                    exclusionFrame.size.width = self.bounds.width // Extra wide to make sure it wraps to next line.
-                    self.textContainer.exclusionPaths = [UIBezierPath(rect: exclusionFrame)]
-                    
-                    self.moreButton.isHidden = false
-                }
-                else
-                {
-                    self.textContainer.maximumNumberOfLines = 0 // Fixes last line having slightly smaller line spacing.
-                    self.textContainer.exclusionPaths = []
-                    
-                    self.moreButton.isHidden = true
-                }
+                var exclusionFrame = moreButtonFrame
+                exclusionFrame.origin.y += self.moreButton.bounds.midY
+                exclusionFrame.size.width = self.bounds.width // Extra wide to make sure it wraps to next line.
+                self.textContainer.exclusionPaths = [UIBezierPath(rect: exclusionFrame)]
+                
+                self.moreButton.isHidden = false
             }
             else
             {
-                self.textContainer.maximumNumberOfLines = 0
+                self.textContainer.maximumNumberOfLines = 0 // Fixes last line having slightly smaller line spacing.
                 self.textContainer.exclusionPaths = []
                 
                 self.moreButton.isHidden = true
             }
+        }
+        else
+        {
+            self.textContainer.maximumNumberOfLines = 0
+            self.textContainer.exclusionPaths = []
             
-            self.invalidateIntrinsicContentSize()
+            self.moreButton.isHidden = true
         }
         
-        self.shouldResetLayout = false
-        self.previousSize = self.bounds.size
+        self.invalidateIntrinsicContentSize()
     }
 }
 

AltStore/Info.plist

@@ -242,7 +242,6 @@
 				<key>public.filename-extension</key>
 				<array>
 					<string>mobiledevicepairing</string>
-					<string>mobiledevicepair</string>
 				</array>
 			</dict>
 		</dict>

AltStore/LaunchViewController.swift

@@ -12,84 +12,73 @@ import EmotionalDamage
 import minimuxer
 import WidgetKit
 
+import AltSign
 import AltStoreCore
 import UniformTypeIdentifiers
 
 let pairingFileName = "ALTPairingFile.mobiledevicepairing"
 
-final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDelegate
-{
+final class LaunchViewController: UIViewController, UIDocumentPickerDelegate {
     private var didFinishLaunching = false
-    
-    private var destinationViewController: TabBarController!
-    
-    override var launchConditions: [RSTLaunchCondition] {
-        let isDatabaseStarted = RSTLaunchCondition(condition: { DatabaseManager.shared.isStarted }) { (completionHandler) in
-            DatabaseManager.shared.start(completionHandler: completionHandler)
-        }
+    private var retries = 0
+    private var maxRetries = 3
+    private var splashView: SplashView!
+    private var destinationViewController: TabBarController?
+    private var startTime: Date!
 
-        return [isDatabaseStarted]
-    }
-    
-    override var childForStatusBarStyle: UIViewController? {
-        return self.children.first
-    }
-    
-    override var childForStatusBarHidden: UIViewController? {
-        return self.children.first
-    }
-    
-    override func viewDidLoad()
-    {
-        defer {
-            // Create destinationViewController now so view controllers can register for receiving Notifications.
-            self.destinationViewController = self.storyboard!.instantiateViewController(withIdentifier: "tabBarController") as! TabBarController
-        }
+    override func viewDidLoad() {
         super.viewDidLoad()
+        splashView = SplashView(frame: view.bounds, appName: "SideStore")
+        destinationViewController = storyboard!.instantiateViewController(withIdentifier: "tabBarController") as? TabBarController
+        view.addSubview(splashView)
     }
-    
+
     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")
+        super.viewDidAppear(animated)
+        guard !didFinishLaunching else { return }
+        Task {
+            startTime = Date()
+            await runLaunchSequence()
+            doPostLaunch()
+        }
+    }
+
+    private func runLaunchSequence() async {
+        guard retries < maxRetries else { return }
+        retries += 1
+
+        await Task.detached {
+            if !DatabaseManager.shared.isStarted {
+                await withCheckedContinuation { continuation in
+                    DatabaseManager.shared.start { error in
+                        if let error {
+                            Task { await self.handleLaunchError(error, retryCallback: self.runLaunchSequence) }
+                        } else {
+                            Task { await self.finishLaunching() }
                         }
+                        continuation.resume(returning: ())
                     }
                 }
+            } else {
+                await self.finishLaunching()
             }
-        }
-        
+        }.value
+    }
+
+    private func doPostLaunch() {
+        SideJITManager.shared.checkAndPromptIfNeeded(presentingVC: self)
         if #available(iOS 17, *), UserDefaults.standard.sidejitenable {
-            DispatchQueue.global().async {
-                self.askfornetwork()
-            }
+            DispatchQueue.global().async { SideJITManager.shared.askForNetwork() }
             print("SideJITServer Enabled")
         }
-        
-        
-        
+
         #if !targetEnvironment(simulator)
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         
+        detectAndImportAccountFile()
+        
+        if UserDefaults.standard.enableEMPforWireguard {
+            start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        }
         guard let pf = fetchPairingFile() else {
             displayError("Device pairing file not found.")
             return
@@ -97,222 +86,128 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         start_minimuxer_threads(pf)
         #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
-        let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
-        if fm.fileExists(atPath: documentsPath.path), let contents = try? String(contentsOf: documentsPath), !contents.isEmpty {
-            print("Loaded ALTPairingFile from \(documentsPath.path)")
-            return contents
-        } else if
-            let appResourcePath = Bundle.main.url(forResource: "ALTPairingFile", withExtension: "mobiledevicepairing"),
-            fm.fileExists(atPath: appResourcePath.path),
-            let data = fm.contents(atPath: appResourcePath.path),
-            let contents = String(data: data, encoding: .utf8),
-            !contents.isEmpty,
-            !UserDefaults.standard.isPairingReset {
-            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{
-            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)
-            
-            // Create OK button with action handler
-            let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
-                // Try to load it from a file picker
-                var types = UTType.types(tag: "plist", tagClass: UTTagClass.filenameExtension, conformingTo: nil)
-                types.append(contentsOf: UTType.types(tag: "mobiledevicepairing", tagClass: UTTagClass.filenameExtension, conformingTo: UTType.data))
-                types.append(.xml)
-                let documentPickerController = UIDocumentPickerViewController(forOpeningContentTypes: types)
-                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)
-            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
-        }
-    }
-
-    func displayError(_ msg: String) {
-        print(msg)
-        // Create a new alert
-        let dialogMessage = UIAlertController(title: "Error launching SideStore", message: msg, preferredStyle: .alert)
-
-        // Present alert to user
-        self.present(dialogMessage, animated: true, completion: nil)
-    }
-    
-    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
-        let url = urls[0]
-        let isSecuredURL = url.startAccessingSecurityScopedResource() == true
-
-        do {
-            // Read to a string
-            let data1 = try Data(contentsOf: urls[0])
-            let pairing_string = String(bytes: data1, encoding: .utf8)
-            if pairing_string == nil {
-                displayError("Unable to read pairing file")
-            }
-            
-            // Save to a file for next launch
-            let pairingFile = FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)")
-            try pairing_string?.write(to: pairingFile, atomically: true, encoding: String.Encoding.utf8)
-            
-            // Start minimuxer now that we have a file
-            start_minimuxer_threads(pairing_string!)
-        } catch {
-            displayError("Unable to read pairing file")
-        }
-        
-        if (isSecuredURL) {
-            url.stopAccessingSecurityScopedResource()
-        }
-        controller.dismiss(animated: true, completion: nil)
-    }
-    
-    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
-        displayError("Choosing a pairing file was cancelled. Please re-open the app and try again.")
-    }
-    
     func start_minimuxer_threads(_ pairing_file: String) {
         target_minimuxer_address()
         let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
         do {
-            // enable minimuxer console logging only if enabled in settings
-            let isMinimuxerConsoleLoggingEnabled = UserDefaults.standard.isMinimuxerConsoleLoggingEnabled
-            try minimuxer.startWithLogger(pairing_file, documentsDirectory, isMinimuxerConsoleLoggingEnabled)
+            let loggingEnabled = UserDefaults.standard.isMinimuxerConsoleLoggingEnabled
+            try minimuxer.startWithLogger(pairing_file, documentsDirectory, loggingEnabled)
         } catch {
-            try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)"))
-            displayError("minimuxer failed to start, please restart SideStore. \((error as? LocalizedError)?.failureReason ?? "UNKNOWN ERROR!!!!!! REPORT TO GITHUB ISSUES!")")
+            try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent(pairingFileName))
+            displayError("minimuxer failed to start, please restart SideStore. \((error as? LocalizedError)?.failureReason ?? "UNKNOWN ERROR")")
         }
-        if #available(iOS 17, *) {
-            // TODO: iOS 17 and above have a new JIT implementation that is completely broken in SideStore :(
+        start_auto_mounter(documentsDirectory)
+    }
+
+    func fetchPairingFile() -> String? { PairingFileManager.shared.fetchPairingFile(presentingVC: self) }
+
+    func displayError(_ msg: String) {
+        print(msg)
+        let alert = UIAlertController(title: "Error launching SideStore", message: msg, preferredStyle: .alert)
+        self.present(alert, animated: true)
+    }
+
+    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+        let url = urls[0]
+        let isSecuredURL = url.startAccessingSecurityScopedResource() == true
+        defer {
+            if (isSecuredURL) {
+                url.stopAccessingSecurityScopedResource()
+            }
         }
-        else {
-            start_auto_mounter(documentsDirectory)
+
+        do {
+            let data = try Data(contentsOf: url)
+            guard let pairingString = String(data: data, encoding: .utf8) else {
+                displayError("Unable to read pairing file")
+                return
+            }
+            try pairingString.write(to: FileManager.default.documentsDirectory.appendingPathComponent(pairingFileName), atomically: true, encoding: .utf8)
+            start_minimuxer_threads(pairingString)
+        } catch {
+            displayError("Unable to read pairing file")
         }
         
-        // Create destinationViewController now so view controllers can register for receiving Notifications.
-        self.destinationViewController = self.storyboard!.instantiateViewController(withIdentifier: "tabBarController") as? TabBarController
+        controller.dismiss(animated: true, completion: nil)
     }
-}
 
-extension LaunchViewController
-{
-    override func handleLaunchError(_ error: Error)
-    {
-        do
-        {
-            throw error
+    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
+        displayError("Choosing a pairing file was cancelled. Please re-open the app and try again.")
+    }
+    
+    func importAccountAtFile(_ file: URL, remove: Bool = false) {
+        _ = file.startAccessingSecurityScopedResource()
+        defer { file.stopAccessingSecurityScopedResource() }
+        guard let accountD = try? Data(contentsOf: file) else {
+            let toastView = ToastView(text: NSLocalizedString("Could not read data from file!", comment: ""), detailText: "\(file)")
+            return toastView.show(in: self)
         }
-        catch let error as NSError
-        {
-            let title = error.userInfo[NSLocalizedFailureErrorKey] as? String ?? NSLocalizedString("Unable to Launch SideStore", comment: "")
-            
-            let errorDescription: String
-            
-            if #available(iOS 14.5, *)
-            {
-                let errorMessages = [error.debugDescription] + error.underlyingErrors.map { ($0 as NSError).debugDescription }
-                errorDescription = errorMessages.joined(separator: "\n\n")
-            }
-            else
-            {
-                errorDescription = error.debugDescription
-            }
-            
-            let alertController = UIAlertController(title: title, message: errorDescription, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: ""), style: .default, handler: { (action) in
-                self.handleLaunchConditions()
-            }))
-            self.present(alertController, animated: true, completion: nil)
+        guard let account = try? Foundation.JSONDecoder().decode(ImportedAccount.self, from: accountD) else {
+            let toastView = ToastView(text: NSLocalizedString("Could not parse data from file!", comment: ""), detailText: "\(file)")
+            return toastView.show(in: self)
+        }
+        print("We want to import this account probably: \(account)")
+        if remove {
+            try? FileManager.default.removeItem(at: file)
+        }
+        Keychain.shared.appleIDEmailAddress = account.email
+        Keychain.shared.appleIDPassword = account.password
+        Keychain.shared.adiPb = account.adiPB
+        Keychain.shared.identifier = account.local_user
+        if let altCert = ALTCertificate(p12Data: account.cert, password: account.certpass) {
+            Keychain.shared.signingCertificate = altCert.encryptedP12Data(withPassword: "")!
+            Keychain.shared.signingCertificatePassword = account.certpass
+            let toastView = ToastView(text: NSLocalizedString("Successfully imported '\(account.email)'!", comment: ""), detailText: "SideStore should be fully operational!")
+            return toastView.show(in: self)
+        } else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to import account certificate!", comment: ""), detailText: "Failed to create ALTCertificate. Check if the password is correct. Still imported account/adi.pb details!")
+            return toastView.show(in: self)
         }
     }
     
-    override func finishLaunching()
-    {
-        super.finishLaunching()
-        
-        guard !self.didFinishLaunching else { return }
+    func detectAndImportAccountFile() {
+        let accountFileURL = FileManager.default.documentsDirectory.appendingPathComponent("Account.sideconf")
+        #if !DEBUG
+        importAccountAtFile(accountFileURL, remove: true)
+        #else
+        importAccountAtFile(accountFileURL)
+        #endif
+    }
+}
+
+extension LaunchViewController {
+    @MainActor
+    func handleLaunchError(_ error: Error, retryCallback: (() async -> Void)? = nil) {
+        do { throw error } catch let error as NSError {
+            let title = error.userInfo[NSLocalizedFailureErrorKey] as? String ?? NSLocalizedString("Unable to Launch SideStore", comment: "")
+            let desc: String
+            if #available(iOS 14.5, *) {
+                desc = ([error.debugDescription] + error.underlyingErrors.map { ($0 as NSError).debugDescription }).joined(separator: "\n\n")
+            } else {
+                desc = error.debugDescription
+            }
+            let alert = UIAlertController(title: title, message: desc, preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: ""), style: .default) { _ in
+                Task { await retryCallback?() }
+            })
+            present(alert, animated: true)
+        }
+    }
+
+    @MainActor
+    func finishLaunching() async {
+        guard !didFinishLaunching else { return }
+        didFinishLaunching = true
         
         AppManager.shared.update()
         AppManager.shared.updatePatronsIfNeeded()
         PatreonAPI.shared.refreshPatreonAccount()
-        
         AppManager.shared.updateAllSources { result in
             guard case .failure(let error) = result else { return }
             Logger.main.error("Failed to update sources on launch. \(error.localizedDescription, privacy: .public)")
             
+            
             let errorDesc = ErrorProcessing(.fullError).getDescription(error: error as NSError)
             print("Failed to update sources on launch. \(errorDesc)")
             
@@ -320,63 +215,64 @@ extension LaunchViewController
             if String(describing: error).contains("The Internet connection appears to be offline"){
                 mode = .localizedDescription    // dont make noise!
             }
-            
             let toastView = ToastView(error: error, mode: mode)
             toastView.addTarget(self.destinationViewController, action: #selector(TabBarController.presentSources), for: .touchUpInside)
-            toastView.show(in: self.destinationViewController.selectedViewController ?? self.destinationViewController)
+            toastView.show(in: self.destinationViewController!.selectedViewController ?? self.destinationViewController!)
         }
-        
-        self.updateKnownSources()
-        
-        // Ask widgets to be refreshed
+        updateKnownSources()
         WidgetCenter.shared.reloadAllTimelines()
+        didFinishLaunching = true
         
-        // Add view controller as child (rather than presenting modally)
-        // so tint adjustment + card presentations works correctly.
-        self.destinationViewController.view.frame = CGRect(x: 0, y: 0, width: self.view.bounds.width, height: self.view.bounds.height)
-        self.destinationViewController.view.alpha = 0.0
-        self.addChild(self.destinationViewController)
-        self.view.addSubview(self.destinationViewController.view, pinningEdgesWith: .zero)
-        self.destinationViewController.didMove(toParent: self)
+        let destinationVC = destinationViewController!
         
-        UIView.animate(withDuration: 0.2) {
-            self.destinationViewController.view.alpha = 1.0
-        }
+        let elapsed = abs(startTime.timeIntervalSinceNow)
+        let remaining = elapsed >= 1 ? 0 : 1 - elapsed
+        try? await Task.sleep(nanoseconds: UInt64(remaining * 1_000_000_000))
         
-        self.didFinishLaunching = true
-    }
-}
+        destinationVC.loadViewIfNeeded()
+        addChild(destinationVC)
+        destinationVC.view.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(destinationVC.view)
+        destinationVC.didMove(toParent: self)
+        
+        // Pin edges BEFORE animation
+        NSLayoutConstraint.activate([
+            destinationVC.view.topAnchor.constraint(equalTo: view.topAnchor),
+            destinationVC.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            destinationVC.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            destinationVC.view.trailingAnchor.constraint(equalTo: view.trailingAnchor)
+        ])
 
-private extension LaunchViewController
-{
-    func updateKnownSources()
-    {
+        // Set initial alpha for fade-in
+        destinationVC.view.alpha = 0
+
+        UIView.transition(with: view, duration: 0.3, options: .transitionCrossDissolve) { [self] in
+            self.splashView.alpha = 0
+            destinationVC.view.alpha = 1
+        } completion: { _ in
+            self.splashView.removeFromSuperview()
+            self.destinationViewController = destinationVC
+        }
+    }
+
+    func updateKnownSources() {
         AppManager.shared.updateKnownSources { result in
-            switch result
-            {
+            switch result {
             case .failure(let error): print("[ALTLog] Failed to update known sources:", error)
             case .success((_, let blockedSources)):
                 DatabaseManager.shared.persistentContainer.performBackgroundTask { context in
                     let blockedSourceIDs = Set(blockedSources.lazy.map { $0.identifier })
                     let blockedSourceURLs = Set(blockedSources.lazy.compactMap { $0.sourceURL })
-                    
-                    let predicate = NSPredicate(format: "%K IN %@ OR %K IN %@",
-                                                #keyPath(Source.identifier), blockedSourceIDs,
-                                                #keyPath(Source.sourceURL), blockedSourceURLs)
-                    
-                    let sourceErrors = Source.all(satisfying: predicate, in: context).map { (source) in
-                        let blockedSource = blockedSources.first { $0.identifier == source.identifier }
-                        return SourceError.blocked(source, bundleIDs: blockedSource?.bundleIDs, existingSource: source)
+                    let predicate = NSPredicate(format: "%K IN %@ OR %K IN %@", #keyPath(Source.identifier), blockedSourceIDs, #keyPath(Source.sourceURL), blockedSourceURLs)
+                    let sourceErrors = Source.all(satisfying: predicate, in: context).map { source in
+                        let blocked = blockedSources.first { $0.identifier == source.identifier }
+                        return SourceError.blocked(source, bundleIDs: blocked?.bundleIDs, existingSource: source)
                     }
-                    
                     guard !sourceErrors.isEmpty else { return }
-                                        
                     Task {
-                        for error in sourceErrors
-                        {
+                        for error in sourceErrors {
                             let title = String(format: NSLocalizedString("“%@” Blocked", comment: ""), error.$source.name)
                             let message = [error.localizedDescription, error.recoverySuggestion].compactMap { $0 }.joined(separator: "\n\n")
-                            
                             await self.presentAlert(title: title, message: message)
                         }
                     }
@@ -385,3 +281,142 @@ private extension LaunchViewController
         }
     }
 }
+
+// MARK: - SplashView
+final class SplashView: UIView {
+    let iconView = UIImageView()
+    let titleLabel = UILabel()
+
+    init(frame: CGRect, appName: String) {
+        super.init(frame: frame)
+        backgroundColor = .systemBackground
+        setupIcon()
+        setupTitle(appName: appName)
+    }
+
+    required init?(coder: NSCoder) { fatalError() }
+
+    private func setupIcon() {
+        let container = UIView()
+        container.translatesAutoresizingMaskIntoConstraints = false
+        container.layer.shadowColor = UIColor.black.cgColor
+        container.layer.shadowOpacity = 0.25
+        container.layer.shadowOffset = CGSize(width: 0, height: 4)
+        container.layer.shadowRadius = 8
+        addSubview(container)
+
+        iconView.image = UIImage(named: "AppIcon") ?? UIImage(named: "AppIcon60x60") ?? UIImage(systemName: "app.fill")
+        iconView.contentMode = .scaleAspectFit
+        iconView.translatesAutoresizingMaskIntoConstraints = false
+        iconView.layer.cornerRadius = 24
+        iconView.clipsToBounds = true
+        container.addSubview(iconView)
+
+        NSLayoutConstraint.activate([
+            container.centerXAnchor.constraint(equalTo: centerXAnchor),
+            container.centerYAnchor.constraint(equalTo: centerYAnchor, constant: -20),
+            container.widthAnchor.constraint(equalToConstant: 120),
+            container.heightAnchor.constraint(equalToConstant: 120),
+            iconView.topAnchor.constraint(equalTo: container.topAnchor),
+            iconView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+            iconView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+            iconView.trailingAnchor.constraint(equalTo: container.trailingAnchor)
+        ])
+    }
+
+    private func setupTitle(appName: String) {
+        titleLabel.text = appName
+        titleLabel.font = .systemFont(ofSize: 24, weight: .bold)
+        titleLabel.textColor = .label
+        titleLabel.textAlignment = .center
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(titleLabel)
+        NSLayoutConstraint.activate([
+            titleLabel.topAnchor.constraint(equalTo: iconView.bottomAnchor, constant: 12),
+            titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor)
+        ])
+    }
+}
+
+// MARK: - PairingFileManager
+final class PairingFileManager {
+    static let shared = PairingFileManager()
+    func fetchPairingFile(presentingVC: UIViewController) -> String? {
+        let fm = FileManager.default
+        let filename = pairingFileName
+        let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
+        if fm.fileExists(atPath: documentsPath.path),
+           let contents = try? String(contentsOf: documentsPath), !contents.isEmpty {
+            return contents
+        }
+        if let url = Bundle.main.url(forResource: "ALTPairingFile", withExtension: "mobiledevicepairing"),
+           fm.fileExists(atPath: url.path),
+           let data = fm.contents(atPath: url.path),
+           let contents = String(data: data, encoding: .utf8),
+           !contents.isEmpty, !UserDefaults.standard.isPairingReset { return contents }
+        if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String,
+           !plistString.isEmpty, !plistString.contains("insert pairing file here"), !UserDefaults.standard.isPairingReset { return plistString }
+
+        presentPairingFileAlert(on: presentingVC)
+        return nil
+    }
+
+    private func presentPairingFileAlert(on vc: UIViewController) {
+        let alert = UIAlertController(title: "Pairing File", message: "Select the pairing file or select \"Help\" for help.", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Help", style: .default) { _ in
+            if let url = URL(string: "https://docs.sidestore.io/docs/advanced/pairing-file") { UIApplication.shared.open(url) }
+            sleep(2); exit(0)
+        })
+        alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in
+            var types = UTType.types(tag: "plist", tagClass: .filenameExtension, conformingTo: nil)
+            types.append(contentsOf: UTType.types(tag: "mobiledevicepairing", tagClass: .filenameExtension, conformingTo: .data))
+            types.append(.xml)
+            let picker = UIDocumentPickerViewController(forOpeningContentTypes: types)
+            picker.delegate = vc as? UIDocumentPickerDelegate
+            picker.shouldShowFileExtensions = true
+            vc.present(picker, animated: true)
+            UserDefaults.standard.isPairingReset = false
+        })
+        vc.present(alert, animated: true)
+    }
+}
+
+// MARK: - SideJITManager
+final class SideJITManager {
+    static let shared = SideJITManager()
+    func checkAndPromptIfNeeded(presentingVC: UIViewController) {
+        guard #available(iOS 17, *), !UserDefaults.standard.sidejitenable else { return }
+        DispatchQueue.global().async {
+            self.isSideJITServerDetected { result in
+                DispatchQueue.main.async {
+                    switch result {
+                    case .success():
+                        let alert = UIAlertController(title: "SideJITServer Detected", message: "Would you like to enable SideJITServer", preferredStyle: .alert)
+                        alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in UserDefaults.standard.sidejitenable = true })
+                        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+                        presentingVC.present(alert, animated: true)
+                    case .failure(_): print("Cannot find sideJITServer")
+                    }
+                }
+            }
+        }
+    }
+
+    func askForNetwork() {
+        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
+        let SJSURL = address.isEmpty ? "http://sidejitserver._http._tcp.local:8080" : address
+        URLSession.shared.dataTask(with: URL(string: "\(SJSURL)/re/")!) { data, resp, err in
+            print("data: \(String(describing: data)), response: \(String(describing: resp)), error: \(String(describing: err))")
+        }.resume()
+    }
+
+    func isSideJITServerDetected(completion: @escaping (Result<Void, Error>) -> Void) {
+        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
+        let SJSURL = address.isEmpty ? "http://sidejitserver._http._tcp.local:8080" : address
+        guard let url = URL(string: SJSURL) else { return }
+        URLSession.shared.dataTask(with: url) { _, _, error in
+            if let error = error { completion(.failure(error)); return }
+            completion(.success(()))
+        }.resume()
+    }
+}

AltStore/Managing Apps/AppManager.swift

@@ -1519,6 +1519,24 @@ private extension AppManager
         patchAppOperation.addDependency(deactivateAppsOperation)
         
 
+        let modifyAppExBundleIdOperation = RSTAsyncBlockOperation { operation in
+            if !context.useMainProfile {
+                operation.finish()
+                return
+            }
+            
+            if let app = context.app, let profile = context.provisioningProfiles?[app.bundleIdentifier] {
+                var appexBundleIds: [String: String] = [:]
+                for appex in app.appExtensions {
+                    appexBundleIds[appex.bundleIdentifier] = appex.bundleIdentifier.replacingOccurrences(of: app.bundleIdentifier, with: profile.bundleIdentifier)
+                }
+                context.appexBundleIds = appexBundleIds
+            }
+            operation.finish()
+            
+        }
+        modifyAppExBundleIdOperation.addDependency(fetchProvisioningProfilesOperation)
+        
         /* Resign */
         let resignAppOperation = ResignAppOperation(context: context)
         resignAppOperation.resultHandler = { (result) in
@@ -1533,6 +1551,7 @@ private extension AppManager
             }
         }
         resignAppOperation.addDependency(patchAppOperation)
+        resignAppOperation.addDependency(modifyAppExBundleIdOperation)
         progress.addChild(resignAppOperation.progress, withPendingUnitCount: 20)
         
         
@@ -1586,6 +1605,7 @@ private extension AppManager
             patchAppOperation,
             refreshAnisetteDataOperation,
             fetchProvisioningProfilesOperation,
+            modifyAppExBundleIdOperation,
             resignAppOperation,
             sendAppOperation,
             installOperation
@@ -1665,8 +1685,8 @@ private extension AppManager
         
         let context = AppOperationContext(bundleIdentifier: app.bundleIdentifier, authenticatedContext: group.context)
         context.app = ALTApplication(fileURL: app.fileURL)
-        
-       // Since this doesn't involve modifying app bundle which will cause re-install, this is safe  in refresh path 
+        context.useMainProfile = app.useMainProfile
+       // Since this doesn't involve modifying app bundle which will cause re-install, this is safe  in refresh path
        //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)

AltStore/My Apps/MyAppsViewController.swift

@@ -166,9 +166,11 @@ class MyAppsViewController: UICollectionViewController, PeekPopPreviewing
     @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)
+        // added isMinimuxerStatusCheckEnabled to forcefully ignore minimuxer status if status check is disabled in settings
+        guard !UserDefaults.standard.isMinimuxerStatusCheckEnabled || minimuxer.ready() else {
+            ToastView(error: (OperationError.noWiFi as NSError).withLocalizedTitle("No Wi-Fi or VPN!")).show(in: self)
             return false
         }
         return true
@@ -235,7 +237,8 @@ private extension MyAppsViewController
             cell.layoutMargins.right = self.view.layoutMargins.right
             
             cell.tintColor = app.tintColor ?? .altPrimary
-            cell.versionDescriptionTextView.text = latestSupportedVersion.localizedDescription
+            cell.versionDescriptionTextView.maximumNumberOfLines = 2
+            cell.versionDescriptionTextView.text = latestSupportedVersion.localizedDescription ?? "nil"
             
             cell.bannerView.iconImageView.image = nil
             cell.bannerView.iconImageView.isIndicatingActivity = true
@@ -281,12 +284,9 @@ private extension MyAppsViewController
                 cell.mode = .collapsed
             }
             
-            cell.versionDescriptionTextView.moreButton.addTarget(self, action: #selector(MyAppsViewController.toggleUpdateCellMode(_:)), for: .primaryActionTriggered)
-            
+            cell.versionDescriptionTextView.toggleButton.addTarget(self, action: #selector(MyAppsViewController.toggleUpdateCellMode(_:)), for: .primaryActionTriggered)
+
             cell.setNeedsLayout()
-            
-            // Below lines are necessary to avoid "more" button layout issues.
-            cell.versionDescriptionTextView.setNeedsLayout()
             cell.layoutIfNeeded()
         }
         dataSource.prefetchHandler = { (installedApp, indexPath, completionHandler) in
@@ -724,22 +724,29 @@ private extension MyAppsViewController
         
         let cell = self.collectionView.cellForItem(at: indexPath) as? UpdateCollectionViewCell
         
+        // Toggle the state
         if self.expandedAppUpdates.contains(installedApp.bundleIdentifier)
         {
             self.expandedAppUpdates.remove(installedApp.bundleIdentifier)
+            // Set collapsed mode on the cell
             cell?.mode = .collapsed
         }
         else
         {
             self.expandedAppUpdates.insert(installedApp.bundleIdentifier)
+            // Set expanded mode on the cell
             cell?.mode = .expanded
         }
         
+        // Clear cached size so it's recalculated
         self.cachedUpdateSizes[installedApp.bundleIdentifier] = nil
         
-        self.collectionView.performBatchUpdates({
-            self.collectionView.collectionViewLayout.invalidateLayout()
-        }, completion: nil)
+        // Animate the change smoothly with a duration
+        UIView.animate(withDuration: 0.25) {
+            self.collectionView.performBatchUpdates({
+                self.collectionView.collectionViewLayout.invalidateLayout()
+            }, completion: nil)
+        }
     }
     
     @IBAction func refreshApp(_ sender: UIButton)
@@ -1480,15 +1487,6 @@ private extension MyAppsViewController
             guard minimuxerStatus else { return }
         }
         
-        if #available(iOS 17, *), !sidejitenabled {
-            let error = OperationError.tooNewError as NSError
-            let localizedError = error.withLocalizedTitle("No iOS 17 On Device JIT!")
-            
-            ToastView(error: localizedError, opensLog: true).show(in: self)
-            AppManager.shared.log(error, operation: .enableJIT, app: installedApp)
-            return
-        }
-        
         AppManager.shared.enableJIT(for: installedApp) { result in
             DispatchQueue.main.async {
                 switch result {

AltStore/My Apps/UpdateCollectionViewCell.swift

@@ -21,12 +21,19 @@ extension UpdateCollectionViewCell
 {
     var mode: Mode = .expanded {
         didSet {
-            self.update()
+            switch self.mode {
+            case .collapsed:
+                self.versionDescriptionTextView.isCollapsed = true
+            case .expanded:
+                self.versionDescriptionTextView.isCollapsed = false
+            }
+            self.setNeedsLayout()
         }
     }
     
     @IBOutlet var bannerView: AppBannerView!
-    @IBOutlet var versionDescriptionTextView: CollapsingTextView!
+//    @IBOutlet var versionDescriptionTextView: CollapsingTextView!
+    @IBOutlet var versionDescriptionTextView: CollapsingMarkdownView!
     
     @IBOutlet private var blurView: UIVisualEffectView!
     
@@ -85,16 +92,16 @@ extension UpdateCollectionViewCell
         }
     }
     
-    override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize
-    {
-        // Ensure cell is laid out so it will report correct size.
-        self.versionDescriptionTextView.setNeedsLayout()
-        self.versionDescriptionTextView.layoutIfNeeded()
-        
-        let size = super.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: horizontalFittingPriority, verticalFittingPriority: verticalFittingPriority)
-        
-        return size
-    }
+//    override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize
+//    {
+//        // Ensure cell is laid out so it will report correct size.
+//        self.versionDescriptionTextView.setNeedsLayout()
+//        self.versionDescriptionTextView.layoutIfNeeded()
+//        
+//        let size = super.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: horizontalFittingPriority, verticalFittingPriority: verticalFittingPriority)
+//        
+//        return size
+//    }
 }
 
 private extension UpdateCollectionViewCell

AltStore/My Apps/UpdateCollectionViewCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="UpdateCell" id="Kqf-Pv-ca3" customClass="UpdateCollectionViewCell" customModule="AltStore" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="UpdateCell" id="Kqf-Pv-ca3" customClass="UpdateCollectionViewCell" customModule="SideStore" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="125"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
@@ -30,7 +30,7 @@
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="uYl-PH-DuP">
                                             <rect key="frame" x="0.0" y="0.0" width="343" height="125"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nop-pL-Icx" customClass="AppBannerView" customModule="AltStore" customModuleProvider="target">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nop-pL-Icx" customClass="AppBannerView" customModule="SideStore" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="343" height="50"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="88" id="EPP-7O-1Ad"/>
@@ -39,7 +39,7 @@
                                                 <stackView opaque="NO" contentMode="scaleToFill" alignment="firstBaseline" translatesAutoresizingMaskIntoConstraints="NO" id="RSR-5W-7tt" userLabel="Release Notes">
                                                     <rect key="frame" x="0.0" y="50" width="343" height="75"/>
                                                     <subviews>
-                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Version Notes" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNs-2O-k3V" customClass="CollapsingTextView" customModule="AltStore" customModuleProvider="target">
+                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Version Notes" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNs-2O-k3V" customClass="CollapsingMarkdownView" customModule="SideStore" customModuleProvider="target">
                                                             <rect key="frame" x="15" y="0.0" width="313" height="26"/>
                                                             <color key="textColor" systemColor="secondaryLabelColor"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -91,7 +91,7 @@
             <color red="1" green="1" blue="1" alpha="0.30000001192092896" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

AltStore/Operations/BackgroundRefreshAppsOperation.swift

@@ -99,7 +99,10 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result<Inst
             self.finish(.failure(RefreshError(.noInstalledApps)))
             return
         }
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+
+        if UserDefaults.standard.enableEMPforWireguard {
+            start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        }
         target_minimuxer_address()
         let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
         do {

AltStore/Operations/Errors/OperationError.swift

@@ -201,7 +201,7 @@ struct OperationError: ALTLocalizedError {
         case .unknownResult: return NSLocalizedString("The operation returned an unknown result.", 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 .unknownUDID: return NSLocalizedString("SideStore could not determine this device's UDID. Please replace your pairing using iloader.", 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 .noSources: return NSLocalizedString("There are no SideStore sources.", comment: "")
@@ -220,16 +220,16 @@ struct OperationError: ALTLocalizedError {
         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 .noWiFi: return NSLocalizedString("You do not appear to be connected to Wi-Fi and/or LocalDevVPN!\nSideStore cannot install or refresh applications without Wi-Fi and LocalDevVPN. If both are connected, replace your pairing with iloader.", comment: "")
+        case .tooNewError: return NSLocalizedString("iOS 17.0-17.3.1 changed how JIT is enabled so SideStore cannot enable JIT without SideJITServer on these versions, sorry for any inconvenience.", comment: "")
+        case .unableToConnectSideJIT: return NSLocalizedString("Unable to connect to SideJITServer. Please check that you are on the same Wi-Fi of and your Firewall has been set correctly on your server.", comment: "")
+        case .unableToRespondSideJITDevice: return NSLocalizedString("SideJITServer is unable to connect to your iDevice. Please make sure you have paired your iDevice by running 'SideJITServer -y', or try refreshing SideJITServer from Settings.", comment: "")
+        case .wrongSideJITIP: return NSLocalizedString("Incorrect SideJITServer IP. Please make sure that you are on the same Wi-Fi 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 while getting anisette data from a V1 server: %@. Try using another anisette server.", comment: "")
+        case .provisioningError: return NSLocalizedString("An error occurred while provisioning: %@ %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
+        case .anisetteV3Error: return NSLocalizedString("An error occurred while 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 the cache: %@", comment: "")
         case .SideJITIssue: return NSLocalizedString("An error occurred while using SideJIT: %@", comment: "")
             
         case .refreshAppFailed:
@@ -260,7 +260,7 @@ struct OperationError: ALTLocalizedError {
     var recoverySuggestion: String? {
         switch self.code
         {
-        case .noWiFi: return NSLocalizedString("Make sure the VPN is toggled on and you are connected to any WiFi network!", comment: "")
+        case .noWiFi: return NSLocalizedString("Make sure LocalDevVPN is connected and that you are connected to any Wi-Fi network!", comment: "")
         case .serverNotFound: return NSLocalizedString("Make sure you're on the same Wi-Fi network as a computer running AltServer, or try connecting this device to your computer via USB.", comment: "")
         case .maximumAppIDLimitReached:
             let baseMessage = NSLocalizedString("Delete sideloaded apps to free up App ID slots.", comment: "")
@@ -308,9 +308,9 @@ 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 LocalDevVPN is enabled and you're connected to Wi-Fi. This could mean an invalid pairing.", 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: "")
+            return NSLocalizedString("Invalid pairing file. Your pairing file either didn't have a UDID, or it wasn't a valid plist. Please use iloader to replace it.", comment: "")
             
         case .CreateDebug:
             return self.createService(name: "debug")
@@ -338,7 +338,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. Ensure Wi-Fi and LocalDevVPN are connected. If they both are, replace your pairing using iloader.", comment: "")
         case .InstallApp(let message):
             return NSLocalizedString("Unable to install the app: \(message.toString())", comment: "")
         case .UninstallApp:
@@ -350,6 +350,38 @@ extension MinimuxerError: LocalizedError {
             return NSLocalizedString("Unable to manage profiles on the device", comment: "")
         case .ProfileRemove:
             return NSLocalizedString("Unable to manage profiles on the device", comment: "")
+        case .CreateLockdown:
+            return NSLocalizedString("Unable to connect to lockdown", comment: "")
+        case .CreateCoreDevice:
+            return NSLocalizedString("Unable to connect to core device proxy", comment: "")
+        case .CreateSoftwareTunnel:
+            return NSLocalizedString("Unable to create software tunnel", comment: "")
+        case .CreateRemoteServer:
+            return NSLocalizedString("Unable to connect to remote server", comment: "")
+        case .CreateProcessControl:
+            return NSLocalizedString("Unable to connect to process control", comment: "")
+        case .GetLockdownValue:
+            return NSLocalizedString("Unable to get value from lockdown", comment: "")
+        case .Connect:
+            return NSLocalizedString("Unable to connect to TCP port", comment: "")
+        case .Close:
+            return NSLocalizedString("Unable to close TCP port", comment: "")
+        case .XpcHandshake:
+            return NSLocalizedString("Unable to get services from XPC", comment: "")
+        case .NoService:
+            return NSLocalizedString("Device did not contain service", comment: "")
+        case .InvalidProductVersion:
+            return NSLocalizedString("Service version was in an unexpected format", comment: "")
+        case .CreateFolder:
+            return NSLocalizedString("Unable to create DDI folder", comment: "")
+        case .DownloadImage:
+            return NSLocalizedString("Unable to download DDI", comment: "")
+        case .ImageLookup:
+            return NSLocalizedString("Unable to lookup DDI images", comment: "")
+        case .ImageRead:
+            return NSLocalizedString("Unable to read images to memory", comment: "")
+        case .Mount:
+            return NSLocalizedString("Mount failed", comment: "")
         }
     }
     

AltStore/Operations/FetchProvisioningProfilesOperation.swift

@@ -67,20 +67,22 @@ class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProvisioni
                 
                 let dispatchGroup = DispatchGroup()
                 
-                for appExtension in app.appExtensions
-                {
-                    dispatchGroup.enter()
-                    
-                    self.prepareProvisioningProfile(for: appExtension, parentApp: app, team: team, session: session) { (result) in
-                        switch result
-                        {
-                        case .failure(let e): error = e
-                        case .success(let profile): profiles[appExtension.bundleIdentifier] = profile
+                if !self.context.useMainProfile {
+                    for appExtension in app.appExtensions
+                    {
+                        dispatchGroup.enter()
+                        
+                        self.prepareProvisioningProfile(for: appExtension, parentApp: app, team: team, session: session) { (result) in
+                            switch result
+                            {
+                            case .failure(let e): error = e
+                            case .success(let profile): profiles[appExtension.bundleIdentifier] = profile
+                            }
+                            
+                            dispatchGroup.leave()
+                            
+                            self.progress.completedUnitCount += 1
                         }
-                        
-                        dispatchGroup.leave()
-                        
-                        self.progress.completedUnitCount += 1
                     }
                 }
                 
@@ -360,13 +362,6 @@ extension FetchProvisioningProfilesOperation
     }
 }
 
-class FetchProvisioningProfilesRefreshOperation: FetchProvisioningProfilesOperation, @unchecked Sendable {
-    override init(context: AppOperationContext)
-    {
-        super.init(context: context)
-    }
-}
-
 class FetchProvisioningProfilesInstallOperation: FetchProvisioningProfilesOperation, @unchecked Sendable{
     override init(context: AppOperationContext)
     {
@@ -613,3 +608,14 @@ class FetchProvisioningProfilesInstallOperation: FetchProvisioningProfilesOperat
         }
     }
 }
+
+// <TEST> : users were reporting that refresh (though seemed like it refreshed the app becomes no longer available)
+//          possibly, this is caused since refesh was not updating appFeatures and AppGroups in the new profile? not sure.
+//          for now we are reverting by keeping same operation that happens during fetch in install path to see if it fixes issue #893
+// class FetchProvisioningProfilesRefreshOperation: FetchProvisioningProfilesOperation, @unchecked Sendable {
+class FetchProvisioningProfilesRefreshOperation: FetchProvisioningProfilesInstallOperation, @unchecked Sendable {
+    override init(context: AppOperationContext)
+    {
+        super.init(context: context)
+    }
+}

AltStore/Operations/FetchSourceOperation.swift

@@ -11,6 +11,7 @@ import CoreData
 
 import AltStoreCore
 import Roxas
+import SemanticVersion
 
 @objc(FetchSourceOperation)
 final class FetchSourceOperation: ResultOperation<Source>
@@ -246,9 +247,20 @@ private extension FetchSourceOperation
             #endif
         }
         
-        if let previousSourceID = self.$source.identifier
+        let incomingSourceID = source.identifier
+        if let previousSourceID = self.$source.identifier,
+           incomingSourceID != previousSourceID
         {
-            guard source.identifier == previousSourceID else { throw SourceError.changedID(source.identifier, previousID: previousSourceID, source: source) }
+//            if let version = BuildInfo().marketing_version,
+//               SemanticVersion(version)! <= SemanticVersion("0.6.1")!
+//            {
+//                // delete the source, so that incoming will be saved.
+//                self.source?.managedObjectContext?.delete(self.source!)
+//            }
+//            else
+//            {
+                throw SourceError.changedID(source.identifier, previousID: self.$source.identifier ?? "nil", source: source)
+//            }
         }
     }
     

AltStore/Operations/InstallAppOperation.swift

@@ -72,6 +72,8 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             }
             
             installedApp.update(resignedApp: resignedApp, certificateSerialNumber: certificate.serialNumber, storeBuildVersion: storeBuildVersion)
+            installedApp.useMainProfile = self.context.useMainProfile
+
             installedApp.needsResign = false
             
             if let team = DatabaseManager.shared.activeTeam(in: backgroundContext)

AltStore/Operations/OperationContexts.swift

@@ -66,6 +66,8 @@ class AppOperationContext
     
     var app: ALTApplication?
     var provisioningProfiles: [String: ALTProvisioningProfile]?
+    var appexBundleIds: [String: String]?
+    var useMainProfile = false
     
     var isFinished = false
     

AltStore/Operations/RemoveAppExtensionsOperation.swift

@@ -136,7 +136,11 @@ final class RemoveAppExtensionsOperation: ResultOperation<Void>
         alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
             self.finish(.failure(OperationError.cancelled))
         }))
-        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions (Use Main Profile)", comment: ""), style: .default) { (action) in
+            self.context.useMainProfile = true
+            self.finish(.success(()))
+        })
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions (Register App ID for Each Extension)", comment: ""), style: .default) { (action) in
             self.finish(.success(()))
         })
         alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in

AltStore/Operations/ResignAppOperation.swift

@@ -55,7 +55,7 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
         let prepareAppProgress = Progress.discreteProgress(totalUnitCount: 2)
         self.progress.addChild(prepareAppProgress, withPendingUnitCount: 3)
         
-        let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles) { (result) in
+        let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles, appexBundleIds: context.appexBundleIds ?? [:]) { (result) in
             guard let appBundleURL = self.process(result) else { return }
             
             // Resign app bundle
@@ -107,7 +107,7 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
 
 private extension ResignAppOperation
 {
-    func prepareAppBundle(for app: ALTApplication, profiles: [String: ALTProvisioningProfile], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
+    func prepareAppBundle(for app: ALTApplication, profiles: [String: ALTProvisioningProfile], appexBundleIds: [String: String], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
     {
         let progress = Progress.discreteProgress(totalUnitCount: 1)
         
@@ -119,10 +119,15 @@ private extension ResignAppOperation
         func prepare(_ bundle: Bundle, additionalInfoDictionaryValues: [String: Any] = [:]) throws
         {
             guard let identifier = bundle.bundleIdentifier else { throw ALTError(.missingAppBundle) }
-            guard let profile = profiles[identifier] else { throw ALTError(.missingProvisioningProfile) }
+            guard let profile = context.useMainProfile ? profiles.values.first : profiles[identifier] else { throw ALTError(.missingProvisioningProfile) }
             guard var infoDictionary = bundle.completeInfoDictionary else { throw ALTError(.missingInfoPlist) }
             
-            infoDictionary[kCFBundleIdentifierKey as String] = profile.bundleIdentifier
+            if let forcedBundleIdentifier = appexBundleIds[identifier] {
+                infoDictionary[kCFBundleIdentifierKey as String] = forcedBundleIdentifier
+            } else {
+                infoDictionary[kCFBundleIdentifierKey as String] = profile.bundleIdentifier
+            }
+
             infoDictionary[Bundle.Info.altBundleID] = identifier
             infoDictionary[Bundle.Info.devicePairingString] = "<insert pairing file here>"
             infoDictionary.removeValue(forKey: "DTXcode")

AltStore/SceneDelegate.swift

@@ -40,8 +40,10 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate
         guard DatabaseManager.shared.isStarted else { return }
         
         AppManager.shared.update()
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
-        
+        if UserDefaults.standard.enableEMPforWireguard {
+            start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        }
+
         PatreonAPI.shared.refreshPatreonAccount()
     }
 
@@ -56,7 +58,9 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate
         // Make sure to update AppDelegate.applicationDidEnterBackground() as well.
 
         // TODO: @mahee96: find if we need to stop em_proxy as in altstore?
-        // stop_em_proxy()
+        if UserDefaults.standard.enableEMPforWireguard {
+            stop_em_proxy()
+        }
 
         guard let oneMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date()) else { return }
         
@@ -142,8 +146,61 @@ private extension SceneDelegate
                     NotificationCenter.default.post(name: AppDelegate.addSourceDeepLinkNotification, object: nil, userInfo: [AppDelegate.addSourceDeepLinkURLKey: sourceURL])
                 }
                 
+            case "pairing":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                Logger.main.info("queryItems \(queryItems)")
+                guard let callbackTemplate = queryItems["urlname"]?.removingPercentEncoding else { return }
+                
+                DispatchQueue.main.async {
+                    exportPairingFile(callbackTemplate)
+                }
+                
+            case "certificate":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                guard let callbackTemplate = queryItems["callback_template"]?.removingPercentEncoding else { return }
+                
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: AppDelegate.exportCertificateNotification, object: nil, userInfo: [AppDelegate.exportCertificateCallbackTemplateKey: callbackTemplate])
+                }
+
             default: break
             }
         }
     }
 }
+
+
+func exportPairingFile(_ urlname: String) {
+    if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+       let window = windowScene.windows.first, let viewcontroller = window.rootViewController {
+        let fm = FileManager.default
+        let documentsPath = fm.documentsDirectory.appendingPathComponent("ALTPairingFile.mobiledevicepairing")
+        
+        
+        guard let data = try? Data(contentsOf: documentsPath) else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to find Pairing File!", comment: ""), detailText: nil)
+            toastView.show(in: viewcontroller)
+            return
+        }
+        
+        let base64encodedCert = data.base64EncodedString()
+        var allowedQueryParamAndKey = NSCharacterSet.urlQueryAllowed
+        allowedQueryParamAndKey.remove(charactersIn: ";/?:@&=+$, ")
+        guard let encodedCert = base64encodedCert.addingPercentEncoding(withAllowedCharacters: allowedQueryParamAndKey) else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to encode pairingFile!", comment: ""), detailText: nil)
+            toastView.show(in: viewcontroller)
+            return
+        }
+        
+        var urlStr = "\(urlname)://pairingFile?data=$(BASE64_PAIRING)"
+        let finished = urlStr.replacingOccurrences(of: "$(BASE64_PAIRING)", with: encodedCert, options: .literal, range: nil)
+        
+        print(finished)
+        guard let callbackUrl = URL(string: finished) else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to initialize callback URL!", comment: ""), detailText: nil)
+            toastView.show(in: viewcontroller)
+            return
+        }
+        UIApplication.shared.open(callbackUrl)
+    }
+}

AltStore/Settings/Error Log/ErrorLogViewController.swift

@@ -380,13 +380,8 @@ private extension ErrorLogViewController
     
     func searchFAQ(for loggedError: LoggedError)
     {
-        let baseURL = URL(string: "https://faq.altstore.io/getting-started/error-codes")!
-        var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)!
-        
-        let query = [loggedError.domain, "\(loggedError.error.displayCode)"].joined(separator: "+")
-        components.queryItems = [URLQueryItem(name: "q", value: query)]
-        
-        let safariViewController = SFSafariViewController(url: components.url ?? baseURL)
+        let staticURL = URL(string: "https://docs.sidestore.io/docs/troubleshooting/error-codes")!
+        let safariViewController = SFSafariViewController(url: staticURL)
         safariViewController.preferredControlTintColor = .altPrimary
         self.present(safariViewController, animated: true)
     }

AltStore/Settings/PatreonComponents.swift

@@ -82,7 +82,7 @@ final class AboutPatreonHeaderView: UICollectionReusableView
             imageView.layer.cornerRadius = imageView.bounds.midY
         }
         
-        for button in [self.supportButton, self.accountButton].compactMap({$0})
+        for button in [self.supportButton, self.accountButton, self.twitterButton, self.instagramButton].compactMap({$0})
         {
             button.clipsToBounds = true
             button.layer.cornerRadius = 16

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="23504" 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="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="5Rz-4h-jJ8">
     <device id="retina6_3" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -22,7 +22,7 @@
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <stackView key="tableFooterView" opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" alignment="center" spacing="15" id="48g-cT-stR">
-                            <rect key="frame" x="0.0" y="1986.3333377838135" width="402" height="125"/>
+                            <rect key="frame" x="0.0" y="2352.3333301544189" width="402" height="125"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="900" text="Follow SideStore for updates" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XFa-MY-7cV">
@@ -104,7 +104,7 @@
                             <tableViewSection headerTitle="" id="flW-d4-bco">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="7lu-Yk-87t" rowHeight="51" style="IBUITableViewCellStyleDefault" id="DzJ-TL-jvR" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="22.333333969116211" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="17.666666030883789" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DzJ-TL-jvR" id="XnZ-bO-peM">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -134,7 +134,7 @@
                             <tableViewSection headerTitle="" id="CAI-9J-8fR">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="xvY-lN-Toz" detailTextLabel="CnN-M1-AYK" rowHeight="51" style="IBUITableViewCellStyleValue1" id="kCH-yh-bMk" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="113.66666793823242" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="104.33333206176758" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="kCH-yh-bMk" id="MQ9-Qn-bWg">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -166,7 +166,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="rAc-lQ-B1k" detailTextLabel="0uP-Cd-tNX" rowHeight="51" style="IBUITableViewCellStyleValue1" id="q11-3k-oIm" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="164.66666793823242" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="155.33333206176758" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="q11-3k-oIm" id="QCY-a8-Lhx">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -198,7 +198,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Sge-cM-Fw9" detailTextLabel="434-MW-Den" rowHeight="51" style="IBUITableViewCellStyleValue1" id="vuc-eX-w3f" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="215.66666793823242" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="206.33333206176758" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vuc-eX-w3f" id="wpD-YB-mrf">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -234,7 +234,7 @@
                             <tableViewSection id="YHi-gR-wed">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="R1C-Gr-xD4" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="302.66666793823242" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="293.33333206176758" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="R1C-Gr-xD4" id="Ojx-7f-z7E">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -275,7 +275,7 @@
                             <tableViewSection id="RpS-Hn-sQU">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="9dU-Hl-NiJ" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="389.66666793823242" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="380.33333206176758" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9dU-Hl-NiJ" id="w62-f1-Ody">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -316,7 +316,7 @@
                             <tableViewSection headerTitle="" id="2dM-lg-cRI">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="Rra-U5-kCd" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="481.00000190734863" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="466.99999809265137" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Rra-U5-kCd" id="8gV-kx-lGe">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -329,7 +329,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DPu-zD-Als">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleIsBackgroundRefreshEnabled:" destination="aMk-Xp-UL8" eventType="valueChanged" id="gK5-Wr-8Hh"/>
                                                     </connections>
@@ -350,8 +350,43 @@
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="7rt-MT-kFH" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="517.99999809265137" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7rt-MT-kFH" id="mZL-UA-6V0">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable EMP for wireguard" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZH7-ZA-Epf" userLabel="Enable EMP for wireguard">
+                                                    <rect key="frame" x="30" y="15.333333333333334" width="209" height="20.333333333333329"/>
+                                                    <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="8qE-hE-Ujn">
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
+                                                    <connections>
+                                                        <action selector="toggleEnableEMPforWireguard:" destination="aMk-Xp-UL8" eventType="valueChanged" id="B0Q-Jb-fox"/>
+                                                    </connections>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="8qE-hE-Ujn" secondAttribute="trailing" id="KgO-N1-7Bw"/>
+                                                <constraint firstItem="ZH7-ZA-Epf" firstAttribute="leading" secondItem="mZL-UA-6V0" secondAttribute="leadingMargin" id="MBP-lj-8f5"/>
+                                                <constraint firstItem="ZH7-ZA-Epf" firstAttribute="centerY" secondItem="mZL-UA-6V0" secondAttribute="centerY" id="Pht-1f-5K3"/>
+                                                <constraint firstItem="8qE-hE-Ujn" firstAttribute="centerY" secondItem="mZL-UA-6V0" secondAttribute="centerY" id="vhM-Am-Jpo"/>
+                                            </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>
+                                        </userDefinedRuntimeAttributes>
+                                    </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="GYp-O0-pse" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="532.00000190734863" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="568.99999809265137" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="GYp-O0-pse" id="vDG-ZV-xRS">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -364,7 +399,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iQA-wm-5ag">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleNoIdleTimeoutEnabled:" destination="aMk-Xp-UL8" eventType="valueChanged" id="WSl-Jc-g5J"/>
                                                     </connections>
@@ -386,7 +421,7 @@
                                         </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="583.00000190734863" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="619.99999809265137" width="402" 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="402" height="51"/>
@@ -414,7 +449,7 @@
                                         </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="634.00000190734863" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="670.99999809265137" width="402" 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="402" height="51"/>
@@ -427,7 +462,7 @@
                                                     <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="323" y="10" width="51" height="31"/>
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleDisableAppLimit:" destination="aMk-Xp-UL8" eventType="valueChanged" id="zYc-B2-JPg"/>
                                                     </connections>
@@ -453,7 +488,7 @@
                             <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="725.33333587646484" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="757.66666412353516" width="402" 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="402" height="51"/>
@@ -494,19 +529,19 @@
                             <tableViewSection id="1fc-f1-ALD">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="7Ek-Ls-QVO" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="812.33333587646484" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="844.66666412353516" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7Ek-Ls-QVO" id="KjD-M3-oNg">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="View Error Log" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vH6-7i-tCE">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="View Error Log" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vH6-7i-tCE">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="119" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="AeT-qF-bwB">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AeT-qF-bwB">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -531,13 +566,13 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="hFh-X1-ZAi" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="863.33333587646484" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="895.66666412353516" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hFh-X1-ZAi" id="nCs-Ro-A6t">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Clear Cache…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4e-Mz-DlL">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clear Cache…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4e-Mz-DlL">
                                                     <rect key="frame" x="29.999999999999993" y="15.333333333333334" width="114.33333333333331" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -563,28 +598,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="954.66666984558105" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="982.33333015441895" width="402" 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="402" 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.333333333333334" width="86" height="20.333333333333329"/>
                                                     <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">
-                                                    <rect key="frame" x="217" y="15.333333333333336" width="155" height="20.333333333333329"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="lx9-35-OSk">
+                                                    <rect key="frame" x="217" y="15.333333333333334" width="155" height="20.333333333333329"/>
                                                     <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.33333333333333" height="20.333333333333332"/>
                                                             <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" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
                                                             <rect key="frame" x="139.33333333333331" y="-1" width="15.666666666666657" height="22.333333333333332"/>
                                                             <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                         </imageView>
@@ -608,7 +643,7 @@
                                         </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="1005.6666698455811" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1033.3333301544189" width="402" 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="402" height="51"/>
@@ -653,7 +688,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="1056.6666698455811" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1084.3333301544189" width="402" 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="402" height="51"/>
@@ -698,7 +733,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="1071.6666698455811" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1135.3333301544189" width="402" 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="402" height="51"/>
@@ -739,19 +774,19 @@
                             <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="1163.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1221.9999961853027" width="402" 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="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Feedback" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMI-Aj-nQF">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Send Feedback" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMI-Aj-nQF">
                                                     <rect key="frame" x="29.999999999999993" y="15.333333333333334" width="125.33333333333331" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="Jyy-x0-Owj">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jyy-x0-Owj">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -773,19 +808,19 @@
                                         </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="1214.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1272.9999961853027" width="402" 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="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="View Refresh Attempts" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sni-07-q0M">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="View Refresh Attempts" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sni-07-q0M">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="187.66666666666666" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="4d3-me-Hqc">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4d3-me-Hqc">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -810,19 +845,19 @@
                                         </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="1265.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1323.9999961853027" width="402" 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="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideJITServer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46q-DB-5nc">
+                                                <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="29.999999999999993" y="15.333333333333334" width="115.33333333333331" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="wvD-eZ-nQI">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wvD-eZ-nQI">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -844,19 +879,19 @@
                                         </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="1316.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1374.9999961853027" width="402" 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="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reset Pairing File" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ysS-9s-dXm">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Reset Pairing File" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ysS-9s-dXm">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="140" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="r09-mH-pOD">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r09-mH-pOD">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -878,19 +913,19 @@
                                         </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="1367.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1425.9999961853027" width="402" 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="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Anisette Servers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eds-Dj-36y">
+                                                <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.333333333333334" width="135.66666666666666" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="0dh-yd-7i9">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0dh-yd-7i9">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -912,20 +947,20 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="XW5-Zc-nXH" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1418.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1476.9999961853027" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="XW5-Zc-nXH" id="AtM-bL-8pS">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Beta Updates" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2px-HD-0UT">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Enable Beta Updates" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2px-HD-0UT">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="169" height="20.333333333333329"/>
                                                     <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="e32-w4-5fk">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e32-w4-5fk">
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleEnableBetaUpdates:" destination="aMk-Xp-UL8" eventType="valueChanged" id="uxG-df-7GK"/>
                                                     </connections>
@@ -947,19 +982,19 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="qbY-8c-LYT" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1469.0000038146973" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1527.9999961853027" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qbY-8c-LYT" id="NxK-qB-w7Q">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Beta Updates Track" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5J9-vR-vhX" userLabel="Beta Track Label">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Beta Updates Track" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5J9-vR-vhX" userLabel="Beta Track Label">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="159.66666666666666" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" showsMenuAsPrimaryAction="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" changesSelectionAsPrimaryAction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oct-iT-NwP" userLabel="Beta Track Drop Down Button">
+                                                <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" showsMenuAsPrimaryAction="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" changesSelectionAsPrimaryAction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oct-iT-NwP" userLabel="Beta Track Drop Down Button">
                                                     <rect key="frame" x="301.66666666666669" y="8.3333333333333321" width="70.333333333333314" height="34.333333333333343"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="new-width-constraint"/>
@@ -985,23 +1020,139 @@
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
+                            <tableViewSection id="ZhW-yK-wdJ">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="qjD-UK-myl" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1614.9999961853027" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qjD-UK-myl" id="bcu-KT-Xee">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Import Account..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jts-UA-M8d">
+                                                    <rect key="frame" x="30" y="15.333333333333334" width="143" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="jts-UA-M8d" firstAttribute="centerY" secondItem="bcu-KT-Xee" secondAttribute="centerY" id="9Wq-8a-v4s"/>
+                                                <constraint firstItem="jts-UA-M8d" firstAttribute="leading" secondItem="bcu-KT-Xee" secondAttribute="leadingMargin" id="rTG-U2-MOH"/>
+                                            </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="1"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
+                                        </userDefinedRuntimeAttributes>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="dNh-fp-vBs" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1665.9999961853027" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dNh-fp-vBs" id="Meb-tV-6br">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Export Account..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uHg-iq-d36">
+                                                    <rect key="frame" x="30" y="15.333333333333334" width="142.33333333333334" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="uHg-iq-d36" firstAttribute="leading" secondItem="Meb-tV-6br" secondAttribute="leadingMargin" id="P8L-Yt-APv"/>
+                                                <constraint firstItem="uHg-iq-d36" firstAttribute="centerY" secondItem="Meb-tV-6br" secondAttribute="centerY" id="bkY-rp-t3t"/>
+                                            </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="Y6h-Bo-yec" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1716.9999961853027" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Y6h-Bo-yec" id="4Jf-I6-v7z">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Import Signing Certificate..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rv6-S1-2gw">
+                                                    <rect key="frame" x="30.000000000000014" y="15.333333333333334" width="227.33333333333337" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="rv6-S1-2gw" firstAttribute="leading" secondItem="4Jf-I6-v7z" secondAttribute="leadingMargin" id="7zH-bg-kLS"/>
+                                                <constraint firstItem="rv6-S1-2gw" firstAttribute="centerY" secondItem="4Jf-I6-v7z" secondAttribute="centerY" id="Yls-DF-HHr"/>
+                                            </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="dLk-d6-X4T" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1767.9999961853027" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dLk-d6-X4T" id="Okl-3m-rde">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Export Signing Certificate..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WPe-mj-W7t">
+                                                    <rect key="frame" x="29.999999999999986" y="15.333333333333334" width="226.66666666666663" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="WPe-mj-W7t" firstAttribute="leading" secondItem="Okl-3m-rde" secondAttribute="leadingMargin" id="9g7-9Z-ZZQ"/>
+                                                <constraint firstItem="WPe-mj-W7t" firstAttribute="centerY" secondItem="Okl-3m-rde" secondAttribute="centerY" id="RiS-WT-srl"/>
+                                            </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"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
+                                        </userDefinedRuntimeAttributes>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
                             <tableViewSection headerTitle="" id="lLQ-K0-XSb">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="daQ-mk-yqC" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1560.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1854.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="daQ-mk-yqC" id="ZkW-ZR-twy">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disable Response Caching" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jFh-36-AP2">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Disable Response Caching" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jFh-36-AP2">
                                                     <rect key="frame" x="30.000000000000014" y="15.333333333333334" width="215.33333333333337" height="20.333333333333329"/>
                                                     <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="AAh-cu-qw8">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AAh-cu-qw8">
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleDisableResponseCaching:" destination="aMk-Xp-UL8" eventType="valueChanged" id="lCm-qi-piH"/>
                                                     </connections>
@@ -1023,20 +1174,20 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="hRP-jU-2hd" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1611.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1905.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hRP-jU-2hd" id="JhE-O4-pRg">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Export Resigned Apps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d5F-bf-6kB">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Export Resigned Apps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d5F-bf-6kB">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="180" height="20.333333333333329"/>
                                                     <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="GYP-qn-wzh">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GYP-qn-wzh">
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleResignedAppExport:" destination="aMk-Xp-UL8" eventType="valueChanged" id="Z1k-xh-sjD"/>
                                                     </connections>
@@ -1058,20 +1209,20 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="JoN-Aj-XtZ" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1662.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1956.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JoN-Aj-XtZ" id="v8Q-VQ-Q1h">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Verbose Ops Logging" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7bz-tI-tLY">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Enable Verbose Ops Logging" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7bz-tI-tLY">
                                                     <rect key="frame" x="29.999999999999986" y="15.333333333333334" width="232.66666666666663" height="20.333333333333329"/>
                                                     <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="Q5X-Mo-KpE">
-                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Q5X-Mo-KpE">
+                                                    <rect key="frame" x="311" y="11.666666666666664" width="63" height="28"/>
                                                     <connections>
                                                         <action selector="toggleVerboseOperationsLogging:" destination="aMk-Xp-UL8" eventType="valueChanged" id="n9N-Gt-OY2"/>
                                                     </connections>
@@ -1093,13 +1244,13 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="QOO-bO-4M5" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1713.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2007.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QOO-bO-4M5" id="VTT-z5-C89">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Export Database..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ho1-To-wve" userLabel="Export Database">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Export Database..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ho1-To-wve" userLabel="Export Database">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="151.66666666666666" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1121,13 +1272,13 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="ToB-H7-2lR" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1764.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2058.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ToB-H7-2lR" id="Acf-xV-Isn">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delete Database..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CcF-9x-Eu8" userLabel="Delete Database Label">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Delete Database..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CcF-9x-Eu8" userLabel="Delete Database Label">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="150.33333333333334" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1149,19 +1300,19 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="xtI-eU-LFb" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1815.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2109.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="xtI-eU-LFb" id="bc9-41-6mE">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Operations Logging Control" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LW3-gm-lj5">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Operations Logging Control" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LW3-gm-lj5">
                                                     <rect key="frame" x="30.000000000000014" y="15.333333333333334" width="224.33333333333337" height="20.333333333333329"/>
                                                     <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" translatesAutoresizingMaskIntoConstraints="NO" id="zl4-ti-HTW">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zl4-ti-HTW">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -1183,19 +1334,19 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="pvu-IV-Poa" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1866.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2160.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pvu-IV-Poa" id="zck-an-8cK">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recreate Database on Next Start" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZRk-8S-kBQ" userLabel="Recreate Database Label">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Recreate Database on Next Start" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZRk-8S-kBQ" userLabel="Recreate Database Label">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="265.33333333333331" height="20.333333333333329"/>
                                                     <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="uGv-Lb-Ita" userLabel="Recreate DB switch">
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uGv-Lb-Ita" userLabel="Recreate DB switch">
                                                     <rect key="frame" x="323" y="10" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="toggleRecreateDatabaseSwitch:" destination="aMk-Xp-UL8" eventType="valueChanged" id="vlf-Iz-kWr"/>
@@ -1218,19 +1369,19 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="9By-QW-Jw9" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1917.3333377838135" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2211.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9By-QW-Jw9" id="Dzq-gE-zyT">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Minimuxer Console Logging" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jW6-pb-xdP">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Minimuxer Console Logging" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jW6-pb-xdP">
                                                     <rect key="frame" x="30.000000000000014" y="15.333333333333334" width="225.33333333333337" height="20.333333333333329"/>
                                                     <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="os8-7F-rSm" userLabel="Minimuxer logging Switch">
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="os8-7F-rSm" userLabel="Minimuxer logging Switch">
                                                     <rect key="frame" x="323" y="10" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="toggleMinimuxerConsoleLogging:" destination="aMk-Xp-UL8" eventType="valueChanged" id="d0C-kx-aFV"/>
@@ -1246,6 +1397,41 @@
                                         </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>
+                                        </userDefinedRuntimeAttributes>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="LzP-Qb-bmC" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="2262.6666622161865" width="402" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LzP-Qb-bmC" id="3rE-h0-8kb">
+                                            <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Minimuxer Status Check" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3BY-c1-QEV" userLabel="Minimuxer Status Check">
+                                                    <rect key="frame" x="30.000000000000014" y="15.333333333333334" width="198.33333333333337" height="20.333333333333329"/>
+                                                    <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" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="AB6-Ok-Faf" userLabel="Minimuxer Check Switch">
+                                                    <rect key="frame" x="323" y="10" width="51" height="31"/>
+                                                    <connections>
+                                                        <action selector="toggleMinimuxerStatusCheck:" destination="aMk-Xp-UL8" eventType="valueChanged" id="Kwh-Km-aLj"/>
+                                                    </connections>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="AB6-Ok-Faf" secondAttribute="trailing" id="EtH-X0-plP"/>
+                                                <constraint firstItem="AB6-Ok-Faf" firstAttribute="centerY" secondItem="3rE-h0-8kb" secondAttribute="centerY" id="Tc3-56-q7s"/>
+                                                <constraint firstItem="3BY-c1-QEV" firstAttribute="centerY" secondItem="3rE-h0-8kb" secondAttribute="centerY" id="kIV-xS-Ava"/>
+                                                <constraint firstItem="3BY-c1-QEV" firstAttribute="leading" secondItem="3rE-h0-8kb" secondAttribute="leadingMargin" id="pJS-6V-6vh"/>
+                                            </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"/>
@@ -1271,6 +1457,7 @@
                         <outlet property="betaUpdatesSwitch" destination="e32-w4-5fk" id="kdn-ZR-cNU"/>
                         <outlet property="disableAppLimitSwitch" destination="1aa-og-ZXD" id="oVL-Md-yZ8"/>
                         <outlet property="disableResponseCachingSwitch" destination="AAh-cu-qw8" id="aVT-Md-yZ8"/>
+                        <outlet property="enableEMPforWireguard" destination="8qE-hE-Ujn" id="VC2-PV-cea"/>
                         <outlet property="exportResignedAppsSwitch" destination="GYP-qn-wzh" id="aVL-Md-yZ8"/>
                         <outlet property="githubButton" destination="oqj-4S-I9l" id="sxB-LE-gA2"/>
                         <outlet property="mastodonButton" destination="B8Q-e7-beR" id="Kbe-Og-rsg"/>
@@ -1295,8 +1482,9 @@
                     <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="62" width="402" height="96"/>
+                        <rect key="frame" x="0.0" y="124" width="402" height="106"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" name="SettingsBackground"/>
                         <textAttributes key="titleTextAttributes">
@@ -1328,14 +1516,14 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="8Xf-RE-QJx" customClass="RefreshAttemptTableViewCell">
-                                <rect key="frame" x="0.0" y="50" width="402" height="64.666664123535156"/>
+                                <rect key="frame" x="0.0" y="50" width="402" height="73.333335876464844"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8Xf-RE-QJx" id="r3G-oh-AyQ">
-                                    <rect key="frame" x="0.0" y="0.0" width="402" height="64.666664123535156"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="402" height="73.333335876464844"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="SN9-pA-GDU">
-                                            <rect key="frame" x="20" y="10.999999999999996" width="362" height="42.666666666666657"/>
+                                            <rect key="frame" x="20" y="15.000000000000004" width="362" height="43.333333333333343"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="SqJ-wP-gO1">
                                                     <rect key="frame" x="0.0" y="0.0" width="362" height="20.333333333333332"/>
@@ -1355,7 +1543,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Could not connect to SideStore." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7L1-AA-2yo">
-                                                    <rect key="frame" x="0.0" y="24.333333333333336" width="362" height="18.333333333333336"/>
+                                                    <rect key="frame" x="0.0" y="24.333333333333336" width="362" height="19"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -1396,7 +1584,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="106" width="402" height="685"/>
+                                <rect key="frame" x="0.0" y="178" width="402" height="579"/>
                                 <edgeInsets key="layoutMargins" top="8" left="30" bottom="8" right="30"/>
                                 <string key="text">Jay Freeman (ldid) 
 Copyright (C) 2007-2012 Jay Freeman (saurik)
@@ -1595,17 +1783,17 @@ Settings by i cons from the Noun Project</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="HAm-mA-O78" customClass="ErrorLogTableViewCell">
-                                <rect key="frame" x="20" y="55.333332061767578" width="362" height="107.33333587646484"/>
+                                <rect key="frame" x="20" y="55.333332061767578" width="362" height="116"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="HAm-mA-O78" id="swa-et-rfA">
-                                    <rect key="frame" x="0.0" y="0.0" width="362" height="107.33333587646484"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="362" height="116"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="mtw-JM-T70">
-                                            <rect key="frame" x="20" y="11" width="322" height="85.333333333333329"/>
+                                            <rect key="frame" x="16" y="15" width="330" height="86"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="bjU-TX-4lm" userLabel="Compact">
-                                                    <rect key="frame" x="0.0" y="0.0" width="322" height="43.333333333333336"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="330" height="44"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sDZ-ZN-NT1" customClass="AppIconImageView" customModule="SideStore" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
@@ -1615,10 +1803,10 @@ Settings by i cons from the Noun Project</string>
                                                             </constraints>
                                                         </imageView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="82d-v0-RCp">
-                                                            <rect key="frame" x="51" y="0.0" width="271" height="39"/>
+                                                            <rect key="frame" x="51" y="0.0" width="279" height="39"/>
                                                             <subviews>
                                                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Q2j-Tc-bp2">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="271" height="18"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="279" height="18"/>
                                                                     <subviews>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Success" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Na7-uj-XYZ">
                                                                             <rect key="frame" x="0.0" y="0.0" width="60" height="18"/>
@@ -1627,7 +1815,7 @@ Settings by i cons from the Noun Project</string>
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SGf-pP-RL0">
-                                                                            <rect key="frame" x="240.66666666666669" y="0.0" width="30.333333333333314" height="18"/>
+                                                                            <rect key="frame" x="248.66666666666671" y="0.0" width="30.333333333333343" height="18"/>
                                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                             <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                             <nil key="highlightedColor"/>
@@ -1635,7 +1823,7 @@ Settings by i cons from the Noun Project</string>
                                                                     </subviews>
                                                                 </stackView>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Error Code" textAlignment="natural" lineBreakMode="headTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="R5a-wv-xHd">
-                                                                    <rect key="frame" x="0.0" y="22" width="271" height="17"/>
+                                                                    <rect key="frame" x="0.0" y="22" width="279" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                     <nil key="highlightedColor"/>
@@ -1645,7 +1833,7 @@ Settings by i cons from the Noun Project</string>
                                                     </subviews>
                                                 </stackView>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Error Description" textAlignment="natural" selectable="NO" layoutManager="textKit1" translatesAutoresizingMaskIntoConstraints="NO" id="1df-ri-hKN" customClass="CollapsingTextView" customModule="SideStore" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="51.333333333333343" width="322" height="34"/>
+                                                    <rect key="frame" x="0.0" y="52" width="330" height="34"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES"/>
                                                         <bool key="isElement" value="NO"/>
@@ -1657,7 +1845,7 @@ Settings by i cons from the Noun Project</string>
                                             </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">
-                                            <rect key="frame" x="0.0" y="0.0" width="362" height="107.33333333333333"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="362" height="116"/>
                                             <accessibility key="accessibilityConfiguration">
                                                 <bool key="isElement" value="NO"/>
                                             </accessibility>
@@ -1728,11 +1916,11 @@ Settings by i cons from the Noun Project</string>
             <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="402" height="864"/>
+                        <rect key="frame" x="0.0" y="0.0" width="402" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ctd-NB-4ov">
-                                <rect key="frame" x="0.0" y="0.0" width="402" height="864"/>
+                                <rect key="frame" x="0.0" y="0.0" width="402" height="812"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <color key="textColor" systemColor="labelColor"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
@@ -1770,8 +1958,9 @@ Settings by i cons from the Noun Project</string>
                 <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="402" height="56"/>
+                        <rect key="frame" x="0.0" y="16" width="402" height="54"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>

AltStore/Settings/SettingsViewController.swift

@@ -16,6 +16,8 @@ import IntentsUI
 import SemanticVersion
 
 import AltStoreCore
+import CAltSign
+import UniformTypeIdentifiers
 
 extension SettingsViewController
 {
@@ -30,6 +32,7 @@ extension SettingsViewController
         case techyThings
         case credits
         case advancedSettings
+        case signing
         // diagnostics section, will be enabled on release builds only on swipe down with 3 fingers 3 times
         case diagnostics
         // case macDirtyCow
@@ -79,6 +82,13 @@ extension SettingsViewController
         case betaTrack
 //        case hiddenSettings
     }
+    
+    fileprivate enum SigningSettingsRow: Int, CaseIterable {
+        case importAccount
+        case exportAccount
+        case importCert
+        case exportCert
+    }
 
     fileprivate enum DiagnosticsRow: Int, CaseIterable
     {
@@ -111,6 +121,7 @@ final class SettingsViewController: UITableViewController
     @IBOutlet private var accountTypeLabel: UILabel!
     
     @IBOutlet private var backgroundRefreshSwitch: UISwitch!
+    @IBOutlet private var enableEMPforWireguard: UISwitch!
     @IBOutlet private var noIdleTimeoutSwitch: UISwitch!
     @IBOutlet private var disableAppLimitSwitch: UISwitch!
     @IBOutlet private var betaUpdatesSwitch: UISwitch!
@@ -143,6 +154,7 @@ final class SettingsViewController: UITableViewController
         
         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)
+        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.openExportCertificateConfirm(_:)), name: AppDelegate.exportCertificateNotification, object: nil)
     }
     
     
@@ -191,6 +203,16 @@ final class SettingsViewController: UITableViewController
     {
         super.viewDidLoad()
         
+        // --- iOS 26 fix ---
+        if #available(iOS 26.0, *) {
+            let appearance = UINavigationBarAppearance()
+//            appearance.configureWithOpaqueBackground()  // or .defaultBackground if you want blur
+//            appearance.backgroundColor = UIColor(named: "SettingsBackground")
+            appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
+            appearance.largeTitleTextAttributes = [.foregroundColor: UIColor.white]
+            navigationController?.navigationBar.standardAppearance = appearance
+            navigationController?.navigationBar.scrollEdgeAppearance = appearance       // required for iOS 26, maybe enforce it in storyboard?
+        } 
         let nib = UINib(nibName: "SettingsHeaderFooterView", bundle: nil)
         self.prototypeHeaderFooterView = nib.instantiate(withOwner: nil, options: nil)[0] as? SettingsHeaderFooterView
         
@@ -236,6 +258,120 @@ final class SettingsViewController: UITableViewController
         }
         
         configureReleaseChannelButton()
+        #if !targetEnvironment(simulator)
+        detectAndImportAccountFile()
+        #endif
+    }
+    
+    func importAccountAtFile(_ file: URL, remove: Bool = false) {
+        _ = file.startAccessingSecurityScopedResource()
+        defer { file.stopAccessingSecurityScopedResource() }
+        guard let accountD = try? Data(contentsOf: file) else {
+            let toastView = ToastView(text: NSLocalizedString("Could not read data from file!", comment: ""), detailText: "\(file)")
+            return toastView.show(in: self)
+        }
+        guard let account = try? Foundation.JSONDecoder().decode(ImportedAccount.self, from: accountD) else {
+            let toastView = ToastView(text: NSLocalizedString("Could not parse data from file!", comment: ""), detailText: "\(file)")
+            return toastView.show(in: self)
+        }
+        print("We want to import this account probably: \(account)")
+        if remove {
+            try? FileManager.default.removeItem(at: file)
+        }
+        Keychain.shared.appleIDEmailAddress = account.email
+        Keychain.shared.appleIDPassword = account.password
+        Keychain.shared.adiPb = account.adiPB
+        Keychain.shared.identifier = account.local_user
+        signIn()
+        update()
+        if let altCert = ALTCertificate(p12Data: account.cert, password: account.certpass) {
+            Keychain.shared.signingCertificate = altCert.encryptedP12Data(withPassword: "")!
+            Keychain.shared.signingCertificatePassword = account.certpass
+            let toastView = ToastView(text: NSLocalizedString("Successfully imported '\(account.email)'!", comment: ""), detailText: "SideStore should be fully operational!")
+            return toastView.show(in: self)
+        } else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to import account certificate!", comment: ""), detailText: "Failed to create ALTCertificate. Check if the password is correct. Still imported account/adi.pb details!")
+            return toastView.show(in: self)
+        }
+    }
+    
+    func detectAndImportAccountFile() {
+        let accountFileURL = FileManager.default.documentsDirectory.appendingPathComponent("Account.sideconf")
+        #if !DEBUG
+        importAccountAtFile(accountFileURL, remove: true)
+        #else
+        importAccountAtFile(accountFileURL)
+        #endif
+    }
+    
+    func exportAccount(_ certpass: String) -> ImportedAccount? {
+        guard let email = Keychain.shared.appleIDEmailAddress,
+              let password = Keychain.shared.appleIDPassword,
+              let cert = Keychain.shared.signingCertificate,
+              let identifier = Keychain.shared.identifier,
+              let adiPB = Keychain.shared.adiPb else {
+            #if DEBUG
+            print(Keychain.shared.appleIDEmailAddress ?? "Empty email")
+            print(Keychain.shared.appleIDPassword ?? "Empty password")
+            print(Keychain.shared.signingCertificate ?? "Empty cert")
+            print(Keychain.shared.identifier ?? "Empty identifier")
+            print(Keychain.shared.adiPb ?? "Empty adiPb")
+            #endif
+            return nil
+        }
+        return ImportedAccount(email: email, password: password, cert: cert, certpass: certpass, local_user: identifier, adiPB: adiPB)
+    }
+    
+    func showExportAccount() {
+        
+        Task {
+            guard let password = await withUnsafeContinuation({ (c: UnsafeContinuation<String?,Never>) in
+                let alertController = UIAlertController(title: NSLocalizedString("Please enter the password for the certificate.", comment: ""), message: nil, preferredStyle: .alert)
+                
+                alertController.addTextField { (textField) in
+                    textField.autocorrectionType = .no
+                    textField.autocapitalizationType = .none
+                }
+                
+                let submitAction = UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default) { (action) in
+                    let textField = alertController.textFields?.first
+                    
+                    let code = textField?.text ?? ""
+                    c.resume(returning: code)
+                }
+                alertController.addAction(submitAction)
+                alertController.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel) { (action) in
+                    c.resume(returning: nil)
+                })
+                
+                self.present(alertController, animated: true)
+            }) else {
+                return
+            }
+            
+            guard let account = exportAccount(password) else {
+                let toastView = ToastView(text: NSLocalizedString("Failed to export account!", comment: ""), detailText: "Account not found.")
+                return toastView.show(in: self)
+            }
+            
+            guard let accountData = try? Foundation.JSONEncoder().encode(account) else {
+                let toastView = ToastView(text: NSLocalizedString("Failed to export account data!", comment: ""), detailText: "Account malformed.")
+                toastView.show(in: self)
+                return
+
+            }
+            
+            let accountTmpPath = FileManager.default.temporaryDirectory.appendingPathComponent("\(account.email).sideconf")
+            do {
+                try accountData.write(to: accountTmpPath)
+            } catch {
+                let toastView = ToastView(text: NSLocalizedString("Failed to export account!", comment: ""), detailText: error.localizedDescription)
+                toastView.show(in: self)
+                return
+            }
+            let exportVC = UIDocumentPickerViewController(forExporting: [accountTmpPath], asCopy: false)
+            self.present(exportVC, animated: true)
+        }
     }
     
     override func viewWillAppear(_ animated: Bool)
@@ -263,50 +399,6 @@ final class SettingsViewController: UITableViewController
 
 }
 
-private class BuildInfo{
-    private static let MARKETING_VERSION_TAG        = "CFBundleShortVersionString"
-    private static let CURRENT_PROJECT_VERSION_TAG  = kCFBundleVersionKey as String
-    
-    private static let XCODE_VERSION_TAG  = "DTXcode"
-    private static let XCODE_REVISION_TAG = "DTXcodeBuild"
-
-    let bundle: Bundle
-    
-    public init(){
-        bundle = Bundle.main
-    }
-    
-    enum BundleError: Swift.Error {
-        case invalidURL
-    }
-
-    public init(url: URL) throws {
-        guard let bundle = Bundle(url: url) else {
-            throw BundleError.invalidURL
-        }
-        self.bundle = bundle
-    }
-
-    public lazy var project_version: String? = {
-        let version  = bundle.object(forInfoDictionaryKey: Self.CURRENT_PROJECT_VERSION_TAG) as? String
-        return version
-    }()
-
-    public lazy var marketing_version: String? = {
-        let version  = bundle.object(forInfoDictionaryKey: Self.MARKETING_VERSION_TAG) as? String
-        return version
-    }()
-
-    public lazy var xcode: String? = {
-        let xcode  = bundle.object(forInfoDictionaryKey: Self.XCODE_VERSION_TAG) as? String
-        return xcode
-    }()
-
-    public lazy var xcode_revision: String? = {
-        let revision  = bundle.object(forInfoDictionaryKey: Self.XCODE_REVISION_TAG) as? String
-        return revision
-    }()
-}
 
 private extension SettingsViewController
 {
@@ -379,6 +471,7 @@ private extension SettingsViewController
         
         // AppRefreshRow
         self.backgroundRefreshSwitch.isOn = UserDefaults.standard.isBackgroundRefreshEnabled
+        self.enableEMPforWireguard.isOn = UserDefaults.standard.enableEMPforWireguard
         self.noIdleTimeoutSwitch.isOn = UserDefaults.standard.isIdleTimeoutDisableEnabled
         self.disableAppLimitSwitch.isOn = UserDefaults.standard.isAppLimitDisabled
 
@@ -477,7 +570,19 @@ private extension SettingsViewController
             
         case .advancedSettings:
             settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("ADVANCED SETTINGS", comment: "")
+            
+        case .signing:
+            // FIXME: Why "Enable Background Refresh ..." appear here if secondaryLabel is not specified???
+            if isHeader
+            {
+                settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("SIGNING", comment: "")
+            }
+            else
+            {
+                settingsHeaderFooterView.secondaryLabel.text = NSLocalizedString("", comment: "")
+            }
 
+            
         case .diagnostics:
             settingsHeaderFooterView.primaryLabel.text = NSLocalizedString("DIAGNOSTICS", comment: "")
             
@@ -597,6 +702,11 @@ private extension SettingsViewController
         UserDefaults.standard.isMinimuxerConsoleLoggingEnabled = sender.isOn
     }
 
+    @IBAction func toggleMinimuxerStatusCheck(_ sender: UISwitch) {
+        // update it in database
+        UserDefaults.standard.isMinimuxerStatusCheckEnabled = sender.isOn
+    }
+
     @IBAction func toggleRecreateDatabaseSwitch(_ sender: UISwitch) {
         // Update the setting in UserDefaults
         UserDefaults.standard.recreateDatabaseOnNextStart = sender.isOn
@@ -639,6 +749,11 @@ private extension SettingsViewController
         UserDefaults.standard.isBackgroundRefreshEnabled = sender.isOn
     }
     
+    @IBAction func toggleEnableEMPforWireguard(_ sender: UISwitch)
+    {
+        UserDefaults.standard.enableEMPforWireguard = sender.isOn
+    }
+    
     @IBAction func toggleNoIdleTimeoutEnabled(_ sender: UISwitch)
     {
         UserDefaults.standard.isIdleTimeoutDisableEnabled = sender.isOn
@@ -800,6 +915,48 @@ private extension SettingsViewController
             self.performSegue(withIdentifier: "showErrorLog", sender: nil)
         }
     }
+    
+    @objc func openExportCertificateConfirm(_ notification: Notification)
+    {
+        func export()
+        {
+            guard let template = notification.userInfo?[AppDelegate.exportCertificateCallbackTemplateKey] as? String,
+                  template.contains("$(BASE64_CERT)") else {
+                let toastView = ToastView(text: NSLocalizedString("No $(BASE64_CERT) placeholder found", comment: ""), detailText: nil)
+                toastView.show(in: self)
+                return
+            }
+            guard let data = Keychain.shared.signingCertificate,
+            let password = Keychain.shared.signingCertificatePassword else {
+                let toastView = ToastView(text: NSLocalizedString("Failed to find certificate or password", comment: ""), detailText: nil)
+                toastView.show(in: self)
+                return
+            }
+            let base64encodedCert = data.base64EncodedString()
+            var allowedQueryParamAndKey = NSCharacterSet.urlQueryAllowed
+            allowedQueryParamAndKey.remove(charactersIn: ";/?:@&=+$, ")
+            guard let encodedCert = base64encodedCert.addingPercentEncoding(withAllowedCharacters: allowedQueryParamAndKey) else {
+                let toastView = ToastView(text: NSLocalizedString("Failed to encode certificate!", comment: ""), detailText: nil)
+                toastView.show(in: self)
+                return
+            }
+            var urlStr = template.replacingOccurrences(of: "$(BASE64_CERT)", with: encodedCert, options: .literal, range: nil)
+            urlStr = urlStr.replacingOccurrences(of: "$(PASSWORD)", with: password, options: .literal, range: nil)
+            
+            print(urlStr)
+            guard let callbackUrl = URL(string: urlStr) else {
+                let toastView = ToastView(text: NSLocalizedString("Failed to initialize callback URL!", comment: ""), detailText: nil)
+                toastView.show(in: self)
+                return
+            }
+            UIApplication.shared.open(callbackUrl)
+        }
+        
+        let alertController = UIAlertController(title: NSLocalizedString("Export Certificate", comment: ""), message: NSLocalizedString("Do you want to export your certificate to an external app? That app will be able to sign apps using your certificate.", comment: ""), preferredStyle: .alert)
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Export", comment: ""), style: .default) { _ in export() })
+        alertController.addAction(.cancel)
+        self.present(alertController, animated: true, completion: nil)
+    }
 }
 
 extension SettingsViewController
@@ -871,7 +1028,7 @@ extension SettingsViewController
         case _ where isSectionHidden(section): return nil
         case .signIn where self.activeTeam != nil: return nil
         case .account where self.activeTeam == nil: return nil
-        case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .advancedSettings, .diagnostics /* ,.macDirtyCow */:
+        case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .advancedSettings, .signing ,.diagnostics /* ,.macDirtyCow */:
             let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView
             self.prepare(headerView, for: section, isHeader: true)
             return headerView
@@ -888,7 +1045,7 @@ extension SettingsViewController
         case _ where isSectionHidden(section): return nil
         case .signIn where self.activeTeam != nil: return nil
         // case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
-        case .signIn, .patreon, .display, .appRefresh, .techyThings:
+        case .signIn, .patreon, .display, .appRefresh, .techyThings, .signing:
             let footerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "HeaderFooterView") as! SettingsHeaderFooterView
             self.prepare(footerView, for: section, isHeader: false)
             return footerView
@@ -906,7 +1063,7 @@ extension SettingsViewController
         case .signIn where self.activeTeam != nil: return 1.0
         case .account where self.activeTeam == nil: return 1.0
         // case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .macDirtyCow, .advanced:
-        case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .advancedSettings, .diagnostics:
+        case .signIn, .account, .patreon, .display, .appRefresh, .techyThings, .credits, .advancedSettings, .signing, .diagnostics:
             let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: true)
             return height
             
@@ -923,7 +1080,7 @@ extension SettingsViewController
         case .signIn where self.activeTeam != nil: return 1.0
         case .account where self.activeTeam == nil: return 1.0            
         // case .signIn, .patreon, .display, .appRefresh, .techyThings, .macDirtyCow:
-        case .signIn, .patreon, .display, .appRefresh, .techyThings, .diagnostics:
+        case .signIn, .patreon, .display, .appRefresh, .techyThings, .signing, .diagnostics:
             let height = self.preferredHeight(for: self.prototypeHeaderFooterView, in: section, isHeader: false)
             return height
             
@@ -993,7 +1150,7 @@ extension SettingsViewController
                 
                 // Option 2: Discord
                 alertController.addAction(UIAlertAction(title: "Discord", style: .default) { _ in
-                    if let discordURL = URL(string: "https://discord.gg/sidestore") {
+                    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)
@@ -1198,7 +1355,162 @@ extension SettingsViewController
             case .refreshAttempts, .betaUpdates, .betaTrack: break
 
             }
-        
+        case .signing:
+            let row = SigningSettingsRow.allCases[indexPath.row]
+            switch row {
+            case .exportAccount: showExportAccount()
+            case .importAccount:
+                Task {
+                    let confUrl = await withUnsafeContinuation { c in
+                        let importVc = UIDocumentPickerViewController(forOpeningContentTypes: [UTType(filenameExtension: "sideconf")!], asCopy: false)
+                        ImportExport.documentPickerHandler = DocumentPickerHandler { url in
+                            c.resume(returning: url)
+                        }
+                        importVc.delegate = ImportExport.documentPickerHandler
+                        
+                        self.present(importVc, animated: true)
+                        
+                    }
+                    guard let confUrl else {
+                        return
+                    }
+                    importAccountAtFile(confUrl)
+                }
+            case .importCert:
+                let importVc = UIDocumentPickerViewController(forOpeningContentTypes: [UTType(filenameExtension: "p12")!], asCopy: false)
+                ImportExport.documentPickerHandler = DocumentPickerHandler { url in
+                    guard let url else {
+                        return
+                    }
+                    importVc.delegate = ImportExport.documentPickerHandler
+                    self.present(importVc, animated: true)
+                    _ = url.startAccessingSecurityScopedResource()
+                    defer { url.stopAccessingSecurityScopedResource() }
+                }
+                Task {
+                    let certUrl = await withUnsafeContinuation { c in
+                        let importVc = UIDocumentPickerViewController(forOpeningContentTypes: [UTType(filenameExtension: "p12")!], asCopy: false)
+                        ImportExport.documentPickerHandler = DocumentPickerHandler { url in
+                            _ = url?.startAccessingSecurityScopedResource()
+                            defer { url?.stopAccessingSecurityScopedResource() }
+                            c.resume(returning: url)
+                        }
+                        importVc.delegate = ImportExport.documentPickerHandler
+
+                        self.present(importVc, animated: true)
+                        
+                    }
+                    guard let certUrl else {
+                        return
+                    }
+                    
+                    let password = await withUnsafeContinuation { (c: UnsafeContinuation<String?,Never>) in
+                        let alertController = UIAlertController(title: NSLocalizedString("Please enter the password for the certificate.", comment: ""), message: nil, preferredStyle: .alert)
+                        
+                        alertController.addTextField { (textField) in
+                            textField.autocorrectionType = .no
+                            textField.autocapitalizationType = .none
+                        }
+                        
+                        let submitAction = UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default) { (action) in
+                            let textField = alertController.textFields?.first
+                            
+                            let code = textField?.text ?? ""
+                            c.resume(returning: code)
+                        }
+                        alertController.addAction(submitAction)
+                        alertController.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel) { (action) in
+                            c.resume(returning: nil)
+                        })
+                        
+                        self.present(alertController, animated: true)
+                    }
+                    
+                    guard let password else {
+                        return
+                    }
+                    _ = certUrl.startAccessingSecurityScopedResource()
+                    defer {
+                        certUrl.stopAccessingSecurityScopedResource()
+                    }
+                    let certData : Data
+                    do {
+                        certData = try Data(contentsOf: certUrl)
+                    } catch {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to import certificate!", comment: ""), detailText: error.localizedDescription)
+                        toastView.show(in: self)
+                        return
+                    }
+                    
+                    guard let altCert = ALTCertificate(p12Data: certData, password: password) else {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to import certificate!", comment: ""), detailText: "Failed to create ALTCertificate. Check if the password is correct.")
+                        toastView.show(in: self)
+                        return
+                    }
+                    
+                    Keychain.shared.signingCertificate = altCert.encryptedP12Data(withPassword: "")!
+                    let toastView = ToastView(text: NSLocalizedString("Certificate imported successfully!", comment: ""), detailText: nil)
+                    toastView.show(in: self)
+                }
+            case .exportCert:
+                Task {
+                    guard let certData = Keychain.shared.signingCertificate else {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to export certificate!", comment: ""), detailText: "Certificate not found.")
+                        toastView.show(in: self)
+                        return
+                    }
+                    
+                    let password = await withUnsafeContinuation { (c: UnsafeContinuation<String?,Never>) in
+                        let alertController = UIAlertController(title: NSLocalizedString("Please enter the password for the certificate.", comment: ""), message: nil, preferredStyle: .alert)
+                        
+                        alertController.addTextField { (textField) in
+                            textField.autocorrectionType = .no
+                            textField.autocapitalizationType = .none
+                        }
+                        
+                        let submitAction = UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default) { (action) in
+                            let textField = alertController.textFields?.first
+                            
+                            let code = textField?.text ?? ""
+                            c.resume(returning: code)
+                        }
+                        alertController.addAction(submitAction)
+                        alertController.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel) { (action) in
+                            c.resume(returning: nil)
+                        })
+                        
+                        self.present(alertController, animated: true)
+                    }
+                    
+                    guard let password else {
+                        return
+                    }
+                    
+                    guard let altCert = ALTCertificate(p12Data: certData, password: nil) else {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to export certificate!", comment: ""), detailText: "Failed to create ALTCertificate. Check if the password is correct.")
+                        toastView.show(in: self)
+                        return
+                    }
+                    
+                    guard let newCertData = altCert.encryptedP12Data(withPassword: password) else {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to export certificate!", comment: ""), detailText: "Failed to encrypt  ALTCertificate.")
+                        toastView.show(in: self)
+                        return
+                    }
+                    
+                    let newCertTmpPath = FileManager.default.temporaryDirectory.appendingPathComponent("SideStoreSigningCertificate.p12")
+                    do {
+                        try newCertData.write(to: newCertTmpPath)
+                    } catch {
+                        let toastView = ToastView(text: NSLocalizedString("Failed to export certificate!", comment: ""), detailText: error.localizedDescription)
+                        toastView.show(in: self)
+                        return
+                    }
+                    let exportVC = UIDocumentPickerViewController(forExporting: [newCertTmpPath], asCopy: false)
+                    self.present(exportVC, animated: true)
+                }
+            }
+            
         case .diagnostics:
             let row = DiagnosticsRow.allCases[indexPath.row]
             switch row {

AltStore/Sources/Sources.storyboard

@@ -20,6 +20,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="xWh-1U-u0q" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="59" width="393" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -248,6 +249,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="HLe-3g-P8I" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="393" height="108"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>

AltStore/Sources/SourcesViewController.swift

@@ -46,6 +46,14 @@ final class SourcesViewController: UICollectionViewController
     {
         super.viewDidLoad()
         
+        // Ensure large titles
+        navigationController?.navigationBar.prefersLargeTitles = true
+        navigationItem.largeTitleDisplayMode = .automatic
+
+        // Set title
+        navigationItem.title = "Sources"
+        navigationController?.navigationBar.layoutMargins.left = 20
+        
         let layout = self.makeLayout()
         self.collectionView.collectionViewLayout = layout
         
@@ -514,27 +522,27 @@ extension SourcesViewController: NSFetchedResultsControllerDelegate
     let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
     context.performAndWait {
         _ = Source.make(name: "OatmealDome's AltStore Source",
-                        identifier: "me.oatmealdome.altstore",
+                        groupID: "me.oatmealdome.altstore",
                         sourceURL: URL(string: "https://altstore.oatmealdome.me")!,
                         context: context)
         
         _ = Source.make(name: "UTM Repository",
-                        identifier: "com.utmapp.repos.UTM",
+                        groupID: "com.utmapp.repos.UTM",
                         sourceURL: URL(string: "https://alt.getutm.app")!,
                         context: context)
         
         _ = Source.make(name: "Flyinghead",
-                        identifier: "com.flyinghead.source",
+                        groupID: "com.flyinghead.source",
                         sourceURL: URL(string: "https://flyinghead.github.io/flycast-builds/altstore.json")!,
                         context: context)
         
         _ = Source.make(name: "Provenance",
-                        identifier: "org.provenance-emu.AltStore",
+                        groupID: "org.provenance-emu.AltStore",
                         sourceURL: URL(string: "https://provenance-emu.com/apps.json")!,
                         context: context)
         
         _ = Source.make(name: "PojavLauncher Repository",
-                        identifier: "dev.crystall1ne.repos.PojavLauncher",
+                        groupID: "dev.crystall1ne.repos.PojavLauncher",
                         sourceURL: URL(string: "http://alt.crystall1ne.dev")!,
                         context: context)
         

AltStore/TabBarController.swift

@@ -36,6 +36,7 @@ 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.exportFiles(_:)), name: AppDelegate.exportCertificateNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.openErrorLog(_:)), name: ToastView.openErrorLogNotification, object: nil)
     }
     
@@ -141,4 +142,9 @@ private extension TabBarController
     {
         self.selectedIndex = Tab.settings.rawValue
     }
+    
+    @objc func exportFiles(_ notification: Notification)
+    {
+        self.selectedIndex = Tab.settings.rawValue
+    }
 }

AltStore/Types/ImportedAccount.swift

@@ -0,0 +1,18 @@
+//
+//  ImportedAccount.swift
+//  AltStore
+//
+//  Created by ny on 9/7/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import Foundation
+
+struct ImportedAccount: Codable {
+    let email: String
+    let password: String
+    let cert: Data
+    let certpass: String
+    let local_user: String
+    let adiPB: String
+}

AltStoreCore/Extensions/UserDefaults+AltStore.swift

@@ -30,12 +30,15 @@ public extension UserDefaults
     @NSManaged var preferredServerID: String?
     
     @NSManaged var isBackgroundRefreshEnabled: Bool
+    @NSManaged var enableEMPforWireguard: Bool
     @NSManaged var isIdleTimeoutDisableEnabled: Bool
     @NSManaged var isAppLimitDisabled: Bool
     @NSManaged var isBetaUpdatesEnabled: Bool
     @NSManaged var isExportResignedAppEnabled: Bool
     @NSManaged var isVerboseOperationsLoggingEnabled: Bool
     @NSManaged var isMinimuxerConsoleLoggingEnabled: Bool
+    @NSManaged var isMinimuxerStatusCheckEnabled: Bool
+
     @NSManaged var recreateDatabaseOnNextStart: Bool
     @NSManaged var isPairingReset: Bool
     @NSManaged var isDebugModeEnabled: Bool
@@ -132,8 +135,10 @@ public extension UserDefaults
             #keyPath(UserDefaults.isDebugModeEnabled): false,
             #keyPath(UserDefaults.isVerboseOperationsLoggingEnabled): false,
             #keyPath(UserDefaults.isMinimuxerConsoleLoggingEnabled): false, // minimuxer logging is disabled by default for console loggin
+            #keyPath(UserDefaults.isMinimuxerStatusCheckEnabled): false, // minimuxer status check is disabled by default to support LocalDevVPN based cellular refresh
             #keyPath(UserDefaults.recreateDatabaseOnNextStart): false, 
             #keyPath(UserDefaults.isBackgroundRefreshEnabled): true,
+            #keyPath(UserDefaults.enableEMPforWireguard): false,
             #keyPath(UserDefaults.isIdleTimeoutDisableEnabled): true,
             #keyPath(UserDefaults.isPairingReset): true,
             #keyPath(UserDefaults.isLegacyDeactivationSupported): isLegacyDeactivationSupported,

AltStoreCore/Model/AltStore.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>AltStore 17.xcdatamodel</string>
+	<string>AltStore 17_1.xcdatamodel</string>
 </dict>
 </plist>

AltStoreCore/Model/AltStore.xcdatamodeld/AltStore 17_1.xcdatamodel/contents

@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D70" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="v17.1">
+    <entity name="Account" representedClassName="Account" syncable="YES">
+        <attribute name="appleID" attributeType="String"/>
+        <attribute name="firstName" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="lastName" attributeType="String"/>
+        <relationship name="teams" toMany="YES" deletionRule="Cascade" destinationEntity="Team" inverseName="account" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppID" representedClassName="AppID" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="features" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="appIDs" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="appBundleID" optional="YES" attributeType="String"/>
+        <attribute name="permission" optional="YES" attributeType="String"/>
+        <attribute name="sourceID" optional="YES" attributeType="String"/>
+        <attribute name="type" attributeType="String"/>
+        <attribute name="usageDescription" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceID"/>
+                <constraint value="appBundleID"/>
+                <constraint value="type"/>
+                <constraint value="permission"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppScreenshot" representedClassName="AppScreenshot" syncable="YES">
+        <attribute name="appBundleID" optional="YES" attributeType="String"/>
+        <attribute name="deviceType" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="height" optional="YES" attributeType="Integer 16" usesScalarValueType="NO"/>
+        <attribute name="imageURL" attributeType="URI"/>
+        <attribute name="sourceID" optional="YES" attributeType="String"/>
+        <attribute name="width" optional="YES" attributeType="Integer 16" usesScalarValueType="NO"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="screenshots" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceID"/>
+                <constraint value="appBundleID"/>
+                <constraint value="imageURL"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppVersion" representedClassName="AppVersion" syncable="YES">
+        <attribute name="appBundleID" optional="YES" attributeType="String"/>
+        <attribute name="buildVersion" optional="YES" attributeType="String"/>
+        <attribute name="channel" optional="YES" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="downloadURL" attributeType="URI"/>
+        <attribute name="localizedDescription" optional="YES" attributeType="String"/>
+        <attribute name="maxOSVersion" optional="YES" attributeType="String"/>
+        <attribute name="minOSVersion" optional="YES" attributeType="String"/>
+        <attribute name="sha256" optional="YES" attributeType="String"/>
+        <attribute name="size" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sourceID" optional="YES" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="versions" inverseEntity="StoreApp"/>
+        <relationship name="latestVersionApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="latestVersion" inverseEntity="StoreApp"/>
+        <relationship name="releaseTrack" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ReleaseTrack" inverseName="releases" inverseEntity="ReleaseTrack"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceID"/>
+                <constraint value="appBundleID"/>
+                <constraint value="version"/>
+                <constraint value="buildVersion"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="buildVersion" optional="YES" attributeType="String"/>
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="certificateSerialNumber" optional="YES" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="hasAlternateIcon" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="hasUpdate" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="isActive" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="isRefreshing" transient="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="needsResign" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="storeBuildVersion" optional="YES" attributeType="String"/>
+        <attribute name="useMainProfile" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="appExtensions" toMany="YES" deletionRule="Cascade" destinationEntity="InstalledExtension" inverseName="parentApp" inverseEntity="InstalledExtension"/>
+        <relationship name="loggedErrors" toMany="YES" deletionRule="Nullify" destinationEntity="LoggedError" inverseName="installedApp" inverseEntity="LoggedError"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="installedApps" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledExtension" representedClassName="InstalledExtension" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="parentApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="appExtensions" inverseEntity="InstalledApp"/>
+    </entity>
+    <entity name="LoggedError" representedClassName="LoggedError" syncable="YES">
+        <attribute name="appBundleID" attributeType="String"/>
+        <attribute name="appName" attributeType="String"/>
+        <attribute name="code" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="domain" attributeType="String"/>
+        <attribute name="operation" optional="YES" attributeType="String"/>
+        <attribute name="userInfo" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="loggedErrors" inverseEntity="InstalledApp"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="loggedErrors" inverseEntity="StoreApp"/>
+    </entity>
+    <entity name="NewsItem" representedClassName="NewsItem" syncable="YES">
+        <attribute name="appID" optional="YES" attributeType="String"/>
+        <attribute name="caption" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="externalURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isSilent" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sourceIdentifier" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="newsItems" inverseEntity="Source"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="newsItems" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+                <constraint value="sourceIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PatreonAccount" representedClassName="PatreonAccount" syncable="YES">
+        <attribute name="firstName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isPatron" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="pledges" toMany="YES" deletionRule="Cascade" destinationEntity="Pledge" inverseName="account" inverseEntity="Pledge"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Patron" representedClassName="ManagedPatron" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Pledge" representedClassName="Pledge" syncable="YES">
+        <attribute name="amount" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="campaignURL" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PatreonAccount" inverseName="pledges" inverseEntity="PatreonAccount"/>
+        <relationship name="rewards" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="PledgeReward" inverseName="pledge" inverseEntity="PledgeReward"/>
+        <relationship name="tiers" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="PledgeTier" inverseName="pledge" inverseEntity="PledgeTier"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PledgeReward" representedClassName="PledgeReward" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="pledge" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Pledge" inverseName="rewards" inverseEntity="Pledge"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PledgeTier" representedClassName="PledgeTier" syncable="YES">
+        <attribute name="amount" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <relationship name="pledge" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Pledge" inverseName="tiers" inverseEntity="Pledge"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="ReleaseTrack" representedClassName="ReleaseTrack" syncable="YES">
+        <attribute name="appBundleID" optional="YES" attributeType="String"/>
+        <attribute name="sourceID" optional="YES" attributeType="String"/>
+        <attribute name="track" attributeType="String"/>
+        <relationship name="releases" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppVersion" inverseName="releaseTrack" inverseEntity="AppVersion"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="releaseTracks" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceID"/>
+                <constraint value="appBundleID"/>
+                <constraint value="track"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="error" optional="YES" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="featuredSortID" optional="YES" attributeType="String"/>
+        <attribute name="groupID" optional="YES" attributeType="String"/>
+        <attribute name="hasFeaturedApps" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="headerImageURL" optional="YES" attributeType="URI"/>
+        <attribute name="iconURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="localizedDescription" optional="YES" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="patreonURL" optional="YES" attributeType="URI"/>
+        <attribute name="sourceURL" attributeType="URI"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="version" attributeType="Integer 64" defaultValueString="1" usesScalarValueType="YES"/>
+        <attribute name="websiteURL" optional="YES" attributeType="URI"/>
+        <relationship name="apps" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp"/>
+        <relationship name="featuredApps" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="StoreApp" inverseName="featuringSource" inverseEntity="StoreApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="NewsItem" inverseName="source" inverseEntity="NewsItem"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="category" optional="YES" attributeType="String"/>
+        <attribute name="developerName" attributeType="String"/>
+        <attribute name="downloadURL" optional="YES" attributeType="URI"/>
+        <attribute name="featuredSortID" optional="YES" attributeType="String"/>
+        <attribute name="iconURL" attributeType="URI"/>
+        <attribute name="isHiddenWithoutPledge" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isPledged" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isPledgeRequired" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="localizedDescription" attributeType="String"/>
+        <attribute name="marketplaceID" optional="YES" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="pledgeAmount" optional="YES" attributeType="Decimal"/>
+        <attribute name="pledgeCurrency" optional="YES" attributeType="String"/>
+        <attribute name="prefersCustomPledge" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="screenshotURLs" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="size" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sourceIdentifier" optional="YES" attributeType="String"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable" valueTransformerName="ALTSecureValueTransformer"/>
+        <attribute name="version" optional="YES" attributeType="String"/>
+        <attribute name="versionDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="versionDescription" optional="YES" attributeType="String"/>
+        <relationship name="featuringSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="featuredApps" inverseEntity="Source"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="storeApp" inverseEntity="InstalledApp"/>
+        <relationship name="latestVersion" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="AppVersion" inverseName="latestVersionApp" inverseEntity="AppVersion"/>
+        <relationship name="loggedErrors" toMany="YES" deletionRule="Nullify" destinationEntity="LoggedError" inverseName="storeApp" inverseEntity="LoggedError"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" destinationEntity="NewsItem" inverseName="storeApp" inverseEntity="NewsItem"/>
+        <relationship name="permissions" toMany="YES" deletionRule="Cascade" destinationEntity="AppPermission" inverseName="app" inverseEntity="AppPermission"/>
+        <relationship name="releaseTracks" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="ReleaseTrack" inverseName="storeApp" inverseEntity="ReleaseTrack"/>
+        <relationship name="screenshots" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppScreenshot" inverseName="app" inverseEntity="AppScreenshot"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="apps" inverseEntity="Source"/>
+        <relationship name="versions" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppVersion" inverseName="app" inverseEntity="AppVersion"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceIdentifier"/>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Team" representedClassName="Team" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="teams" inverseEntity="Account"/>
+        <relationship name="appIDs" toMany="YES" deletionRule="Cascade" destinationEntity="AppID" inverseName="team" inverseEntity="AppID"/>
+        <relationship name="installedApps" toMany="YES" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="team" inverseEntity="InstalledApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+</model>

AltStoreCore/Model/AppPermission.swift

@@ -33,7 +33,7 @@ public class AppPermission: BaseEntity
         default: return UnknownAppPermission(rawValue: self._permission)
         }
     }
-    @NSManaged @objc(permission) private var _permission: String
+    @NSManaged @objc(permission) private(set) public var _permission: String
     
     // Set by StoreApp.
     @NSManaged public var appBundleID: String

AltStoreCore/Model/InstalledApp.swift

@@ -59,6 +59,8 @@ public class InstalledApp: BaseEntity, InstalledAppProtocol
     @NSManaged public var needsResign: Bool
     @NSManaged public var hasAlternateIcon: Bool
     
+    @NSManaged public var useMainProfile: Bool
+    
     @NSManaged public var certificateSerialNumber: String?
     @NSManaged public var storeBuildVersion: String?
     
@@ -141,7 +143,7 @@ public class InstalledApp: BaseEntity, InstalledAppProtocol
         let latestVer  = SemanticVersion("\(latestSemVer!.major).\(latestSemVer!.minor).\(latestSemVer!.patch)")
         
         // Compare by major.minor.patch
-        if latestVer! > latestVer! {
+        if latestVer! > currentVer! {
             return true
         }
         

AltStoreCore/Model/MergePolicies/MergePolicy.swift

@@ -213,6 +213,7 @@ extension MergePolicy{
                 }
                 
             default:
+//                break
                 // Unknown context-level conflict.
 //                assertionFailure("MergePolicy is only intended to work with database-level conflicts.")
                 assertionFailure("Context Conflict Detected: is there ambigious data in your incoming sources?\nConflict:\(conflict)")

AltStoreCore/Model/Migrations/Mapping Models/AltStore11ToAltStore17.xcmappingmodel/xcmapping.xml

@@ -505,13 +505,14 @@ cxIAAYagXxAPTlNLZXllZEFyY2hpdmVy0QAIAAlUcm9vdIABrxESLAALAAwAGQA1ADYANwBjAGQAZQBm
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z142 z119 z223 z116 z229 z139 z236 z136 z214 z216"></relationship>
     </object>
     <object type="XDDEVENTITYMAPPING" id="z198">
+        <attribute name="migrationpolicyclassname" type="string"></attribute>
         <attribute name="sourcename" type="string">AppPermission</attribute>
         <attribute name="mappingtypename" type="string">Undefined</attribute>
         <attribute name="mappingnumber" type="int16">17</attribute>
         <attribute name="destinationname" type="string">AppPermission</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z192"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z213 z240 z191 z123 z287"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z123 z213 z287 z240 z191"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z288"></relationship>
     </object>
     <object type="XDDEVENTITYMAPPING" id="z199">

AltStoreCore/Model/Migrations/Policies/v11-to-v17/Source11To17MigrationPolicy.swift

@@ -1,5 +1,5 @@
 //
-//  SourceMigrationPolicy.swift
+//  Source11To17MigrationPolicy.swift
 //  AltStoreCore
 //
 //  Created by Riley Testut on 10/19/23.

AltStoreCore/Model/Migrations/Policies/v11-to-v17/StoreApp11To17MigrationPolicy.swift

@@ -1,5 +1,5 @@
 //
-//  StoreAppMigration11To17Policy.swift
+//  StoreApp11To17MigrationPolicy.swift
 //  AltStore
 //
 //  Created by Magesh K on 25/02/25.
@@ -108,7 +108,7 @@ class StoreApp11To17MigrationPolicy: NSEntityMigrationPolicy {
         
         // Create a new ReleaseTrack entity
         let context = dInstance.managedObjectContext!
-        let releaseTrack = NSEntityDescription.insertNewObject(forEntityName: ReleaseTrack.entity().name!, into: context)
+        let releaseTrack = NSEntityDescription.insertNewObject(forEntityName: ReleaseTrack.entity().name ?? ReleaseTrack.description(), into: context)
         releaseTrack.setValue(defaultChannel, forKey: #keyPath(ReleaseTrack._track))
 
         // Connect the releaseTrack to the destination StoreApp
@@ -116,7 +116,7 @@ class StoreApp11To17MigrationPolicy: NSEntityMigrationPolicy {
 
 
         // Find the mapping name for AppVersion (make sure this exactly matches your mapping model)
-        let appVersionMappingName = findEntityMappingName(for: AppVersion.entity().name!, in: manager)
+        let appVersionMappingName = findEntityMappingName(for: AppVersion.entity().name ?? AppVersion.description(), in: manager)
         
         // Create a mutable ordered set for the destination AppVersion objects
         let destinationVersionsSet = NSMutableOrderedSet()
@@ -145,5 +145,5 @@ class StoreApp11To17MigrationPolicy: NSEntityMigrationPolicy {
 //        dInstance.setValue(NSOrderedSet(), forKey: #keyPath(StoreApp._versions))
         dInstance.setValue(nil, forKey: #keyPath(StoreApp._versions))
     }
-
 }
+

AltStoreCore/Model/Migrations/Policies/v11-to-v17_1/AppPermission11To17_1MigrationPolicy.swift

@@ -0,0 +1,28 @@
+//
+//  AppPermission17to17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+@objc(AppPermission11To17_1MigrationPolicy)
+class AppPermission11To17_1MigrationPolicy: AppPermission17To17_1MigrationPolicy {
+    
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        // Let the default implementation create the basic destination AppPermission
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    
+    
+    override func createRelationships(
+        forDestination dInstance: NSManagedObject,
+        in mapping: NSEntityMapping,
+        manager: NSMigrationManager
+    ) throws {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+    }
+}

AltStoreCore/Model/Migrations/Policies/v11-to-v17_1/ReleaseTrack11To17_1MigrationPolicy.swift

@@ -0,0 +1,26 @@
+//
+//  ReleaseTrack11To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+@objc(ReleaseTrack11To17_1MigrationPolicy)
+class ReleaseTrack11To17_1MigrationPolicy: ReleaseTrack17To17_1MigrationPolicy {
+    
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    
+    override func createRelationships(
+        forDestination dInstance: NSManagedObject,
+        in mapping: NSEntityMapping,
+        manager: NSMigrationManager
+    ) throws {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+    }
+}

AltStoreCore/Model/Migrations/Policies/v11-to-v17_1/Source11To17_1MigrationPolicy.swift

@@ -0,0 +1,23 @@
+//
+//  Source11To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+@objc(Source11To17_1MigrationPolicy)
+class Source11To17_1MigrationPolicy: Source17To17_1MigrationPolicy
+{
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        // Let the default implementation create the basic destination AppPermission
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws
+    {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+    }
+}

AltStoreCore/Model/Migrations/Policies/v11-to-v17_1/StoreApp11To17_1MigrationPolicy.swift

@@ -0,0 +1,62 @@
+//
+//  StoreApp11To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+fileprivate extension NSManagedObject
+{
+    var storeAppReleaseTracks: NSOrderedSet? {
+        let tracks = self.value(forKey: #keyPath(StoreApp._releaseTracks)) as? NSOrderedSet
+        return tracks
+    }
+}
+
+@objc(StoreApp11To17_1MigrationPolicy)
+class StoreApp11To17_1MigrationPolicy: StoreApp11To17MigrationPolicy
+{
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws
+    {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+                
+        let appBundleID = dInstance.value(forKey: #keyPath(StoreApp.bundleIdentifier))
+        let sourceID = dInstance.value(forKey: #keyPath(StoreApp.sourceIdentifier))
+
+        for case let track as NSManagedObject in dInstance.storeAppReleaseTracks ?? []
+        {
+            track.setValue(appBundleID, forKey: #keyPath(ReleaseTrack._appBundleID))
+            track.setValue(sourceID, forKey: #keyPath(ReleaseTrack._sourceID))
+            
+            guard let releases = track.value(forKey: #keyPath(ReleaseTrack._releases)) as? NSOrderedSet else {
+                continue
+            }
+            
+            for case let version as NSManagedObject in releases {
+                version.setValue(appBundleID, forKey: #keyPath(AppVersion.appBundleID))
+                version.setValue(sourceID, forKey: #keyPath(AppVersion.sourceID))
+            }
+        }
+                
+        if let permissions = dInstance.value(forKey: #keyPath(StoreApp._permissions)) as? NSSet {
+            for case let permission as NSManagedObject in permissions {
+                permission.setValue(appBundleID, forKey: #keyPath(AppPermission.appBundleID))
+                permission.setValue(sourceID, forKey: #keyPath(AppPermission.sourceID))
+            }
+        }
+        
+        if let screenshots = dInstance.value(forKey: #keyPath(StoreApp._screenshots)) as? NSOrderedSet {
+            for case let screenshot as NSManagedObject in screenshots {
+                screenshot.setValue(appBundleID, forKey: #keyPath(AppScreenshot.appBundleID))
+                screenshot.setValue(sourceID, forKey: #keyPath(AppScreenshot.sourceID))
+            }
+        }
+    }
+}

AltStoreCore/Model/Migrations/Policies/v17-to-v17_1/AppPermission17To17_1MigrationPolicy.swift

@@ -0,0 +1,100 @@
+//
+//  AppPermission17to17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+@objc(AppPermission17To17_1MigrationPolicy)
+class AppPermission17To17_1MigrationPolicy: NSEntityMigrationPolicy {
+    
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        // Let the default implementation create the basic destination AppPermission
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+        
+        // Get the destination AppPermission instance that was created
+        guard let destinationPermission = manager.destinationInstances(forEntityMappingName: mapping.name, sourceInstances: [sInstance]).first else {
+            print("Failed to locate destination AppPermission instance")
+            return
+        }
+        
+        // Extract the type value from source
+        if let type = sInstance.value(forKey: #keyPath(AppPermission.type)) as? String {
+            // this is for backwards compatibility <0.5.10
+            // if older type was a valid permission, then consider it as "privacy" in the newer "type".
+            if let permission = self.derivePermissionFromType(type) {
+                destinationPermission.setValue(permission, forKey: #keyPath(AppPermission._permission))
+                destinationPermission.setValue("privacy", forKey: #keyPath(AppPermission.type))
+            }
+        }
+        
+        // set initial values copied from source as-is
+        // (will be updated by StoreApp and Source migration policy in its createRelationship() method)
+        if let storeApp = sInstance.value(forKey: #keyPath(AppPermission.app)) as? NSManagedObject{
+            if let appBundle = storeApp.value(forKey: #keyPath(StoreApp.bundleIdentifier)) as? String{
+                destinationPermission.setValue(appBundle, forKey: #keyPath(AppPermission.appBundleID))
+            }
+
+            if let sourceID = storeApp.value(forKey: #keyPath(StoreApp.sourceIdentifier)) as? String {
+                destinationPermission.setValue(sourceID, forKey: #keyPath(AppPermission.sourceID))
+            }
+        }
+    }
+    
+    
+    
+    override func createRelationships(
+        forDestination dInstance: NSManagedObject,
+        in mapping: NSEntityMapping,
+        manager: NSMigrationManager
+    ) throws {
+
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+                
+        // Retrieve the source storeApp from the source appPermission
+        guard let storeApp = dInstance.value(forKey: #keyPath(AppPermission.app)) as? NSManagedObject else {
+            print("Destination \(AppPermission.description()) has no storeApp")
+            return
+        }
+        
+        // set initial values copied from source as-is to satisfy unique constraints
+        // (will be updated by StoreApp and Source migration policy in its createRelationship() method)
+        if let appBundle = storeApp.value(forKey: #keyPath(StoreApp.bundleIdentifier)) as? String{
+            dInstance.setValue(appBundle, forKey: #keyPath(AppPermission.appBundleID))
+        }
+
+        if let sourceID = storeApp.value(forKey: #keyPath(StoreApp.sourceIdentifier)) as? String {
+            dInstance.setValue(sourceID, forKey: #keyPath(AppPermission.sourceID))
+        }
+    }
+    
+    // Helper method to derive permission string from type
+    private func derivePermissionFromType(_ type: String) -> String? {
+        
+        // Based on the code in the documents, we need to map the ALTAppPermissionType to permission strings
+        switch type {
+        case "photos": return "NSPhotosUsageDescription"
+        case "camera": return "NSCameraUsageDescription"
+        case "location": return "NSLocationUsageDescription"
+        case "contacts": return "NSContactsUsageDescription"
+        case "reminders": return "NSRemindersUsageDescription"
+        case "music": return "NSAppleMusicUsageDescription"
+        case "microphone": return "NSMicrophoneUsageDescription"
+        case "speech-recognition": return "NSSpeechRecognitionUsageDescription"
+        case "background-audio": return "NSBackgroundAudioUsageDescription"
+        case "background-fetch": return "NSBackgroundFetchUsageDescription"
+        case "bluetooth": return "NSBluetoothUsageDescription"
+        case "network": return "NSNetworkUsageDescription"
+        case "calendars": return "NSCalendarsUsageDescription"
+        case "touchID": return "NSTouchIDUsageDescription"
+        case "faceID": return "NSFaceIDUsageDescription"
+        case "siri": return "NSSiriUsageDescription"
+        case "motion": return "NSMotionUsageDescription"
+        
+        default: return nil // Default fallback
+        }
+    }
+}

AltStoreCore/Model/Migrations/Policies/v17-to-v17_1/ReleaseTrack17To17_1MigrationPolicy.swift

@@ -0,0 +1,57 @@
+//
+//  ReleaseTrack17To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+@objc(ReleaseTrack17To17_1MigrationPolicy)
+class ReleaseTrack17To17_1MigrationPolicy: NSEntityMigrationPolicy {
+    
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    
+    override func createRelationships(
+        forDestination dInstance: NSManagedObject,
+        in mapping: NSEntityMapping,
+        manager: NSMigrationManager
+    ) throws {
+        
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+                
+        // Retrieve the source storeApp from the source ReleaseTrack
+        guard let storeApp = dInstance.value(forKey: #keyPath(ReleaseTrack.storeApp)) as? NSManagedObject else {
+            print("Destination \(ReleaseTrack.description()) has no storeApp")
+            return
+        }
+        
+        // set initial values copied from source as-is to satisfy unique constraints
+        // (will be updated by StoreApp and Source migration policy in its createRelationship() method)
+        let appBundle = storeApp.value(forKey: #keyPath(StoreApp.bundleIdentifier)) as? String
+        let sourceID = storeApp.value(forKey: #keyPath(StoreApp.sourceIdentifier)) as? String
+        
+        if let appBundle {
+            dInstance.setValue(appBundle, forKey: #keyPath(ReleaseTrack._appBundleID))
+        }
+
+        if let sourceID {
+            dInstance.setValue(sourceID, forKey: #keyPath(ReleaseTrack._sourceID))
+        }
+        
+        if let releases = dInstance.value(forKey: #keyPath(ReleaseTrack._releases)) as? NSOrderedSet {
+            for case let version as NSManagedObject in releases {
+                if let appBundle {
+                    version.setValue(appBundle, forKey: #keyPath(AppVersion.appBundleID))
+                }
+                if let sourceID {
+                    version.setValue(sourceID, forKey: #keyPath(AppVersion.sourceID))
+                }
+            }
+        }
+    }
+}

AltStoreCore/Model/Migrations/Policies/v17-to-v17_1/Source17To17_1MigrationPolicy.swift

@@ -0,0 +1,191 @@
+//
+//  Source17To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+fileprivate extension NSManagedObject
+{
+    var sourceSourceURL: URL? {
+        let sourceURL = self.value(forKey: #keyPath(Source.sourceURL)) as? URL
+        return sourceURL
+    }
+    
+    var sourceSourceId: String? {
+        let sourceId = self.value(forKey: #keyPath(Source.identifier)) as? String
+        return sourceId
+    }
+    
+    var sourceApps: NSOrderedSet? {
+        let apps = self.value(forKey: #keyPath(Source._apps)) as? NSOrderedSet
+        return apps
+    }
+    
+    var sourceNewsItems: NSOrderedSet? {
+        let newsItems = self.value(forKey: #keyPath(Source._newsItems)) as? NSOrderedSet
+        return newsItems
+    }
+}
+
+fileprivate extension NSManagedObject
+{
+    func setSourceId(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(Source.identifier))
+    }
+
+    func setGroupId(_ groupID: String)
+    {
+        self.setValue(groupID, forKey: #keyPath(Source.groupID))
+    }
+
+    func setSourceSourceUrl(_ sourceURL: URL)
+    {
+        self.setValue(sourceURL, forKey: #keyPath(Source.sourceURL))
+    }
+    
+    func setSourceSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(Source.identifier))
+    }
+    
+    func setStoreAppSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(StoreApp.sourceIdentifier))
+    }
+    
+    func setNewsItemSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(NewsItem.sourceIdentifier))
+    }
+    
+    func setAppVersionSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(AppVersion.sourceID))
+    }
+    
+    func setAppPermissionSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(AppPermission.sourceID))
+    }
+    
+    func setAppScreenshotSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(AppScreenshot.sourceID))
+    }
+
+    func setReleaseTracksSourceID(_ sourceID: String)
+    {
+        self.setValue(sourceID, forKey: #keyPath(ReleaseTrack._sourceID))
+    }
+}
+
+
+fileprivate extension NSManagedObject
+{
+    var storeAppVersions: NSOrderedSet? {
+        let versions = self.value(forKey: #keyPath(StoreApp._versions)) as? NSOrderedSet
+        return versions
+    }
+    
+    var storeAppPermissions: NSSet? {
+        let permissions = self.value(forKey: #keyPath(StoreApp._permissions)) as? NSSet
+        return permissions
+    }
+    
+    var storeAppScreenshots: NSOrderedSet? {
+        let screenshots = self.value(forKey: #keyPath(StoreApp._screenshots)) as? NSOrderedSet
+        return screenshots
+    }
+
+    var storeAppReleaseTracks: NSOrderedSet? {
+        let tracks = self.value(forKey: #keyPath(StoreApp._releaseTracks)) as? NSOrderedSet
+        return tracks
+    }
+}
+
+@objc(Source17To17_1MigrationPolicy)
+class Source17To17_1MigrationPolicy: NSEntityMigrationPolicy
+{
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        // Let the default implementation create the basic destination AppPermission
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+        
+        // Get the destination Source instance that was created
+        guard let dInstance = manager.destinationInstances(forEntityMappingName: mapping.name, sourceInstances: [sInstance]).first else {
+            print("Failed to locate destination Source instance")
+            return
+        }
+        
+        // update new fields with initial values
+        if let sourceID = sInstance.value(forKey: #keyPath(Source.identifier)) as? String {
+            dInstance.setValue(sourceID, forKey: #keyPath(Source.groupID))
+        }
+        
+        guard var sourceURL = dInstance.sourceSourceURL else {
+            return
+        }
+                
+        // sidestore official source has been moved to sidestore.io/apps-v2.json
+        // if we don't switch, users will end up with 2 offical sources
+        let normalizedSourceURL = try? sourceURL.normalized()
+        if normalizedSourceURL == "apps.sidestore.io"                   // if using old source url (<0.5.9)
+        {
+            sourceURL = Source.altStoreSourceURL                        // switch to latest
+            dInstance.setSourceSourceUrl(sourceURL)                     // and use it for current
+        }
+
+        var sourceID = try Source.sourceID(from: sourceURL)
+        dInstance.setSourceId(sourceID)
+        
+        // for older versions migrating to current (their sourceID is their groupID)
+        dInstance.setGroupId(sourceID)
+
+        if sourceID == "apps.sidestore.io" {
+            sourceID = Source.altStoreIdentifier
+            dInstance.setSourceId(sourceID)
+        }
+    }
+    
+    override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws
+    {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+        
+        guard let sourceID = dInstance.sourceSourceId else { return }
+        
+        for case let newsItem as NSManagedObject in dInstance.sourceNewsItems ?? []
+        {
+            newsItem.setNewsItemSourceID(sourceID)
+        }
+
+        for case let app as NSManagedObject in dInstance.sourceApps ?? []
+        {
+            app.setStoreAppSourceID(sourceID)
+            
+            for case let screenshot as NSManagedObject in app.storeAppScreenshots ?? []
+            {
+                screenshot.setAppScreenshotSourceID(sourceID)
+            }
+            
+            for case let track as NSManagedObject in app.storeAppReleaseTracks ?? []
+            {
+//                print("Source_17_1MigrationPolicy: processing track \(track.value(forKey: "track")!)")
+                track.setValue(sourceID, forKey: #keyPath(ReleaseTrack._sourceID))
+                
+                guard let releases = track.value(forKey: #keyPath(ReleaseTrack._releases)) as? NSOrderedSet else {
+//                    print("Source_17_1MigrationPolicy: releases not found for track: \(track.value(forKey: "track")!)")
+                    continue
+                }
+                
+                for case let version as NSManagedObject in releases {
+//                    print("Source_17_1MigrationPolicy: updating sourceID for version: \(version.value(forKey: "version")!)")
+                    version.setValue(sourceID, forKey: #keyPath(AppVersion.sourceID))
+                }
+            }
+        }
+    }
+}

AltStoreCore/Model/Migrations/Policies/v17-to-v17_1/StoreApp17To17_1MigrationPolicy.swift

@@ -0,0 +1,57 @@
+//
+//  StoreApp17To17_1MigrationPolicy.swift
+//  AltStore
+//
+//  Created by Magesh K on 15/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import CoreData
+
+fileprivate extension NSManagedObject
+{
+    var storeAppReleaseTracks: NSOrderedSet? {
+        let tracks = self.value(forKey: #keyPath(StoreApp._releaseTracks)) as? NSOrderedSet
+        return tracks
+    }
+}
+
+@objc(StoreApp17To17_1MigrationPolicy)
+class StoreApp17To17_1MigrationPolicy: NSEntityMigrationPolicy
+{
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
+    }
+    
+    override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws
+    {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+                
+        let appBundleID = dInstance.value(forKey: #keyPath(StoreApp.bundleIdentifier))
+
+        for case let track as NSManagedObject in dInstance.storeAppReleaseTracks ?? []
+        {
+            track.setValue(appBundleID, forKey: #keyPath(ReleaseTrack._appBundleID))
+            
+            guard let releases = track.value(forKey: #keyPath(ReleaseTrack._releases)) as? NSOrderedSet else {
+                continue
+            }
+            
+            for case let version as NSManagedObject in releases {
+                version.setValue(appBundleID, forKey: #keyPath(AppVersion.appBundleID))
+            }
+        }
+                
+        if let permissions = dInstance.value(forKey: #keyPath(StoreApp._permissions)) as? NSSet {
+            for case let permission as NSManagedObject in permissions {
+                permission.setValue(appBundleID, forKey: #keyPath(AppPermission.appBundleID))
+            }
+        }
+        
+        if let screenshots = dInstance.value(forKey: #keyPath(StoreApp._screenshots)) as? NSOrderedSet {
+            for case let screenshot as NSManagedObject in screenshots {
+                screenshot.setValue(appBundleID, forKey: #keyPath(AppScreenshot.appBundleID))
+            }
+        }
+    }
+}

AltStoreCore/Model/NewsItem.swift

@@ -75,6 +75,9 @@ public class NewsItem: BaseEntity, Decodable
         self.imageURL = try container.decodeIfPresent(URL.self, forKey: .imageURL)
         self.externalURL = try container.decodeIfPresent(URL.self, forKey: .externalURL)
         
+        // TODO: app specific news should be moved to appEntity (via refactoring)
+        //       This can be done by: 1. having two newsItem schema, one for source and one for StoreApp
+        //                            2. move this appID field into the newItem schema which is under StoreApp.
         self.appID = try container.decodeIfPresent(String.self, forKey: .appID)
         
         let notify = try container.decodeIfPresent(Bool.self, forKey: .notify) ?? false

AltStoreCore/Model/ReleaseTrack.swift

@@ -14,7 +14,9 @@ public class ReleaseTrack: BaseEntity, Decodable
 {
     // attributes
     @NSManaged @objc(track) public private(set) var _track: String?
-    
+    @NSManaged @objc(appBundleID) public private(set) var _appBundleID: String?
+    @NSManaged @objc(sourceID) public private(set) var _sourceID: String?
+
     // RelationShips
     @NSManaged @objc(releases) public private(set) var _releases: NSOrderedSet?
     @NSManaged public private(set) var storeApp: StoreApp?
@@ -89,7 +91,7 @@ public extension ReleaseTrack{
                 }
                 
                 // update it into the appVersion
-                _ = version.mutateForData(channel: track, appBundleID: storeApp.bundleIdentifier)
+                _ = version.mutateForData(channel: track, appBundleID: storeApp.bundleIdentifier, sourceID: storeApp.sourceIdentifier)
             }
     }
     
@@ -109,6 +111,10 @@ public extension ReleaseTrack{
         if key == NSExpression(forKeyPath: #keyPath(ReleaseTrack.storeApp)).keyPath
         {
             updateVersions(for: storeApp)
+            
+            // update unique constraint attribs
+            self._appBundleID = storeApp?.bundleIdentifier
+            self._sourceID = storeApp?.sourceIdentifier
         }
     }
 }

AltStoreCore/Model/Source.swift

@@ -11,7 +11,11 @@ import UIKit
 
 public extension Source
 {
-    static let altStoreIdentifier = try! Source.sourceID(from: Source.altStoreSourceURL)
+    #if ALPHA
+    static let altStoreGroupIdentifier = Bundle.Info.appbundleIdentifier
+    #else
+    static let altStoreGroupIdentifier = Bundle.Info.appbundleIdentifier
+    #endif
     
     #if STAGING
     
@@ -24,13 +28,15 @@ public extension Source
     #else
     
     #if ALPHA
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
+    static let altStoreSourceURL = URL(string: "https://sidestore.io/apps-v2.json/")!
     #else
-//    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
-    static let altStoreSourceURL = URL(string: "https://sidestore.io/apps-v2.json/")!       // using v2 for alpha releases
+    static let altStoreSourceURL = URL(string: "https://sidestore.io/apps-v2.json/")!
     #endif
     
     #endif
+    
+    // normalized url is the source identifier (or) p-key!
+    static let altStoreIdentifier = try! Source.sourceID(from: altStoreSourceURL)
 }
 
 // public struct AppPermissionFeed: Codable {
@@ -205,7 +211,8 @@ public class Source: BaseEntity, Decodable
     /* Properties */
     @NSManaged public var version: Int
     @NSManaged public var name: String
-    @NSManaged public private(set) var identifier: String
+    @NSManaged public private(set) var identifier: String       // NOTE: sourceID is just normalized sourceURL
+    @NSManaged public private(set) var groupID: String?
     @NSManaged public var sourceURL: URL
     
     /* Source Detail */
@@ -280,6 +287,9 @@ public class Source: BaseEntity, Decodable
         case news
         case featuredApps
         case userInfo
+        
+//        case identifier
+        case groupID = "identifier"
     }
     
     private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
@@ -359,6 +369,24 @@ public class Source: BaseEntity, Decodable
             
             // Updates identifier + apps & newsItems
             try self.setSourceURL(sourceURL)
+            
+            
+            // NOTE: Source ID is just normalized sourceURL. coz normalized url is the primary key which needs to be unique
+            //       Hence if a source's URL changed, then it means it is a different source now.
+            //       This also means that the identifier field in the source is irrelevant (if any)
+            
+            // if we want grouping of sources from same author or something like that then we should have used groupID (a new field)
+            // shouldn't use the existing "identifier" field, hence the following is commented out
+            
+//            // if an explicit identifier is present, then use it
+//            if let identifier = try container.decodeIfPresent(String.self, forKey: .identifier)
+//            {
+//                self.identifier = identifier
+//            }
+            
+            // if an explicit (group)identifier is present, then use it as groupID else use sourceID as groupID too
+            self.groupID = try container.decodeIfPresent(String.self, forKey: .groupID) ?? self.identifier
+            
         }
         catch
         {
@@ -405,7 +433,7 @@ public extension Source
         
         // TODO: Support alternate URLs
         let isRecommended = recommendedSources.contains { source in
-            return source.identifier == self.identifier || source.sourceURL?.absoluteString.lowercased() == self.sourceURL.absoluteString
+            return source.identifier == self.identifier || source.sourceURL?.absoluteString.lowercased() == self.sourceURL.absoluteString.lowercased()
         }
         return isRecommended
     }
@@ -418,14 +446,17 @@ public extension Source
     }
 }
 
-internal extension Source
+public extension Source
 {
     class func sourceID(from sourceURL: URL) throws -> String
     {
         let sourceID = try sourceURL.normalized()
         return sourceID
     }
-    
+}
+
+internal extension Source
+{
     func setFeaturedApps(_ featuredApps: [StoreApp]?)
     {
         // Explicitly update relationships for all apps to ensure featuredApps merges correctly.
@@ -451,17 +482,23 @@ public extension Source
 {
     func setSourceURL(_ sourceURL: URL) throws
     {
-        let identifier = try Source.sourceID(from: sourceURL)
-
-        self.identifier = identifier
         self.sourceURL = sourceURL
         
+        // update the normalized sourceURL as the identifier
+        let identifier = try Source.sourceID(from: sourceURL)
+        try self.setSourceID(identifier)
+    }
+
+    func setSourceID(_ identifier: String) throws
+    {
+        self.identifier = identifier
+        
         for app in self.apps
         {
             app.sourceIdentifier = identifier
         }
         
-        for newsItem in self.newsItems 
+        for newsItem in self.newsItems
         {
             newsItem.sourceIdentifier = identifier
         }
@@ -479,6 +516,7 @@ public extension Source
     {
         let source = Source(context: context)
         source.name = "SideStore Offical"
+        source.groupID = Source.altStoreGroupIdentifier
         source.identifier = Source.altStoreIdentifier
         try! source.setSourceURL(Source.altStoreSourceURL)
         
@@ -491,13 +529,14 @@ public extension Source
         return source
     }
     
-    class func make(name: String, identifier: String, sourceURL: URL, context: NSManagedObjectContext) -> Source
+    class func make(name: String, groupID: String, sourceURL: URL, context: NSManagedObjectContext) -> Source
     {
         let source = Source(context: context)
         source.name = name
-        source.identifier = identifier
         source.sourceURL = sourceURL
-        
+        source.sourceURL = sourceURL
+        source.identifier = try! Source.sourceID(from: sourceURL)
+
         return source
     }
 }

AltWidget/Widgets/LockScreenWidget.swift

@@ -25,7 +25,7 @@ struct TextLockScreenWidget: Widget
             }
             .supportedFamilies([.accessoryCircular])
             .configurationDisplayName("AltWidget (Text)")
-            .description("View remaining days until AltStore expires.")
+            .description("View remaining days until SideStore expires.")
         }
         else
         {
@@ -48,7 +48,7 @@ struct IconLockScreenWidget: Widget
             }
             .supportedFamilies([.accessoryCircular])
             .configurationDisplayName("AltWidget (Icon)")
-            .description("View remaining days until AltStore expires.")
+            .description("View remaining days until SideStore expires.")
         }
         else
         {

Build.xcconfig

@@ -1,13 +1,16 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 0.6.0
-CURRENT_PROJECT_VERSION = 6000
+MARKETING_VERSION = 0.6.3
+CURRENT_PROJECT_VERSION = 0603
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ
 ORG_IDENTIFIER = com.SideStore
 
+// Default is free for CI builds, override it using CodeSigning.xcconfig if required
+CODE_SIGN_ENTITLEMENTS = ./AltStore/AltStoreFree.entitlements
+
 // Codesigning settings defined optionally, see `CodeSigning.xcconfig.example`
 #include? "CodeSigning.xcconfig"
 
@@ -20,8 +23,10 @@ PRODUCT_NAME = SideStore
 //PRODUCT_BUNDLE_IDENTIFIER[config=Debug]   =  $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX)
 //PRODUCT_BUNDLE_IDENTIFIER[config=Release] =  $(ORG_PREFIX).SideStore
 // preserve unmodified bundle ID (without any extra suffixes)
-GROUP_ID = $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX)
-PRODUCT_BUNDLE_IDENTIFIER = $(GROUP_ID)
+PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_IDENTIFIER).SideStore.$(DEVELOPMENT_TEAM)
+PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_IDENTIFIER).SideStore
+GROUP_ID = $(ORG_IDENTIFIER).SideStore
+GROUP_ID[config=Debug] = $(ORG_IDENTIFIER).SideStore.$(DEVELOPMENT_TEAM)
 
 EXTENSION_PREFIX            = $(PRODUCT_BUNDLE_IDENTIFIER)
 APP_GROUP_IDENTIFIER        = $(GROUP_ID)

CodeSigning.xcconfig.sample

@@ -3,8 +3,13 @@
 // https://developer.apple.com/account/#/membership
 DEVELOPMENT_TEAM = XYZ0123456
 
+// If you have a free account use this following line
+// CODE_SIGN_ENTITLEMENTS = ./AltStore/AltStoreFree.entitlements
+// Paid accounts can use this following line
+CODE_SIGN_ENTITLEMENTS = ./AltStore/AltStore.entitlements
+
 // Set this for dev-local xcode builds
-MARKETING_VERSION_SUFFIX = -local
+//MARKETING_VERSION_SUFFIX = -local
 
 // Prefix of unique bundle IDs registered to you in Apple Developer Portal.
 // You need to register:

Makefile

@@ -201,7 +201,7 @@ build-and-test:
 	@echo ""
 	@echo "Performing a build and running tests..."
 	@xcodebuild test \
-		-destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=18.2' \
+		-destination 'platform=iOS Simulator,name=iPhone 17 Pro,OS=26.0' \
 		-resultBundlePath build/tests/test-results.xcresult \
     	-enableCodeCoverage YES \
 		$(COMMON_BUILD_SETTINGS)
@@ -213,6 +213,7 @@ build-tests:
 	@echo "Performing a build-for-testing..."
 	@xcodebuild build-for-testing \
     	-enableCodeCoverage YES \
+		-destination 'platform=iOS Simulator,name=iPhone 17 Pro,OS=26.0' \
 		$(COMMON_BUILD_SETTINGS)
 
 run-tests:
@@ -223,22 +224,22 @@ run-tests:
 	@xcodebuild test-without-building \
     	-enableCodeCoverage YES \
 		-resultBundlePath build/tests/test-results.xcresult \
-		-destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=18.2' \
+		-destination 'platform=iOS Simulator,name=iPhone 17 Pro,OS=26.0' \
 		$(COMMON_BUILD_SETTINGS)
 
 boot-sim-async:
-	@if xcrun simctl list devices "iPhone 16 Pro" | grep -q "Booted"; then \
-		echo "Simulator 'iPhone 16 Pro' is already booted."; \
+	@if xcrun simctl list devices "iPhone 17 Pro" | grep -q "Booted"; then \
+		echo "Simulator 'iPhone 17 Pro' is already booted."; \
 	else \
-		echo "Booting simulator 'iPhone 16 Pro' asynchronously..."; \
-		xcrun simctl boot "iPhone 16 Pro" & \
+		echo "Booting simulator 'iPhone 17 Pro' asynchronously..."; \
+		xcrun simctl boot "iPhone 17 Pro" & \
 		echo "Simulator boot command dispatched."; \
 	fi
 
 sim-boot-check:
 	@echo "Checking simulator boot status..."
-	@if xcrun simctl list devices "iPhone 16 Pro" | grep -q "Booted"; then \
-		echo "Simulator 'iPhone 16 Pro' is booted."; \
+	@if xcrun simctl list devices "iPhone 17 Pro" | grep -q "Booted"; then \
+		echo "Simulator 'iPhone 17 Pro' is booted."; \
 	else \
 		echo "Simulator bootup failed or is not booted yet."; \
 		exit 1; \

Podfile

@@ -1,37 +0,0 @@
-inhibit_all_warnings!
-
-target 'SideStore' do
-  platform :ios, '15.0'
-
-  use_frameworks! :linkage => :static
-
-  # Pods for AltStore
-  pod 'Nuke', '~> 10.0'
-  pod 'AppCenter/Analytics', '~> 5.0'
-  pod 'AppCenter/Crashes', '~> 5.0'
-  pod 'Starscream', '~> 4.0.0'
-
-end
-
-target 'AltStoreCore' do
-  platform :ios, '15.0'
-
-  use_frameworks! :linkage => :static
-
-  # Pods for AltStoreCore
-  pod 'KeychainAccess', '~> 4.2.2'
-  # pod 'SemanticVersion', '~> 0.3.5'
-  # Add the Swift Package using the repository URL
-  # pod 'SemanticVersion', :git => 'https://github.com/SwiftPackageIndex/SemanticVersion.git', :tag => '0.4.0'
-
-
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
-      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
-    end
-  end
-end

Podfile.lock

@@ -1,33 +0,0 @@
-PODS:
-  - AppCenter/Analytics (5.0.5):
-    - AppCenter/Core
-  - AppCenter/Core (5.0.5)
-  - AppCenter/Crashes (5.0.5):
-    - AppCenter/Core
-  - KeychainAccess (4.2.2)
-  - Nuke (10.7.1)
-  - Starscream (4.0.8)
-
-DEPENDENCIES:
-  - AppCenter/Analytics (~> 5.0)
-  - AppCenter/Crashes (~> 5.0)
-  - KeychainAccess (~> 4.2.2)
-  - Nuke (~> 10.0)
-  - Starscream (~> 4.0.0)
-
-SPEC REPOS:
-  trunk:
-    - AppCenter
-    - KeychainAccess
-    - Nuke
-    - Starscream
-
-SPEC CHECKSUMS:
-  AppCenter: 994875ea7941b9e168babb98299f900a94bcef13
-  KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  Nuke: 279f17a599fd1c83cf51de5e0e1f2db143a287b0
-  Starscream: 19b5533ddb925208db698f0ac508a100b884a1b9
-
-PODFILE CHECKSUM: c0b9b55044ebe3d841c52647f4f74ad4169f97f1
-
-COCOAPODS: 1.16.2

README.md

@@ -6,7 +6,7 @@
 [![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)
+[![Discord](https://img.shields.io/discord/949183273383395328?label=Discord)](https://dis.sidestore.io)
 
 ![Alt](https://repobeats.axiom.co/api/embed/3a329ce95955690b9a9366f8d5598626a847d96c.svg "Repobeats analytics image")
 
@@ -18,20 +18,20 @@ SideStore's goal is to provide an untethered sideloading experience. It's a comm
 
 ## Requirements
 - Xcode 15
-- iOS 15+
+- iOS 14+
 - Rustup (`brew install rustup`)
 
-Why iOS 15? Targeting such a recent version of iOS allows us to accelerate development, especially since not many developers have older devices to test on. This is corrobated by the fact that SwiftUI support is much better, allowing us to transistion to a more modern UI codebase.
+Why iOS 14? Targeting such a recent version of iOS allows us to accelerate development, especially since not many developers have older devices to test on. This is corrobated by the fact that SwiftUI support is much better, allowing us to transistion to a more modern UI codebase.
 ## Project Overview
 
 ### SideStore
 SideStore is a just regular, sandboxed iOS application. The AltStore app target contains the vast majority of SideStore's functionality, including all the logic for downloading and updating apps through SideStore. SideStore makes heavy use of standard iOS frameworks and technologies most iOS developers are familiar with.
 
 ### EM Proxy
-[SideServer mobile](https://github.com/jkcoxson/em_proxy) powers the defining feature of SideStore: untethered app installation. By levaraging an App Store app with additional entitlements (WireGuard) to create the VPN tunnel for us, it allows SideStore to take advantage of [Jitterbug](https://github.com/osy/Jitterbug)'s loopback method without requiring a paid developer account.
+[EM Proxy](https://github.com/jkcoxson/em_proxy) powers the defining feature of SideStore: untethered app installation. By leveraging a custom-built App Store app with additional entitlements ([LocalDevVPN](https://github.com/jkcoxson/LocalDevVPN)) to create the VPN tunnel for us, it allows SideStore to take advantage of [Jitterbug](https://github.com/osy/Jitterbug)'s loopback method without requiring a paid developer account.
 
 ### Minimuxer
-[Minimuxer](https://github.com/jkcoxson/minimuxer) is a lockdown muxer that can run inside iOS’s sandbox. It replicates Apple’s usbmuxd protocol on MacOS to “discover” devices to interface with wireguard On-Device.
+[Minimuxer](https://github.com/jkcoxson/minimuxer) is a lockdown muxer that can run inside iOS’s sandbox. It replicates Apple’s usbmuxd protocol on macOS to “discover” devices to interface with LocalDevVPN on-device.
 
 ### Roxas
 [Roxas](https://github.com/rileytestut/roxas) is Riley Testut's internal framework from AltStore used across many of their iOS projects, developed to simplify a variety of common tasks used in iOS development.

SideStore/Tests/UITests/UITests.swift

@@ -19,7 +19,41 @@ final class UITests: XCTestCase {
 
     private static let APP_NAME = "SideStore"
     
+    func printAllMethods(of className: String) {
+        guard let cls: AnyClass = objc_getClass(className) as? AnyClass else {
+            print("Class \(className) not found")
+            return
+        }
+
+        var methodCount: UInt32 = 0
+        if let methodList = class_copyMethodList(cls, &methodCount) {
+            for i in 0..<Int(methodCount) {
+                let method = methodList[i]
+                let sel = method_getName(method)
+                print(String(describing: sel))
+            }
+            free(methodList)
+        }
+    }
+    
     override func setUpWithError() throws {
+        // ensure the swizzle only happens once
+        if !Self.mockIdlingPrivateApiToNoOp {
+            let original = class_getInstanceMethod(
+                objc_getClass("XCUIApplicationProcess") as? AnyClass,
+                // this is the new method signature obtained via reflection
+                Selector(("waitForQuiescenceIncludingAnimationsIdle:isPreEvent:"))
+            )
+            let replaced = class_getInstanceMethod(type(of: self), #selector(Self.replace))
+            if let original, let replaced{
+                method_exchangeImplementations(original, replaced)
+            }
+            Self.mockIdlingPrivateApiToNoOp = true
+        }
+        
+        /* UNCOMMENT below to enable the printing of private members of XCUIApplicationProcess */
+//        printAllMethods(of: "XCUIApplicationProcess")
+    
         // Put setup code here. This method is called before the invocation of each test method in the class.
 //        Self.dismissSpotlight()
 //        Self.deleteMyApp()
@@ -47,7 +81,9 @@ final class UITests: XCTestCase {
 
         // if it exists keep going immediately else wait for upto 5 sec with polling every 1 sec for existence
         XCTAssertTrue(systemAlert.exists || systemAlert.waitForExistence(timeout: 5), "Notifications alert did not appear")
-        systemAlert.scrollViews.otherElements.buttons["Allow"].tap()
+        let allowButton = systemAlert.scrollViews.otherElements.buttons["Allow"]
+        _ = allowButton.exists || allowButton.waitForExistence(timeout: 0.5)
+        allowButton.tap()
         
         // Do the actual validation
         try performBulkAddingRecommendedSources(for: app)
@@ -55,6 +91,7 @@ final class UITests: XCTestCase {
     
     func testBulkAddInputSources() throws {
         
+//        let app = XCUIApplication()
         let app = XCUIApplication()
         app.launch()
 
@@ -62,8 +99,10 @@ final class UITests: XCTestCase {
 
         // if it exists keep going immediately else wait for upto 5 sec with polling every 1 sec for existence
         XCTAssertTrue(systemAlert.exists || systemAlert.waitForExistence(timeout: 5), "Notifications alert did not appear")
-        systemAlert.scrollViews.otherElements.buttons["Allow"].tap()
-        
+        let allowButton = systemAlert.scrollViews.otherElements.buttons["Allow"]
+        _ = allowButton.exists || allowButton.waitForExistence(timeout: 0.5)
+        allowButton.tap()
+
         // Do the actual validation
         try performBulkAddingInputSources(for: app)
     }
@@ -77,8 +116,10 @@ final class UITests: XCTestCase {
 
         // if it exists keep going immediately else wait for upto 5 sec with polling every 1 sec for existence
         XCTAssertTrue(systemAlert.exists || systemAlert.waitForExistence(timeout: 5), "Notifications alert did not appear")
-        systemAlert.scrollViews.otherElements.buttons["Allow"].tap()
-        
+        let allowButton = systemAlert.scrollViews.otherElements.buttons["Allow"]
+        _ = allowButton.exists || allowButton.waitForExistence(timeout: 0.5)
+        allowButton.tap()
+
         // Do the actual validation
         try performRepeatabilityForStagingInputSources(for: app)
     }
@@ -92,8 +133,10 @@ final class UITests: XCTestCase {
 
         // if it exists keep going immediately else wait for upto 5 sec with polling every 1 sec for existence
         XCTAssertTrue(systemAlert.exists || systemAlert.waitForExistence(timeout: 5), "Notifications alert did not appear")
-        systemAlert.scrollViews.otherElements.buttons["Allow"].tap()
-        
+        let allowButton = systemAlert.scrollViews.otherElements.buttons["Allow"]
+        _ = allowButton.exists || allowButton.waitForExistence(timeout: 0.5)
+        allowButton.tap()
+
         // Do the actual validation
         try performRepeatabilityForStagingRecommendedSources(for: app)
     }
@@ -157,6 +200,13 @@ private extension UITests {
         springboard_app.tap()
     }
     
+    @objc func replace() {
+        return
+    }
+    
+    static var mockIdlingPrivateApiToNoOp = false
+
+    
     class func deleteMyApp2() {
         XCUIApplication().terminate()
         dismissSpringboardAlerts()
@@ -171,16 +221,19 @@ private extension UITests {
                 let button = springboard_app.buttons["Remove App"]
                 _ = button.exists || button.waitForExistence(timeout: 5)
                 button.tap()
+                _ = springboard_app.waitForExistence(timeout: 0.5)
             }
             do {
                 let button = springboard_app.buttons["Delete App"]
-                _ = button.waitForExistence(timeout: 0.3)
+                _ = button.waitForExistence(timeout: 0.5)
                 button.tap()
+                _ = springboard_app.waitForExistence(timeout: 0.5)
             }
             do {
                 let button = springboard_app.buttons["Delete"]
-                _ = button.waitForExistence(timeout: 0.3)
+                _ = button.waitForExistence(timeout: 0.5)
                 button.tap()
+                _ = springboard_app.waitForExistence(timeout: 0.5)
             }
 
 //            // Press home once to make the icons stop wiggling
@@ -230,20 +283,50 @@ private extension UITests {
         try tapAddForThesePickedSources(app: app, sourceMappings: sourceMappings, cellsQuery: cellsQuery)
         
         // Commit the changes by tapping "Done".
-        app.navigationBars["Add Source"].buttons["Done"].tap()
+        let doneButton = app.navigationBars["Add Source"].buttons["Done"]
+        _ = doneButton.waitForExistence(timeout: 0.5)
+        doneButton.tap()
         
         // Accept each source addition via alert.
         for source in sourceMappings {
             let alertIdentifier = "Would you like to add the source “\(source.alertTitle)”?"
             let addSourceButton = app.alerts[alertIdentifier]
                 .scrollViews.otherElements.buttons["Add Source"]
-            _ = addSourceButton.exists || addSourceButton.waitForExistence(timeout: 0.3)
+            _ = addSourceButton.waitForExistence(timeout: 0.5)
             addSourceButton.tap()
         }
     }
     
     
-    
+    private func performBulkAddingRecommendedSources(for app: XCUIApplication) throws {
+        // Navigate to the Sources screen and open the Add Source view.
+        let srcTab = app.tabBars["Tab Bar"].buttons["Sources"]
+        _ =  srcTab.waitForExistence(timeout: 0.5)
+        srcTab.tap()
+        let srcAdd = app.navigationBars["Sources"].buttons["Add"]
+        _ = srcAdd.waitForExistence(timeout: 0.5)
+        srcAdd.tap()
+
+        let cellsQuery = app.collectionViews.cells
+        
+        // Data model for recommended sources. NOTE: This list order is required to be the same as that of "Add Source" Screen
+        let recommendedSources: [(identifier: String, alertTitle: String, requiresSwipe: Bool)] = [
+            ("SideStore Team Picks\ncommunity-apps.sidestore.io/sidecommunity.json", "SideStore Team Picks", false),
+            ("Provenance EMU\nprovenance-emu.com/apps.json", "Provenance EMU", false),
+            ("Countdown Respository\nneoarz.github.io/Countdown-App/Countdown.json", "Countdown Respository", false),
+            ("OatmealDome's AltStore Source\naltstore.oatmealdome.me", "OatmealDome's AltStore Source", true),
+            ("UTM Repository\nVirtual machines for iOS", "UTM Repository", false),
+            ("Flyinghead\nflyinghead.github.io/flycast-builds/altstore.json", "Flyinghead", false),
+//            ("PojavLauncher Repository\nalt.crystall1ne.dev", "PojavLauncher Repository", false),            // not a stable source, sometimes becomes unreachable, so disabled
+            ("PokeMMO\npokemmo.eu/altstore/", "PokeMMO", true),
+            ("Odyssey\ntheodyssey.dev/altstore/odysseysource.json", "Odyssey", false),
+            ("Yattee\nrepos.yattee.stream/alt/apps.json", "Yattee", false),
+            ("ThatStella7922 Source\nThe home for all apps ThatStella7922", "ThatStella7922 Source", false)
+        ]
+        
+        try performBulkAdd(app: app, sourceMappings: recommendedSources, cellsQuery: cellsQuery)
+    }
+
     private func performBulkAddingInputSources(for app: XCUIApplication) throws {
         
         // set content into clipboard (for bulk add (paste))
@@ -260,17 +343,23 @@ private extension UITests {
             https://bit.ly/Quantumsource
         """.trimmedIndentation
         
-        let app = XCUIApplication()
-        app.tabBars["Tab Bar"].buttons["Sources"].tap()
-        app.navigationBars["Sources"].buttons["Add"].tap()
+        let srcTab = app.tabBars["Tab Bar"].buttons["Sources"]
+        _ =  srcTab.waitForExistence(timeout: 0.5)
+        srcTab.tap()
+        let srcAdd = app.navigationBars["Sources"].buttons["Add"]
+        _ = srcAdd.waitForExistence(timeout: 0.5)
+        srcAdd.tap()
 
         let collectionViewsQuery = app.collectionViews
         let appsSidestoreIoTextField = collectionViewsQuery.textFields["apps.sidestore.io"]
-        _ = appsSidestoreIoTextField.exists || appsSidestoreIoTextField.waitForExistence(timeout: 5)
+        _ = appsSidestoreIoTextField.waitForExistence(timeout: 0.5)
         appsSidestoreIoTextField.tap()
         appsSidestoreIoTextField.tap()
-        collectionViewsQuery.staticTexts["Paste"].tap()
-
+        _ = appsSidestoreIoTextField.waitForExistence(timeout: 0.5)
+        let pasteButton = collectionViewsQuery.staticTexts["Paste"]
+        _ = pasteButton.waitForExistence(timeout: 0.5)
+        pasteButton.tap()
+        
 //        if app.keyboards.buttons["Return"].exists {
 //            app.keyboards.buttons["Return"].tap()
 //        } else if app.keyboards.buttons["Done"].exists {
@@ -282,6 +371,7 @@ private extension UITests {
         
         if app.keyboards.count > 0 {
             appsSidestoreIoTextField.typeText("\n") // Fallback to newline so that soft kb is dismissed
+            _ =  app.exists || app.waitForExistence(timeout: 0.5)
         }
         
         let cellsQuery = collectionViewsQuery.cells
@@ -302,7 +392,32 @@ private extension UITests {
         try performBulkAdd(app: app, sourceMappings: textInputSources, cellsQuery: cellsQuery)
     }
     
-    
+    private func performRepeatabilityForStagingRecommendedSources(for app: XCUIApplication) throws {
+        // Navigate to the Sources screen and open the Add Source view.
+        let srcTab = app.tabBars["Tab Bar"].buttons["Sources"]
+        srcTab.tap()
+        _ =  srcTab.waitForExistence(timeout: 0.5)
+        let srcAdd = app.navigationBars["Sources"].buttons["Add"]
+        srcAdd.tap()
+        _ = srcAdd.waitForExistence(timeout: 0.5)
+
+        let cellsQuery = app.collectionViews.cells
+        
+        // Data model for recommended sources. NOTE: This list order is required to be the same as that of "Add Source" Screen
+        let recommendedSources: [(identifier: String, alertTitle: String, requiresSwipe: Bool)] = [
+            ("SideStore Team Picks\ncommunity-apps.sidestore.io/sidecommunity.json", "SideStore Team Picks", false),
+            ("Provenance EMU\nprovenance-emu.com/apps.json", "Provenance EMU", false),
+            ("Countdown Respository\nneoarz.github.io/Countdown-App/Countdown.json", "Countdown Respository", false),
+            ("OatmealDome's AltStore Source\naltstore.oatmealdome.me", "OatmealDome's AltStore Source", false),
+            ("UTM Repository\nVirtual machines for iOS", "UTM Repository", false),
+        ]
+        
+        let repeatCount = 3                                     // number of times to run the entire sequence
+        let timeSeed = UInt64(Date().timeIntervalSince1970)     // time is unique (upto microseconds) - uncomment this to use non-deterministic seed based RNG (random number generator)
+
+        try repeatabilityTest(app: app, sourceMappings: recommendedSources, cellsQuery: cellsQuery, repeatCount: repeatCount, seed: timeSeed)
+    }
+
     private func performRepeatabilityForStagingInputSources(for app: XCUIApplication) throws {
         
         // set content into clipboard (for bulk add (paste))
@@ -315,20 +430,28 @@ private extension UITests {
             https://bit.ly/40Isul6
         """.trimmedIndentation
         
-        let app = XCUIApplication()
-        app.tabBars["Tab Bar"].buttons["Sources"].tap()
-        app.navigationBars["Sources"].buttons["Add"].tap()
+        let srcTab = app.tabBars["Tab Bar"].buttons["Sources"]
+        _ =  srcTab.waitForExistence(timeout: 0.5)
+        srcTab.tap()
+        let srcAdd = app.navigationBars["Sources"].buttons["Add"]
+        _ = srcAdd.waitForExistence(timeout: 0.5)
+        srcAdd.tap()
+
 
         let collectionViewsQuery = app.collectionViews
         let appsSidestoreIoTextField = collectionViewsQuery.textFields["apps.sidestore.io"]
-        _ = appsSidestoreIoTextField.exists || appsSidestoreIoTextField.waitForExistence(timeout: 5)
+        _ = appsSidestoreIoTextField.waitForExistence(timeout: 0.5)
         appsSidestoreIoTextField.tap()
         appsSidestoreIoTextField.tap()
-        _ = appsSidestoreIoTextField.exists || appsSidestoreIoTextField.waitForExistence(timeout: 5)
-        collectionViewsQuery.staticTexts["Paste"].tap()
+        _ = appsSidestoreIoTextField.waitForExistence(timeout: 0.5)
+        let pasteButton = collectionViewsQuery.staticTexts["Paste"]
+        _ = pasteButton.waitForExistence(timeout: 0.5)
+        pasteButton.tap()
+
         
         if app.keyboards.count > 0 {
             appsSidestoreIoTextField.typeText("\n") // Fallback to newline so that soft kb is dismissed
+            _ =  app.exists || app.waitForExistence(timeout: 0.5)
         }
         
         let cellsQuery = collectionViewsQuery.cells
@@ -380,64 +503,27 @@ private extension UITests {
                 .containing(.button, identifier: source.identifier)
                 .children(matching: .button)[source.identifier]
             XCTAssert(sourceButton.exists || sourceButton.waitForExistence(timeout: 10), "Source preview for id: '\(source.alertTitle)' not found in the view")
-            
+
+            _ =  sourceButton.exists || sourceButton.waitForExistence(timeout: 0.5)
+
 //            let addButton = sourceButton.children(matching: .button).firstMatch
+//            let addButton = sourceButton.descendants(matching: .button)["add"]
+//            XCTAssert(addButton.exists || addButton.waitForExistence(timeout: 0.5), " `+` button for id: '\(source.alertTitle)' not found in the preview container")
+//            addButton.tap()
+            
             let addButton = sourceButton.children(matching: .button)["add"]
-            XCTAssert(addButton.exists || addButton.waitForExistence(timeout: 0.3), " `+` button for id: '\(source.alertTitle)' not found in the preview container")
-            addButton.tap()
+            XCTAssert(addButton.waitForExistence(timeout: 1))    //TODO: fine tune down the value to make tests faster (but validate tests still works)
+//            addButton.tap()
+
+            let coord = addButton.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5))
+            coord.tap()
             
             if source.requiresSwipe {
                 sourceButton.swipeUp(velocity: .slow)  // Swipe up if needed.
+                _ = sourceButton.waitForExistence(timeout: 0.5)
             }
         }
     }
-
-    private func performBulkAddingRecommendedSources(for app: XCUIApplication) throws {
-        // Navigate to the Sources screen and open the Add Source view.
-        app.tabBars["Tab Bar"].buttons["Sources"].tap()
-        app.navigationBars["Sources"].buttons["Add"].tap()
-        
-        let cellsQuery = app.collectionViews.cells
-        
-        // Data model for recommended sources. NOTE: This list order is required to be the same as that of "Add Source" Screen
-        let recommendedSources: [(identifier: String, alertTitle: String, requiresSwipe: Bool)] = [
-            ("SideStore Team Picks\ncommunity-apps.sidestore.io/sidecommunity.json", "SideStore Team Picks", false),
-            ("Provenance EMU\nprovenance-emu.com/apps.json", "Provenance EMU", false),
-            ("Countdown Respository\nneoarz.github.io/Countdown-App/Countdown.json", "Countdown Respository", false),
-            ("OatmealDome's AltStore Source\naltstore.oatmealdome.me", "OatmealDome's AltStore Source", true),
-            ("UTM Repository\nVirtual machines for iOS", "UTM Repository", false),
-            ("Flyinghead\nflyinghead.github.io/flycast-builds/altstore.json", "Flyinghead", false),
-//            ("PojavLauncher Repository\nalt.crystall1ne.dev", "PojavLauncher Repository", false),            // not a stable source, sometimes becomes unreachable, so disabled
-            ("PokeMMO\npokemmo.eu/altstore/", "PokeMMO", true),
-            ("Odyssey\ntheodyssey.dev/altstore/odysseysource.json", "Odyssey", false),
-            ("Yattee\nrepos.yattee.stream/alt/apps.json", "Yattee", false),
-            ("ThatStella7922 Source\nThe home for all apps ThatStella7922", "ThatStella7922 Source", false)
-        ]
-        
-        try performBulkAdd(app: app, sourceMappings: recommendedSources, cellsQuery: cellsQuery)
-    }
-    
-    private func performRepeatabilityForStagingRecommendedSources(for app: XCUIApplication) throws {
-        // Navigate to the Sources screen and open the Add Source view.
-        app.tabBars["Tab Bar"].buttons["Sources"].tap()
-        app.navigationBars["Sources"].buttons["Add"].tap()
-        
-        let cellsQuery = app.collectionViews.cells
-        
-        // Data model for recommended sources. NOTE: This list order is required to be the same as that of "Add Source" Screen
-        let recommendedSources: [(identifier: String, alertTitle: String, requiresSwipe: Bool)] = [
-            ("SideStore Team Picks\ncommunity-apps.sidestore.io/sidecommunity.json", "SideStore Team Picks", false),
-            ("Provenance EMU\nprovenance-emu.com/apps.json", "Provenance EMU", false),
-            ("Countdown Respository\nneoarz.github.io/Countdown-App/Countdown.json", "Countdown Respository", false),
-            ("OatmealDome's AltStore Source\naltstore.oatmealdome.me", "OatmealDome's AltStore Source", false),
-            ("UTM Repository\nVirtual machines for iOS", "UTM Repository", false),
-        ]
-        
-        let repeatCount = 3                                     // number of times to run the entire sequence
-        let timeSeed = UInt64(Date().timeIntervalSince1970)     // time is unique (upto microseconds) - uncomment this to use non-deterministic seed based RNG (random number generator)
-
-        try repeatabilityTest(app: app, sourceMappings: recommendedSources, cellsQuery: cellsQuery, repeatCount: repeatCount, seed: timeSeed)
-    }
 }
 
 

SideStore/Utils/common/BuildInfo.swift

@@ -0,0 +1,54 @@
+//
+//  BuildInfo.swift
+//  AltStore
+//
+//  Created by Magesh K on 23/03/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+import Foundation
+
+public class BuildInfo{
+    private static let MARKETING_VERSION_TAG        = "CFBundleShortVersionString"
+    private static let CURRENT_PROJECT_VERSION_TAG  = kCFBundleVersionKey as String
+    
+    private static let XCODE_VERSION_TAG  = "DTXcode"
+    private static let XCODE_REVISION_TAG = "DTXcodeBuild"
+
+    let bundle: Bundle
+    
+    public init(){
+        bundle = Bundle.main
+    }
+    
+    enum BundleError: Swift.Error {
+        case invalidURL
+    }
+
+    public init(url: URL) throws {
+        guard let bundle = Bundle(url: url) else {
+            throw BundleError.invalidURL
+        }
+        self.bundle = bundle
+    }
+
+    public lazy var project_version: String? = {
+        let version  = bundle.object(forInfoDictionaryKey: Self.CURRENT_PROJECT_VERSION_TAG) as? String
+        return version
+    }()
+
+    public lazy var marketing_version: String? = {
+        let version  = bundle.object(forInfoDictionaryKey: Self.MARKETING_VERSION_TAG) as? String
+        return version
+    }()
+
+    public lazy var xcode: String? = {
+        let xcode  = bundle.object(forInfoDictionaryKey: Self.XCODE_VERSION_TAG) as? String
+        return xcode
+    }()
+
+    public lazy var xcode_revision: String? = {
+        let revision  = bundle.object(forInfoDictionaryKey: Self.XCODE_REVISION_TAG) as? String
+        return revision
+    }()
+}

SideStore/Utils/importexport/ImportExport.swift

@@ -12,7 +12,7 @@ import AltStoreCore
 
 class ImportExport {
     
-    private static var documentPickerHandler: DocumentPickerHandler?
+    public static var documentPickerHandler: DocumentPickerHandler?
     
     public static func getPreviousBackupURL(_ backupURL: URL) -> URL {
         let backupParentDirectory = backupURL.deletingLastPathComponent()

SideStore/Utils/iostreams/ConsoleLogger.swift

@@ -59,48 +59,97 @@ public class AbstractConsoleLogger<T: OutputStream>: ConsoleLogger{
         originalStdout = dup(STDOUT_FILENO)
         originalStderr = dup(STDERR_FILENO)
         
+        let redirectedOutStream = self.outPipe?.fileHandleForWriting.fileDescriptor ?? -1
+        let redirectedErrStream = self.errPipe?.fileHandleForWriting.fileDescriptor ?? -1
+        
         // Redirect stdout and stderr to our pipes
-        dup2(self.outPipe?.fileHandleForWriting.fileDescriptor ?? -1, STDOUT_FILENO)
-        dup2(self.errPipe?.fileHandleForWriting.fileDescriptor ?? -1, STDERR_FILENO)
+        dup2(redirectedOutStream, STDOUT_FILENO)
+        dup2(redirectedErrStream, STDERR_FILENO)
 
+        // Disable libc-level buffering
+        // (libc by default uses bufferring except its own console/TTYs such as for pipes)
+        // we do have our own buffering so we disable stdlib io level bufferring
+        setvbuf(stdout, nil, _IONBF, 0)  // disable buffering for stdout
+        setvbuf(stderr, nil, _IONBF, 0)  // disable buffering for stderr
+        
         // Setup readability handlers for raw data
         setupReadabilityHandler(for: outputHandle, isError: false)
         setupReadabilityHandler(for: errorHandle, isError: true)
     }
 
+    let shutdownLock = NSLock()
+
     private func setupReadabilityHandler(for handle: FileHandle?, isError: Bool) {
-        handle?.readabilityHandler = { [weak self] handle in
-            let data = handle.availableData
-            if !data.isEmpty {
-                self?.writeQueue.async {
-                    try? self?.writeData(data)
-                }
-                
-                // Forward to original std stream
-                if let originalFD = isError ? self?.originalStderr : self?.originalStdout {
-                    data.withUnsafeBytes { (bufferPointer) -> Void in
-                        if let baseAddress = bufferPointer.baseAddress, bufferPointer.count > 0 {
-                            write(originalFD, baseAddress, bufferPointer.count)
-                        }
+        handle?.readabilityHandler = readHandler(isError: isError)
+    }
+
+    private func readHandler(isError: Bool) -> (FileHandle) -> Void {
+        return { [weak self] _ in
+            // Lock first before touching anything
+            self?.shutdownLock.lock()
+            defer { self?.shutdownLock.unlock() }
+
+            // Capture strong self *after* lock is acquired
+            guard let self = self else { return }
+            
+            let handle = isError ? self.errorHandle : self.outputHandle
+            guard let data = handle?.availableData else { return }
+
+            writeQueue.async {
+                try? self.writeData(data)
+            }
+
+            // 2. Echo to original stdout/stderr if still valid
+            guard let fd = isError ? self.originalStderr : self.originalStdout else {
+                return
+            }
+
+            let appName = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as? String ?? "UnknownApp"
+            guard fcntl(fd, F_GETFD) != -1 else {
+                NSLog("[%@] ConsoleLogger: Original FD (%d) is invalid, skipping echo", appName, fd)
+                return
+            }
+
+            data.withUnsafeBytes { rawBufferPointer in
+                guard let base = rawBufferPointer.baseAddress else { return }
+                var remaining = data.count
+                var offset = 0
+                let maxChunkSize = 16 * 1024 // 16 KB chunks
+
+                // write in chunks, else will throw 'Result too large'
+                while remaining > 0 {
+                    let chunkSize = min(maxChunkSize, remaining)
+                    let written = write(fd, base.advanced(by: offset), chunkSize)
+
+                    if written < 0 {
+                        NSLog("[%@] ConsoleLogger: Failed to re-echo to FD %d: %s", appName, fd, strerror(errno))
+                        break
                     }
+
+                    remaining -= written
+                    offset += written
                 }
             }
         }
     }
+
     
     func writeData(_ data: Data) throws {
         throw AbstractClassError.abstractMethodInvoked
     }
 
     func stopCapturing() {
+        shutdownLock.lock()
+        defer { shutdownLock.unlock() }
+
         ostream.close()
         
         // Restore original stdout and stderr
-        if let stdout = originalStdout {
+        if let stdout = originalStdout, stdout != STDOUT_FILENO {
             dup2(stdout, STDOUT_FILENO)
             close(stdout)
         }
-        if let stderr = originalStderr {
+        if let stderr = originalStderr, stderr != STDERR_FILENO {
             dup2(stderr, STDERR_FILENO)
             close(stderr)
         }

SideStore/Views/UIKit/CollapsingMarkdownView.swift

@@ -0,0 +1,301 @@
+//
+//  CollapsingMarkdownView.swift
+//  AltStore
+//
+//  Created by Magesh K on 27/02/25.
+//  Copyright © 2025 SideStore. All rights reserved.
+//
+
+
+import UIKit
+import MarkdownKit
+
+struct MarkdownManager
+{
+    struct Fonts{
+        static let body: UIFont     = .systemFont(ofSize: UIFont.systemFontSize)
+//        static let body: UIFont     = .systemFont(ofSize: UIFont.labelFontSize)
+        
+        static let header: UIFont   = .boldSystemFont(ofSize: 14)
+        static let list: UIFont     = .systemFont(ofSize: 14)
+        static let bold: UIFont     = .boldSystemFont(ofSize: 14)
+        static let italic: UIFont   = .italicSystemFont(ofSize: 14)
+        static let quote: UIFont    = .italicSystemFont(ofSize: 14)
+    }
+    
+    struct Color{
+        static let header = UIColor { traitCollection in
+            traitCollection.userInterfaceStyle == .dark ? UIColor.white : UIColor.black
+        }
+        static let bold = UIColor { traitCollection in
+            traitCollection.userInterfaceStyle == .dark ? UIColor.lightText : UIColor.darkText
+        }
+    }
+    
+    static var enabledElements: MarkdownParser.EnabledElements {
+        [
+            .header,
+            .list,
+            .quote,
+            .code,
+            .link,
+            .bold,
+            .italic,
+        ]
+    }
+    
+    var markdownParser: MarkdownParser {
+        MarkdownParser(
+            font: Self.Fonts.body,
+            color: Self.Color.bold
+        )
+    }
+}
+final class CollapsingMarkdownView: UIView {
+    /// Called when the collapse state toggles.
+    var didToggleCollapse: (() -> Void)?
+    
+    // MARK: - Properties
+    var isCollapsed = true {
+        didSet {
+            guard self.isCollapsed != oldValue else { return }
+            self.updateCollapsedState()
+        }
+    }
+    
+    var maximumNumberOfLines = 3 {
+        didSet {
+            self.checkIfNeedsCollapsing()
+            self.updateCollapsedState()
+            self.setNeedsLayout()
+        }
+    }
+    
+    var text: String = "" {
+        didSet {
+            self.updateMarkdownContent()
+            self.setNeedsLayout()
+        }
+    }
+    
+    var lineSpacing: Double = 2 {
+        didSet {
+            self.setNeedsLayout()
+        }
+    }
+    
+    let toggleButton = UIButton(type: .system)
+    
+    private let textView = UITextView()
+    private let markdownParser = MarkdownManager().markdownParser
+    
+    private var previousSize: CGSize?
+    private var actualLineCount: Int = 0
+    private var needsCollapsing = false
+    
+    // MARK: - Initialization
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initialize()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        initialize()
+    }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        initialize()
+    }
+    
+    private func checkIfNeedsCollapsing() {
+        guard bounds.width > 0, let font = textView.font, font.lineHeight > 0 else {
+            needsCollapsing = false
+            return
+        }
+        
+        // Calculate the number of lines in the text
+        let textSize = textView.sizeThatFits(CGSize(width: bounds.width, height: .greatestFiniteMagnitude))
+        let lineHeight = font.lineHeight
+        
+        // Safely calculate actual line count
+        actualLineCount = max(1, Int(ceil(textSize.height / lineHeight)))
+        
+        // Only needs collapsing if actual lines exceed the maximum
+        needsCollapsing = actualLineCount > maximumNumberOfLines
+        
+        // Update button visibility
+        toggleButton.isHidden = !needsCollapsing
+    }
+    
+    private func updateCollapsedState() {
+        // Disable animations for this update
+        UIView.performWithoutAnimation {
+            // Update the button title
+            let title = isCollapsed ? NSLocalizedString("More", comment: "") : NSLocalizedString("Less", comment: "")
+            toggleButton.setTitle(title, for: .normal)
+            
+            // Set max lines based on collapsed state
+            if isCollapsed && needsCollapsing {
+                textView.textContainer.maximumNumberOfLines = maximumNumberOfLines
+            } else {
+                textView.textContainer.maximumNumberOfLines = 0
+            }
+            
+            // Button is only visible if content needs collapsing
+            toggleButton.isHidden = !needsCollapsing
+            
+            // Force layout updates
+            textView.layoutIfNeeded()
+            self.layoutIfNeeded()
+            self.invalidateIntrinsicContentSize()
+        }
+    }
+    
+    private func initialize() {
+        // Configure text view
+        textView.isEditable = false
+        textView.isScrollEnabled = false
+        textView.textContainerInset = .zero
+        textView.textContainer.lineFragmentPadding = 0
+        textView.textContainer.lineBreakMode = .byTruncatingTail
+        textView.backgroundColor = .clear
+
+        // Make textView selectable to enable link interactions
+        textView.isSelectable = true
+        textView.delegate = self
+        
+        // Important: This prevents selection handles from appearing
+        textView.dataDetectorTypes = .link
+    
+        // Configure markdown parser
+        configureMarkdownParser()
+        
+        // Add subviews
+        addSubview(textView)
+        
+        // Configure toggle button
+        toggleButton.addTarget(self, action: #selector(toggleCollapsed(_:)), for: .primaryActionTriggered)
+        addSubview(toggleButton)
+        
+        setNeedsLayout()
+    }
+
+    private func configureMarkdownParser() {
+        // Configure markdown parser with desired settings
+        markdownParser.enabledElements = MarkdownManager.enabledElements
+        
+        // You can also customize the styling if needed
+        markdownParser.header.font = MarkdownManager.Fonts.header
+        markdownParser.list.font = MarkdownManager.Fonts.list
+        markdownParser.bold.font = MarkdownManager.Fonts.bold
+        markdownParser.italic.font = MarkdownManager.Fonts.italic
+        markdownParser.quote.font = MarkdownManager.Fonts.quote
+        
+        markdownParser.header.color = MarkdownManager.Color.header
+        markdownParser.bold.color =  MarkdownManager.Color.bold
+        markdownParser.list.color =  MarkdownManager.Color.bold
+    }
+    
+    // MARK: - Layout
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        UIView.performWithoutAnimation {
+            // Calculate button height (for spacing)
+            let buttonHeight = toggleButton.sizeThatFits(CGSize(width: 1000, height: 1000)).height
+            
+            // Set textView frame to leave space for button
+            textView.frame = CGRect(
+                x: 0,
+                y: 0,
+                width: bounds.width,
+                height: bounds.height - buttonHeight
+            )
+            
+            // Check if layout changed
+            if previousSize?.width != bounds.width {
+                checkIfNeedsCollapsing()
+                updateCollapsedState()
+                previousSize = bounds.size
+            }
+            
+            // Position toggle button at bottom right
+            let buttonSize = toggleButton.sizeThatFits(CGSize(width: 1000, height: 1000))
+            toggleButton.frame = CGRect(
+                x: bounds.width - buttonSize.width,
+                y: textView.frame.maxY,
+                width: buttonSize.width,
+                height: buttonHeight
+            )
+        }
+    }
+    
+    @objc private func toggleCollapsed(_ sender: UIButton) {
+        isCollapsed.toggle()
+        didToggleCollapse?()
+    }
+
+    override var intrinsicContentSize: CGSize {
+        guard bounds.width > 0, let font = textView.font, font.lineHeight > 0 else {
+            return CGSize(width: UIView.noIntrinsicMetric, height: 0)
+        }
+        
+        let lineHeight = font.lineHeight
+        let buttonHeight = toggleButton.sizeThatFits(CGSize(width: 1000, height: 1000)).height
+        
+        // Always add button height to reserve space for it
+        if isCollapsed && needsCollapsing {
+            // When collapsed and needs collapsing, use maximumNumberOfLines
+            let collapsedHeight = lineHeight * CGFloat(maximumNumberOfLines) + 
+                             lineSpacing * CGFloat(max(0, maximumNumberOfLines - 1))
+            return CGSize(width: UIView.noIntrinsicMetric, height: collapsedHeight + buttonHeight)
+        } else if !needsCollapsing {
+            // Text is shorter than max lines - use actual text height
+            let textSize = textView.sizeThatFits(CGSize(width: bounds.width, height: .greatestFiniteMagnitude))
+            return CGSize(width: UIView.noIntrinsicMetric, height: textSize.height + buttonHeight)
+        } else {
+            // When expanded and needs collapsing, use full text height plus button
+            let textSize = textView.sizeThatFits(CGSize(width: bounds.width, height: .greatestFiniteMagnitude))
+            return CGSize(width: UIView.noIntrinsicMetric, height: textSize.height + buttonHeight)
+        }
+    }
+
+    // MARK: - Markdown Processing
+    private func updateMarkdownContent() {
+        let attributedString = markdownParser.parse(text)
+        
+        // Apply line spacing
+        let mutableAttributedString = NSMutableAttributedString(attributedString: attributedString)
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = lineSpacing
+        
+        mutableAttributedString.addAttribute(
+            .paragraphStyle,
+            value: paragraphStyle,
+            range: NSRange(location: 0, length: mutableAttributedString.length)
+        )
+        
+        textView.attributedText = mutableAttributedString
+        
+        // Check if content needs collapsing after setting text
+        checkIfNeedsCollapsing()
+        updateCollapsedState()
+    }
+}
+
+extension CollapsingMarkdownView: UITextViewDelegate {
+    // This enables tapping on links while preventing text selection
+    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        // Open the URL using UIApplication
+        UIApplication.shared.open(URL)
+        return false // Return false to prevent the default behavior
+    }
+    
+    // This prevents text selection
+    func textViewDidChangeSelection(_ textView: UITextView) {
+        textView.selectedTextRange = nil
+    }
+}

SideStore/em_proxy.xcodeproj/xcshareddata/xcschemes/em_proxy.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
+               BuildableName = "libem_proxy_static.a"
+               BlueprintName = "em_proxy-staticlib"
+               ReferencedContainer = "container:em_proxy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
+            BuildableName = "libem_proxy_static.a"
+            BlueprintName = "em_proxy-staticlib"
+            ReferencedContainer = "container:em_proxy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

SideStore/minimuxer.xcodeproj/xcshareddata/xcschemes/minimuxer.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CA609C732349A560B9642892"
+               BuildableName = "libminimuxer_static.a"
+               BlueprintName = "minimuxer-staticlib"
+               ReferencedContainer = "container:minimuxer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA609C732349A560B9642892"
+            BuildableName = "libminimuxer_static.a"
+            BlueprintName = "minimuxer-staticlib"
+            ReferencedContainer = "container:minimuxer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

trustedapps.json

@@ -8,6 +8,22 @@
       "identifier": "com.sidestoreapps.community",
       "sourceURL": "https://community-apps.sidestore.io/sidecommunity.json"
     },
+    {
+      "identifier": "com.stik.stikdebug",
+      "sourceURL": "https://stikdebug.xyz/index.json"
+    },
+    {
+      "identifier": "com.livecontainer.source",
+      "sourceURL": "https://raw.githubusercontent.com/LiveContainer/LiveContainer/refs/heads/main/apps.json"
+    },
+    {
+      "identifier": "com.aoshuang.manicemu",
+      "sourceURL": "https://apps.manicemu.site/altstore"
+    },
+    {
+      "identifier": "com.stossy11.MeloNX",
+      "sourceURL": "https://git.ryujinx.app/melonx/emu/-/raw/XC-ios-ht/source.json"
+    },
     {
       "identifier": "org.provenance-emu.provenance",
       "sourceURL": "https://provenance-emu.com/apps.json"
@@ -25,11 +41,7 @@
       "sourceURL": "https://alt.getutm.app"
     },
     {
-      "identifier": "com.flyinghead.source",
-      "sourceURL": "https://flyinghead.github.io/flycast-builds/altstore.json"
-    },
-    {
-      "identifier": "dev.crystall1ne.repos.PojavLauncher",
+      "identifier": "dev.crystall1ne.alt",
       "sourceURL": "https://alt.crystall1ne.dev"
     },
     {
@@ -61,6 +73,22 @@
       "identifier": "com.sidestoreapps.community",
       "sourceURL": "https://community-apps.sidestore.io/sidecommunity.json"
     },
+    {
+      "identifier": "com.stik.stikdebug",
+      "sourceURL": "https://stikdebug.xyz/index.json"
+    },
+    {
+      "identifier": "com.livecontainer.source",
+      "sourceURL": "https://raw.githubusercontent.com/LiveContainer/LiveContainer/refs/heads/main/apps.json"
+    },
+    {
+      "identifier": "com.aoshuang.manicemu",
+      "sourceURL": "https://apps.manicemu.site/altstore"
+    },
+    {
+      "identifier": "com.stossy11.MeloNX",
+      "sourceURL": "https://git.ryujinx.app/melonx/emu/-/raw/XC-ios-ht/source.json"
+    },
     {
       "identifier": "org.provenance-emu.provenance",
       "sourceURL": "https://provenance-emu.com/apps.json"
@@ -78,11 +106,7 @@
       "sourceURL": "https://alt.getutm.app"
     },
     {
-      "identifier": "com.flyinghead.source",
-      "sourceURL": "https://flyinghead.github.io/flycast-builds/altstore.json"
-    },
-    {
-      "identifier": "dev.crystall1ne.repos.PojavLauncher",
+      "identifier": "dev.crystall1ne.alt",
       "sourceURL": "https://alt.crystall1ne.dev"
     },
     {

update_release_notes.py

@@ -5,7 +5,7 @@ import os
 import re
 
 IGNORED_AUTHORS = [
-    "=",        # probably someone used an equalTo ?!  # anyway we are ignoring it!
+
 ]
 
 TAG_MARKER = "###"
@@ -82,7 +82,7 @@ def format_commit_message(msg):
         msg_clean = msg_clean[1:].strip()  # remove leading '-' and spaces
     return f"- {msg_clean}"
 
-def generate_release_notes(last_successful, tag, branch):
+# def generate_release_notes(last_successful, tag, branch):
     """Generate release notes for the given tag."""
     current_commit = get_head_commit()
     messages = get_commit_messages(last_successful, current_commit)
@@ -117,6 +117,50 @@ def generate_release_notes(last_successful, tag, branch):
     
     return new_section
 
+def generate_release_notes(last_successful, tag, branch):
+    """Generate release notes for the given tag."""
+    current_commit = get_head_commit()
+    try:
+        # Try to get commit messages using the provided last_successful commit
+        messages = get_commit_messages(last_successful, current_commit)
+    except subprocess.CalledProcessError:
+        # If the range is invalid (e.g. force push made last_successful obsolete),
+        # fall back to using the last 10 commits in the current branch.
+        print("\nInvalid revision range error, using last 10 commits as fallback.\n")
+        fallback_commit = run_command("git rev-parse HEAD~5")
+        messages = get_commit_messages(fallback_commit, current_commit)
+        last_successful = fallback_commit
+
+    # Start with the tag header
+    new_section = f"{TAG_MARKER} {tag}\n"
+
+    # What's Changed section (always present)
+    new_section += f"{HEADER_MARKER} What's Changed\n"
+    
+    if not messages or last_successful == current_commit:
+        new_section += "- Nothing...\n"
+    else:
+        for msg in messages:
+            new_section += f"{format_commit_message(msg)}\n"
+    
+    # New Contributors section (only if there are new contributors)
+    all_previous_authors = get_authors_in_range(f"{branch}")
+    recent_authors = get_authors_in_range(f"{last_successful}..{current_commit}")
+    new_contributors = recent_authors - all_previous_authors
+    
+    if new_contributors:
+        new_section += f"\n{HEADER_MARKER} New Contributors\n"
+        for author in sorted(new_contributors):
+            new_section += f"- {format_contributor(author)} made their first contribution\n"
+    
+    # Full Changelog section (only if there are changes)
+    if messages and last_successful != current_commit:
+        repo_url = get_repo_url()
+        changelog_link = f"{repo_url}/compare/{last_successful}...{current_commit}"
+        new_section += f"\n{HEADER_MARKER} Full Changelog: [{last_successful[:8]}...{current_commit[:8]}]({changelog_link})\n"
+    
+    return new_section
+
 def update_release_md(existing_content, new_section, tag):
     """
     Update input based on rules:
@@ -334,4 +378,4 @@ def main():
     print(new_section)
 
 if __name__ == "__main__":
-    main()
+    main()

xcconfigs/AltBackup.xcconfig

@@ -1,3 +1,6 @@
 #include "../Build.xcconfig"
 
-PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltBackup
+PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_IDENTIFIER).SideStore.AltBackup. //$(DEVELOPMENT_TEAM)
+//PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_IDENTIFIER).SideStore.AltBackup
+//PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_IDENTIFIER).SideStore.AltBackup
+PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_IDENTIFIER).SideStore.AltBackup

xcconfigs/AltStoreCore.xcconfig

@@ -2,5 +2,4 @@
 
 // Since AltStoreCore is unsigned or the team is not configured, we re-define the bundle ID here to not have extra '.'
 // This bundle ID doesn't need to change since altStoreCore framework lives inside SideStore main app's address space and won't have conflicts with other instances
-BUNDLE_ID = $(ORG_PREFIX).SideStore
-PRODUCT_BUNDLE_IDENTIFIER = $(BUNDLE_ID).AltStoreCore
+PRODUCT_BUNDLE_IDENTIFIER = $(ORG_IDENTIFIER).SideStore.AltStoreCore

xcconfigs/AltWidgetExtension.xcconfig

@@ -1,3 +1,4 @@
 #include "../Build.xcconfig"
 
-PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltWidget
+PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_IDENTIFIER).SideStore.$(DEVELOPMENT_TEAM).AltWidget
+PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_IDENTIFIER).SideStore.AltWidget

xcconfigs/DataStructureTests.xcconfig

@@ -0,0 +1,3 @@
+#include "../Build.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).DataStructureTests