Switch to apps.sidestore.io

- Show SideStore in Browse if it's not from the current SideStore source
- Change SideStore source URL and source ID based on if beta and nightly are in the version string
- Use StoreApp name for InstalledApp name to allow for source-specified name to show up in My Apps

.github/CODEOWNERS

@@ -1 +1 @@
-*       @JoeMatt @lonkelle
+*       @JoeMatt @lonkelle @nythepegasus @Spidy123222 @SternXD

.github/workflows/stable.yml

@@ -3,6 +3,7 @@ on:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0
+  workflow_dispatch:
 
 jobs:
   build:

.gitmodules

@@ -9,7 +9,7 @@
 	url = https://github.com/libimobiledevice/libusbmuxd.git
 [submodule "Dependencies/libplist"]
 	path = Dependencies/libplist
-	url = https://github.com/libimobiledevice/libplist.git
+	url = https://github.com/SideStore/libplist.git
 [submodule "Dependencies/MarkdownAttributedString"]
 	path = Dependencies/MarkdownAttributedString
 	url = https://github.com/chockenberry/MarkdownAttributedString.git

AltStore.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -332,6 +332,7 @@
 		D57FE84428C7DB7100216002 /* ErrorLogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57FE84328C7DB7100216002 /* ErrorLogViewController.swift */; };
 		D58916FE28C7C55C00E39C8B /* LoggedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58916FD28C7C55C00E39C8B /* LoggedError.swift */; };
 		D593F1942717749A006E82DE /* PatchAppOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D593F1932717749A006E82DE /* PatchAppOperation.swift */; };
+		D5ACE84528E3B8450021CAB9 /* ClearAppCacheOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACE84428E3B8450021CAB9 /* ClearAppCacheOperation.swift */; };
 		D5CA0C4B280E141900469595 /* ManagedPatron.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5CA0C4A280E141900469595 /* ManagedPatron.swift */; };
 		D5CA0C4E280E249E00469595 /* AltStore9ToAltStore10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = D5CA0C4D280E249E00469595 /* AltStore9ToAltStore10.xcmappingmodel */; };
 		D5DAE0942804B0B80034D8D4 /* ScreenshotProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5DAE0932804B0B80034D8D4 /* ScreenshotProcessor.swift */; };
@@ -533,7 +534,7 @@
 		0EA166652ADFE122003015C1 /* hashtable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = hashtable.h; path = Dependencies/libplist/src/hashtable.h; sourceTree = SOURCE_ROOT; };
 		0EA166662ADFE122003015C1 /* base64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Dependencies/libplist/src/base64.h; sourceTree = SOURCE_ROOT; };
 		0EA166672ADFE122003015C1 /* strbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = Dependencies/libplist/src/strbuf.h; sourceTree = SOURCE_ROOT; };
-		0EA4B9BB2AE4A3F6009209CE /* plist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = plist.c; path = Dependencies/Custom/libplist/src/plist.c; sourceTree = SOURCE_ROOT; };
+		0EA4B9BB2AE4A3F6009209CE /* plist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = plist.c; path = Dependencies/libplist/src/plist.c; sourceTree = SOURCE_ROOT; };
 		19104DB22909C06C00C49C7B /* libEmotionalDamage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEmotionalDamage.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = "<group>"; };
 		191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -839,6 +840,7 @@
 		D57FE84328C7DB7100216002 /* ErrorLogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorLogViewController.swift; sourceTree = "<group>"; };
 		D58916FD28C7C55C00E39C8B /* LoggedError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedError.swift; sourceTree = "<group>"; };
 		D593F1932717749A006E82DE /* PatchAppOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchAppOperation.swift; sourceTree = "<group>"; };
+		D5ACE84428E3B8450021CAB9 /* ClearAppCacheOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClearAppCacheOperation.swift; sourceTree = "<group>"; };
 		D5CA0C4A280E141900469595 /* ManagedPatron.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManagedPatron.swift; sourceTree = "<group>"; };
 		D5CA0C4C280E242500469595 /* AltStore 10.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "AltStore 10.xcdatamodel"; sourceTree = "<group>"; };
 		D5CA0C4D280E249E00469595 /* AltStore9ToAltStore10.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = AltStore9ToAltStore10.xcmappingmodel; sourceTree = "<group>"; };
@@ -1697,6 +1699,7 @@
 				D57F2C9026E0070200B9FA39 /* EnableJITOperation.swift */,
 				D5DAE0952804DF430034D8D4 /* UpdatePatronsOperation.swift */,
 				D5E1E7C028077DE90016FC96 /* FetchTrustedSourcesOperation.swift */,
+				D5ACE84428E3B8450021CAB9 /* ClearAppCacheOperation.swift */,
 				BF7B44062725A4B8005288A4 /* Patch App */,
 			);
 			path = Operations;
@@ -2504,6 +2507,7 @@
 				BFD6B03322DFF20800B86064 /* MyAppsComponents.swift in Sources */,
 				BF41B808233433C100C593A3 /* LoadingState.swift in Sources */,
 				BFF0B69A2322D7D0007A79E1 /* UIScreen+CompactHeight.swift in Sources */,
+				D5ACE84528E3B8450021CAB9 /* ClearAppCacheOperation.swift in Sources */,
 				D5F2F6A92720B7C20081CCF5 /* PatchViewController.swift in Sources */,
 				B39F16132918D7C5002E9404 /* Consts.swift in Sources */,
 				BF8F69C222E659F700049BA1 /* AppContentViewController.swift in Sources */,
@@ -2851,11 +2855,6 @@
 				PRODUCT_NAME = imobiledevice;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SYSTEM_HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/Dependencies/AltSign/Dependencies\"",
-					"\"$(SRCROOT)/Dependencies/libplist/include\"",
-					"\"$(SRCROOT)/Dependencies/libplist/libcnary/include\"",
-				);
 			};
 			name = Debug;
 		};
@@ -2896,11 +2895,6 @@
 				PRODUCT_NAME = imobiledevice;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SYSTEM_HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/Dependencies/AltSign/Dependencies\"",
-					"\"$(SRCROOT)/Dependencies/libplist/include\"",
-					"\"$(SRCROOT)/Dependencies/libplist/libcnary/include\"",
-				);
 			};
 			name = Release;
 		};

AltStore/App IDs/AppIDsViewController.swift

@@ -90,14 +90,21 @@ private extension AppIDsViewController
                 cell.bannerView.button.isUserInteractionEnabled = false
                 
                 cell.bannerView.buttonLabel.isHidden = false
-                
+
                 let currentDate = Date()
                 
-                let numberOfDays = expirationDate.numberOfCalendarDays(since: currentDate)
-                let numberOfDaysText = (numberOfDays == 1) ? NSLocalizedString("1 day", comment: "") : String(format: NSLocalizedString("%@ days", comment: ""), NSNumber(value: numberOfDays))
-                cell.bannerView.button.setTitle(numberOfDaysText.uppercased(), for: .normal)
+                let formatter = DateComponentsFormatter()
+                formatter.unitsStyle = .full
+                formatter.includesApproximationPhrase = false
+                formatter.includesTimeRemainingPhrase = false
+                formatter.allowedUnits = [.minute, .hour, .day]
+                formatter.maximumUnitCount = 1
                 
-                attributedAccessibilityLabel.mutableString.append(String(format: NSLocalizedString("Expires in %@.", comment: ""), numberOfDaysText) + " ")
+                cell.bannerView.button.setTitle((formatter.string(from: currentDate, to: expirationDate) ?? NSLocalizedString("Unknown", comment: "")).uppercased(), for: .normal)
+                
+                // formatter.includesTimeRemainingPhrase = true
+                
+                // attributedAccessibilityLabel.mutableString.append((formatter.string(from: currentDate, to: expirationDate) ?? NSLocalizedString("Unknown", comment: "")) + " ")
             }
             else
             {

AltStore/Browse/BrowseViewController.swift

@@ -78,7 +78,7 @@ private extension BrowseViewController
                                         NSSortDescriptor(keyPath: \StoreApp.name, ascending: true),
                                         NSSortDescriptor(keyPath: \StoreApp.bundleIdentifier, ascending: true)]
         fetchRequest.returnsObjectsAsFaults = false
-        fetchRequest.predicate = NSPredicate(format: "%K != %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID)
+        fetchRequest.predicate = NSPredicate(format: "%K != %@", #keyPath(StoreApp.sourceIdentifier), Source.altStoreIdentifier)
         
         let dataSource = RSTFetchedResultsCollectionViewPrefetchingDataSource<StoreApp, UIImage>(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext)
         dataSource.cellConfigurationHandler = { (cell, app, indexPath) in

AltStore/LaunchViewController.swift

@@ -81,7 +81,7 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         } else {
             // Show an alert explaining the pairing file
             // Create new Alert
-            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/install#pairing-process", preferredStyle: .alert)
+            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/getting-started/#pairing-file", preferredStyle: .alert)
             
             // Create OK button with action handler
             let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in

AltStore/Managing Apps/AppManager.swift

@@ -307,6 +307,16 @@ extension AppManager
             presentingViewController.present(alertController, animated: true, completion: nil)
         }
     }
+    
+    func clearAppCache(completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        let clearAppCacheOperation = ClearAppCacheOperation()
+        clearAppCacheOperation.resultHandler = { result in
+            completion(result)
+        }
+        
+        self.run([clearAppCacheOperation], context: nil)
+    }
 }
 
 extension AppManager
@@ -754,6 +764,12 @@ extension AppManager
         let progress = self.refreshProgress[app.bundleIdentifier]
         return progress
     }
+    
+    func isActivelyManagingApp(withBundleID bundleID: String) -> Bool
+    {
+        let isActivelyManaging = self.installationProgress.keys.contains(bundleID) || self.refreshProgress.keys.contains(bundleID)
+        return isActivelyManaging
+    }
 }
 
 extension AppManager
@@ -808,12 +824,6 @@ private extension AppManager
         }
     }
     
-    func isActivelyManagingApp(withBundleID bundleID: String) -> Bool
-    {
-        let isActivelyManaging = self.installationProgress.keys.contains(bundleID) || self.refreshProgress.keys.contains(bundleID)
-        return isActivelyManaging
-    }
-    
     @discardableResult
     private func perform(_ operations: [AppOperation], presentingViewController: UIViewController?, group: RefreshGroup) -> RefreshGroup
     {
@@ -948,7 +958,13 @@ private extension AppManager
         }
         else
         {
+            DispatchQueue.main.schedule {
+                UIApplication.shared.isIdleTimerDisabled = UserDefaults.standard.isIdleTimeoutDisableEnabled
+            }
             performAppOperations()
+            DispatchQueue.main.schedule {
+                UIApplication.shared.isIdleTimerDisabled = false
+            }
         }
         
         return group

AltStore/My Apps/MyAppsViewController.swift

@@ -329,21 +329,25 @@ private extension MyAppsViewController
             let currentDate = Date()
             
             let numberOfDays = installedApp.expirationDate.numberOfCalendarDays(since: currentDate)
-            let numberOfDaysText: String
             
-            if numberOfDays == 1
-            {
-                numberOfDaysText = NSLocalizedString("1 day", comment: "")
-            }
-            else
-            {
-                numberOfDaysText = String(format: NSLocalizedString("%@ days", comment: ""), NSNumber(value: numberOfDays))
-            }
+            let formatter = DateComponentsFormatter()
+            formatter.unitsStyle = .full
+            formatter.includesApproximationPhrase = false
+            formatter.includesTimeRemainingPhrase = false
+            
+            formatter.allowedUnits = [.day, .hour, .minute]
+            
+            formatter.maximumUnitCount = 1
+            
+            
+            
+            cell.bannerView.button.setTitle(formatter.string(from: currentDate, to: installedApp.expirationDate)?.uppercased(), for: .normal)
             
-            cell.bannerView.button.setTitle(numberOfDaysText.uppercased(), for: .normal)
             cell.bannerView.button.accessibilityLabel = String(format: NSLocalizedString("Refresh %@", comment: ""), installedApp.name)
-            
-            cell.bannerView.accessibilityLabel? += ". " + String(format: NSLocalizedString("Expires in %@", comment: ""), numberOfDaysText)
+
+            formatter.includesTimeRemainingPhrase = true
+
+            cell.bannerView.accessibilityLabel? += ". " + (formatter.string(from: currentDate, to: installedApp.expirationDate) ?? NSLocalizedString("Unknown", comment: "")) + " "
             
             // Make sure refresh button is correct size.
             cell.layoutIfNeeded()

AltStore/Operations/AuthenticationOperation.swift

@@ -12,6 +12,7 @@ import Network
 
 import AltStoreCore
 import AltSign
+import minimuxer
 
 enum AuthenticationError: LocalizedError
 {
@@ -593,7 +594,7 @@ private extension AuthenticationOperation
     
     func registerCurrentDevice(for team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTDevice, Error>) -> Void)
     {
-        guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else {
+        guard let udid = fetch_udid()?.toString() else {
             return completionHandler(.failure(OperationError.unknownUDID))
         }
         

AltStore/Operations/ClearAppCacheOperation.swift

@@ -0,0 +1,208 @@
+//
+//  ClearAppCacheOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 9/27/22.
+//  Copyright © 2022 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import AltStoreCore
+/*
+struct BatchError: ALTLocalizedError
+{
+
+    enum Code: Int, ALTErrorCode
+    {
+        typealias Error = BatchError
+        
+        case batchError
+    }
+
+    var code: Code = .batchError
+    var underlyingErrors: [Error]
+    
+    var errorTitle: String?
+    var errorFailure: String?
+    
+    init(errors: [Error])
+    {
+        self.underlyingErrors = errors
+    }
+    
+    var errorFailureReason: String {
+        guard !self.underlyingErrors.isEmpty else { return NSLocalizedString("An unknown error occured.", comment: "") }
+        
+        let errorMessages = self.underlyingErrors.map { $0.localizedDescription }
+        
+        let message = errorMessages.joined(separator: "\n\n")
+        return message
+    }
+}
+*/
+@objc(ClearAppCacheOperation)
+class ClearAppCacheOperation: ResultOperation<Void>
+{
+    private let coordinator = NSFileCoordinator()
+    private let coordinatorQueue = OperationQueue()
+    
+    override init()
+    {
+        self.coordinatorQueue.name = "AltStore - ClearAppCacheOperation Queue"
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        var allErrors = [Error]()
+        
+        self.clearTemporaryDirectory { result in
+            switch result
+            {
+            //case .failure(let batchError as BatchError): allErrors.append(contentsOf: batchError.underlyingErrors)
+            case .failure(let error): allErrors.append(error)
+            case .success: break
+            }
+            
+            self.removeUninstalledAppBackupDirectories { result in
+                switch result
+                {
+                //case .failure(let batchError as BatchError): allErrors.append(contentsOf: batchError.underlyingErrors)
+                case .failure(let error): allErrors.append(error)
+                case .success: break
+                }
+                
+                if allErrors.isEmpty
+                {
+                    self.finish(.success(()))
+                }
+                else
+                {
+                    self.finish(.failure(OperationError.cacheClearError(errors: allErrors.map({ error in
+                        return error.localizedDescription
+                    }))))
+                }
+            }
+        }
+    }
+}
+
+private extension ClearAppCacheOperation
+{
+    func clearTemporaryDirectory(completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        let intent = NSFileAccessIntent.writingIntent(with: FileManager.default.temporaryDirectory, options: [.forDeleting])
+        self.coordinator.coordinate(with: [intent], queue: self.coordinatorQueue) { (error) in
+            do
+            {
+                if let error
+                {
+                    throw error
+                }
+                
+                let fileURLs = try FileManager.default.contentsOfDirectory(at: intent.url,
+                                                                           includingPropertiesForKeys: [],
+                                                                           options: [.skipsSubdirectoryDescendants, .skipsHiddenFiles])
+                var errors = [Error]()
+                
+                for fileURL in fileURLs
+                {
+                    do
+                    {
+                        print("[ALTLog] Removing item from temporary directory:", fileURL.lastPathComponent)
+                        try FileManager.default.removeItem(at: fileURL)
+                    }
+                    catch
+                    {
+                        print("[ALTLog] Failed to remove \(fileURL.lastPathComponent) from temporary directory.", error)
+                        errors.append(error)
+                    }
+                }
+                
+                if !errors.isEmpty
+                {
+                    completion(.failure(OperationError.cacheClearError(errors: errors.map({ error in
+                        return error.localizedDescription
+                    }))))
+                }
+                else
+                {
+                    completion(.success(()))
+                }
+            }
+            catch
+            {
+                completion(.failure(error))
+            }
+        }
+    }
+    
+    func removeUninstalledAppBackupDirectories(completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        guard let backupsDirectory = FileManager.default.appBackupsDirectory else { return completion(.failure(OperationError.missingAppGroup)) }
+        
+        DatabaseManager.shared.persistentContainer.performBackgroundTask { context in
+            let installedAppBundleIDs = Set(InstalledApp.all(in: context).map { $0.bundleIdentifier })
+            
+            let intent = NSFileAccessIntent.writingIntent(with: backupsDirectory, options: [.forDeleting])
+            self.coordinator.coordinate(with: [intent], queue: self.coordinatorQueue) { (error) in
+                do
+                {
+                    if let error
+                    {
+                        throw error
+                    }
+                    
+                    var isDirectory: ObjCBool = false
+                    guard FileManager.default.fileExists(atPath: intent.url.path, isDirectory: &isDirectory), isDirectory.boolValue else {
+                        completion(.success(()))
+                        return
+                    }
+                    
+                    let fileURLs = try FileManager.default.contentsOfDirectory(at: intent.url,
+                                                                               includingPropertiesForKeys: [.isDirectoryKey, .nameKey],
+                                                                               options: [.skipsSubdirectoryDescendants, .skipsHiddenFiles])
+                    var errors = [Error]()
+                    
+                    
+                    for backupDirectory in fileURLs
+                    {
+                        do
+                        {
+                            let resourceValues = try backupDirectory.resourceValues(forKeys: [.isDirectoryKey, .nameKey])
+                            guard let isDirectory = resourceValues.isDirectory, let bundleID = resourceValues.name else { continue }
+
+                            if isDirectory && !installedAppBundleIDs.contains(bundleID) && !AppManager.shared.isActivelyManagingApp(withBundleID: bundleID)
+                            {
+                                print("[ALTLog] Removing backup directory for uninstalled app:", bundleID)
+                                try FileManager.default.removeItem(at: backupDirectory)
+                            }
+                        }
+                        catch
+                        {
+                            print("[ALTLog] Failed to remove app backup directory:", error)
+                            errors.append(error)
+                        }
+                    }
+                    
+                    if !errors.isEmpty
+                    {
+                        completion(.failure(OperationError.cacheClearError(errors: errors.map({ error in
+                            return error.localizedDescription
+                        }))))
+                    }
+                    else
+                    {
+                        completion(.success(()))
+                    }
+                }
+                catch
+                {
+                    print("[ALTLog] Failed to remove app backup directory:", error)
+                    completion(.failure(error))
+                }
+            }
+        }
+    }
+}

AltStore/Operations/InstallAppOperation.swift

@@ -48,6 +48,7 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
         let backgroundContext = DatabaseManager.shared.persistentContainer.newBackgroundContext()
         backgroundContext.perform {
             
+            
             /* App */
             let installedApp: InstalledApp
             

AltStore/Operations/OperationError.swift

@@ -40,6 +40,8 @@ enum OperationError: LocalizedError
     case provisioningError(result: String, message: String?)
     case anisetteV3Error(message: String)
     
+    case cacheClearError(errors: [String])
+    
     var failureReason: String? {
         switch self {
         case .unknown: return NSLocalizedString("An unknown error occured.", comment: "")
@@ -60,6 +62,7 @@ enum OperationError: LocalizedError
         case .anisetteV1Error(let message): return String(format: NSLocalizedString("An error occurred when getting anisette data from a V1 server: %@. Try using another anisette server.", comment: ""), message)
         case .provisioningError(let result, let message): return String(format: NSLocalizedString("An error occurred when provisioning: %@%@. Please try again. If the issue persists, report it on GitHub Issues!", comment: ""), result, message != nil ? (" (" + message! + ")") : "")
         case .anisetteV3Error(let message): return String(format: NSLocalizedString("An error occurred when getting anisette data from a V3 server: %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: ""), message)
+        case .cacheClearError(let errors): return String(format: NSLocalizedString("An error occurred while clearing cache: %@", comment: ""), errors.joined(separator: "\n"))
         }
     }
     

AltStore/Operations/ResignAppOperation.swift

@@ -11,6 +11,7 @@ import Roxas
 
 import AltStoreCore
 import AltSign
+import minimuxer
 
 @objc(ResignAppOperation)
 final class ResignAppOperation: ResultOperation<ALTApplication>
@@ -181,7 +182,7 @@ private extension ResignAppOperation
 
                 if app.isAltStoreApp
                 {
-                    guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else { throw OperationError.unknownUDID }
+                    guard let udid = fetch_udid()?.toString() as? String else { throw OperationError.unknownUDID }
                     guard let pairingFileString = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.devicePairingString) as? String else { throw OperationError.unknownUDID }                    
                     additionalValues[Bundle.Info.devicePairingString] = pairingFileString
                     additionalValues[Bundle.Info.deviceID] = udid
@@ -202,7 +203,7 @@ private extension ResignAppOperation
                         // The embedded certificate + certificate identifier are already in app bundle, no need to update them.
                     }
                 }
-                else if infoDictionary.keys.contains(Bundle.Info.deviceID), let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String
+                else if infoDictionary.keys.contains(Bundle.Info.deviceID), let udid = fetch_udid()?.toString() as? String
                 {
                     // There is an ALTDeviceID entry, so assume the app is using AltKit and replace it with the device's UDID.
                     additionalValues[Bundle.Info.deviceID] = udid

AltStore/Settings/Settings.storyboard

@@ -21,7 +21,7 @@
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <label key="tableFooterView" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bUR-rp-Nw2">
-                            <rect key="frame" x="0.0" y="1126" width="375" height="25"/>
+                            <rect key="frame" x="0.0" y="1245" width="375" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="1" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -236,9 +236,45 @@
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="NO"/>
                                         </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">
+                                    <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="444" width="375" 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="375" height="51"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disable Idle Timeout" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PCh-Up-aJJ">
+                                                    <rect key="frame" x="30" y="15.5" width="166" height="20.5"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iQA-wm-5ag">
+                                                    <rect key="frame" x="296" y="10" width="51" height="31"/>
+                                                    <connections>
+                                                        <action selector="toggleNoIdleTimeoutEnabled:" destination="aMk-Xp-UL8" eventType="valueChanged" id="WSl-Jc-g5J"/>
+                                                    </connections>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="iQA-wm-5ag" secondAttribute="trailing" id="MJ1-HF-Dln"/>
+                                                <constraint firstItem="PCh-Up-aJJ" firstAttribute="leading" secondItem="vDG-ZV-xRS" secondAttribute="leadingMargin" id="Ocu-jn-RAQ"/>
+                                                <constraint firstItem="iQA-wm-5ag" firstAttribute="centerY" secondItem="vDG-ZV-xRS" secondAttribute="centerY" id="c6W-bN-VAb"/>
+                                                <constraint firstItem="PCh-Up-aJJ" firstAttribute="centerY" secondItem="vDG-ZV-xRS" secondAttribute="centerY" id="mL6-LB-cjn"/>
+                                            </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="amC-sE-8O0" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="495" width="375" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="amC-sE-8O0" id="GEO-2e-E4k">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -269,7 +305,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="535" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="586" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="30h-59-88f" id="7qD-DW-Jls">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -309,7 +345,7 @@
                             <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="626" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="677" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="i4T-2q-jF3" id="VTQ-H4-aCM">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -353,28 +389,28 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="oHX-oR-nwJ" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="677" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="728" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oHX-oR-nwJ" id="hN4-i5-igu">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
                                                     <rect key="frame" x="30" y="15.5" width="89" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
                                                     <rect key="frame" x="198" y="15.5" width="147" height="20.5"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
                                                             <rect key="frame" x="0.0" y="0.0" width="115" height="20.5"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
                                                             <rect key="frame" x="129" y="0.0" width="18" height="20.5"/>
                                                         </imageView>
                                                     </subviews>
@@ -397,7 +433,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="0MT-ht-Sit" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="728" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="779" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="0MT-ht-Sit" id="OZp-WM-5H7">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -441,7 +477,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="O5R-Al-lGj" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="779" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="830" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="O5R-Al-lGj" id="CrG-Mr-xQq">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -481,7 +517,7 @@
                             <tableViewSection headerTitle="" id="OMa-EK-hRI">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="FMZ-as-Ljo" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="870" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="921" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FMZ-as-Ljo" id="JzL-Of-A3T">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -514,7 +550,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="Qca-pU-sJh" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="921" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="972" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qca-pU-sJh" id="QtU-8J-VQN">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -550,7 +586,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="rE2-P4-OaE" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="972" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1023" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rE2-P4-OaE" id="qIT-rz-ZUb">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -582,12 +618,45 @@
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="isSelectable" value="YES"/>
                                         </userDefinedRuntimeAttributes>
                                         <connections>
-                                            <segue destination="g8a-Rf-zWa" kind="show" identifier="showErrorLog" id="SSW-vL-86I"/>
+                                            <segue destination="g8a-Rf-zWa" kind="show" id="vFC-Id-Ww6"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="VNn-u4-cN8" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="eZ3-BT-q4D" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="1023" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="eZ3-BT-q4D" id="17m-VV-hzf">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
+                                            <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="IbH-V1-ce3">
+                                                    <rect key="frame" x="30" y="15.5" width="98.5" height="20.5"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Next" translatesAutoresizingMaskIntoConstraints="NO" id="FZe-BJ-fOm">
+                                                    <rect key="frame" x="327" y="16.5" width="18" height="18"/>
+                                                </imageView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="FZe-BJ-fOm" firstAttribute="centerY" secondItem="17m-VV-hzf" secondAttribute="centerY" id="bGv-Np-5aO"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="FZe-BJ-fOm" secondAttribute="trailing" id="ccb-JP-Eqi"/>
+                                                <constraint firstItem="IbH-V1-ce3" firstAttribute="centerY" secondItem="17m-VV-hzf" secondAttribute="centerY" id="iQJ-gN-sRF"/>
+                                                <constraint firstItem="IbH-V1-ce3" firstAttribute="leading" secondItem="17m-VV-hzf" secondAttribute="leadingMargin" id="m1g-Y6-aT5"/>
+                                            </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="VNn-u4-cN8" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="1074" width="375" height="51"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VNn-u4-cN8" id="4bh-qe-l2N">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -619,7 +688,7 @@
                                         </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="1074" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1125" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e7s-hL-kv9" id="yjL-Mu-HTk">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -652,7 +721,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="fj2-EJ-Z98" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1125" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="1176" width="375" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fj2-EJ-Z98" id="BcT-Fs-KNg">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
@@ -689,7 +758,6 @@
                         </sections>
                         <connections>
                             <outlet property="dataSource" destination="aMk-Xp-UL8" id="c6c-fR-8C4"/>
-                            <outlet property="delegate" destination="aMk-Xp-UL8" id="moP-1B-lRq"/>
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="Settings" id="Ddg-UQ-KJ8"/>
@@ -698,6 +766,7 @@
                         <outlet property="accountNameLabel" destination="CnN-M1-AYK" id="Ldc-Py-Bix"/>
                         <outlet property="accountTypeLabel" destination="434-MW-Den" id="mNB-QE-4Jg"/>
                         <outlet property="backgroundRefreshSwitch" destination="DPu-zD-Als" id="eiG-Hv-Vko"/>
+                        <outlet property="noIdleTimeoutSwitch" destination="iQA-wm-5ag" id="jHC-js-q0Y"/>
                         <outlet property="versionLabel" destination="bUR-rp-Nw2" id="85I-5R-hqz"/>
                     </connections>
                 </tableViewController>

AltStore/Settings/SettingsViewController.swift

@@ -30,13 +30,14 @@ extension SettingsViewController
     fileprivate enum AppRefreshRow: Int, CaseIterable
     {
         case backgroundRefresh
+        case noIdleTimeout
         
         @available(iOS 14, *)
         case addToSiri
         
         static var allCases: [AppRefreshRow] {
-            guard #available(iOS 14, *) else { return [.backgroundRefresh] }
-            return [.backgroundRefresh, .addToSiri]
+            guard #available(iOS 14, *) else { return [.backgroundRefresh, .noIdleTimeout] }
+            return [.backgroundRefresh, .noIdleTimeout, .addToSiri]
         }
     }
     
@@ -53,9 +54,11 @@ extension SettingsViewController
         case sendFeedback
         case refreshAttempts
         case errorLog
+        case clearCache
         case resetPairingFile
         case resetAdiPb
         case advancedSettings
+    
     }
 }
 
@@ -73,6 +76,7 @@ final class SettingsViewController: UITableViewController
     @IBOutlet private var accountTypeLabel: UILabel!
     
     @IBOutlet private var backgroundRefreshSwitch: UISwitch!
+    @IBOutlet private var noIdleTimeoutSwitch: UISwitch!
     
     @IBOutlet private var versionLabel: UILabel!
     
@@ -280,6 +284,11 @@ private extension SettingsViewController
         UserDefaults.standard.isBackgroundRefreshEnabled = sender.isOn
     }
     
+    @IBAction func toggleNoIdleTimeoutEnabled(_ sender: UISwitch)
+    {
+        UserDefaults.standard.isIdleTimeoutDisableEnabled = sender.isOn
+    }
+    
     @available(iOS 14, *)
     @IBAction func addRefreshAppsShortcut()
     {
@@ -291,6 +300,39 @@ private extension SettingsViewController
         self.present(viewController, animated: true, completion: nil)
     }
     
+    func clearCache()
+    {
+        let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to clear SideStore's cache?", comment: ""),
+                                                message: NSLocalizedString("This will remove all temporary files as well as backups for uninstalled apps.", comment: ""),
+                                                preferredStyle: .actionSheet)
+        alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style) { [weak self] _ in
+            self?.tableView.indexPathForSelectedRow.map { self?.tableView.deselectRow(at: $0, animated: true) }
+        })
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Clear Cache", comment: ""), style: .destructive) { [weak self] _ in
+            AppManager.shared.clearAppCache { result in
+                DispatchQueue.main.async {
+                    self?.tableView.indexPathForSelectedRow.map { self?.tableView.deselectRow(at: $0, animated: true) }
+                    
+                    switch result
+                    {
+                    case .success: break
+                    case .failure(let error):
+                        let alertController = UIAlertController(title: NSLocalizedString("Unable to Clear Cache", comment: ""), message: error.localizedDescription, preferredStyle: .alert)
+                        alertController.addAction(.ok)
+                        self?.present(alertController, animated: true)
+                    }
+                }
+            }
+        })
+        
+        if let popoverController = alertController.popoverPresentationController {
+            popoverController.sourceView = self.view
+            popoverController.sourceRect = CGRect(x: self.view.bounds.midX, y: self.view.bounds.midY, width: 0, height: 0)
+        }
+        
+        self.present(alertController, animated: true)
+    }
+    
     @IBAction func handleDebugModeGesture(_ gestureRecognizer: UISwipeGestureRecognizer)
     {
         self.debugGestureCounter += 1
@@ -377,15 +419,26 @@ extension SettingsViewController
     {
         let cell = super.tableView(tableView, cellForRowAt: indexPath)
         
-        if #available(iOS 14, *) {}
-        else if let cell = cell as? InsetGroupTableViewCell,
-                indexPath.section == Section.appRefresh.rawValue,
-                indexPath.row == AppRefreshRow.backgroundRefresh.rawValue
+//        if #available(iOS 14, *) {}
+//        else if let cell = cell as? InsetGroupTableViewCell,
+//                indexPath.section == Section.appRefresh.rawValue,
+//                indexPath.row == AppRefreshRow.backgroundRefresh.rawValue
+//        {
+//            // Only one row is visible pre-iOS 14.
+//            cell.style = .single
+//        }
+        
+        if AppRefreshRow.AllCases().count == 1
         {
-            // Only one row is visible pre-iOS 14.
-            cell.style = .single
+            if let cell = cell as? InsetGroupTableViewCell,
+               indexPath.section == Section.appRefresh.rawValue,
+               indexPath.row == AppRefreshRow.backgroundRefresh.rawValue
+            {
+                cell.style = .single
+            }
         }
         
+        
         return cell
     }
     
@@ -465,11 +518,13 @@ extension SettingsViewController
             switch row
             {
             case .backgroundRefresh: break
+            case .noIdleTimeout: break
             case .addToSiri:
                 guard #available(iOS 14, *) else { return }
                 self.addRefreshAppsShortcut()
             }
             
+            
         case .credits:
             let row = CreditsRow.allCases[indexPath.row]
             switch row
@@ -507,6 +562,9 @@ extension SettingsViewController
                     let toastView = ToastView(text: NSLocalizedString("Cannot Send Mail", comment: ""), detailText: nil)
                     toastView.show(in: self)
                 }
+                
+            case .clearCache: self.clearCache()
+
             case .resetPairingFile:
                 let filename = "ALTPairingFile.mobiledevicepairing"
                 let fm = FileManager.default
@@ -559,6 +617,7 @@ extension SettingsViewController
                     ELOG("UIApplication.openSettingsURLString invalid")
                 }
             case .refreshAttempts, .errorLog: break
+
             }
             
         default: break

AltStoreCore/Extensions/UserDefaults+AltStore.swift

@@ -27,6 +27,7 @@ public extension UserDefaults
     @NSManaged var preferredServerID: String?
     
     @NSManaged var isBackgroundRefreshEnabled: Bool
+    @NSManaged var isIdleTimeoutDisableEnabled: Bool
     @NSManaged var isDebugModeEnabled: Bool
     @NSManaged var presentedLaunchReminderNotification: Bool
     
@@ -72,6 +73,7 @@ public extension UserDefaults
         
         let defaults = [
             #keyPath(UserDefaults.isBackgroundRefreshEnabled): true,
+            #keyPath(UserDefaults.isIdleTimeoutDisableEnabled): true,
             #keyPath(UserDefaults.isLegacyDeactivationSupported): isLegacyDeactivationSupported,
             #keyPath(UserDefaults.activeAppLimitIncludesExtensions): activeAppLimitIncludesExtensions,
             #keyPath(UserDefaults.localServerSupportsRefreshing): localServerSupportsRefreshing,

AltStoreCore/Model/AltStore.xcdatamodeld/AltStore 11.xcdatamodel/contents

@@ -103,6 +103,7 @@
         <attribute name="externalURL" optional="YES" attributeType="URI"/>
         <attribute name="identifier" attributeType="String"/>
         <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isDuplicate" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <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"/>

AltStoreCore/Model/DatabaseManager.swift

@@ -222,7 +222,7 @@ private extension DatabaseManager
             
             let storeApp: StoreApp
             
-            if let app = StoreApp.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID), in: context)
+            if let app = StoreApp.first(satisfying: NSPredicate(format: "%K == %@ AND %K == %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID, #keyPath(StoreApp.sourceIdentifier), Source.altStoreIdentifier), in: context)
             {
                 storeApp = app
             }

AltStoreCore/Model/InstalledApp.swift

@@ -108,6 +108,10 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
     public func update(resignedApp: ALTApplication, certificateSerialNumber: String?)
     {
         self.name = resignedApp.name
+        if storeApp != nil {
+            // This might break things; maybe only do this if the bundle ID is SideStore's?
+            self.name = storeApp!.name // If we don't do this, the name will always be SideStore in My Apps, even when using beta/nightly
+        }
         
         self.resignedBundleIdentifier = resignedApp.bundleIdentifier
         self.version = resignedApp.version
@@ -178,7 +182,7 @@ public extension InstalledApp
     
     class func fetchAltStore(in context: NSManagedObjectContext) -> InstalledApp?
     {
-        let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
+        let predicate = NSPredicate(format: "%K == %@ AND %K != nil AND %K == %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID, #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.sourceIdentifier), Source.altStoreIdentifier)
         print("Fetch 'AltStore' Predicate: \(String(describing: predicate))")
         let altStore = InstalledApp.first(satisfying: predicate, in: context)
         return altStore

AltStoreCore/Model/NewsItem.swift

@@ -32,6 +32,15 @@ public class NewsItem: NSManagedObject, Decodable, Fetchable
     @NSManaged public var storeApp: StoreApp?
     @NSManaged public var source: Source?
     
+    @objc public var isDuplicate: Bool {
+        if self.source == nil { return false }
+        
+        // Hide news from sources that begin with the SideStore identifier, and aren't from the same source as the current SideStore source
+        if self.source!.identifier.starts(with: Bundle.Info.appbundleIdentifier) && self.source!.identifier != Source.altStoreIdentifier { return true }
+        
+        return false
+    }
+    
     private enum CodingKeys: String, CodingKey
     {
         case identifier
@@ -86,6 +95,9 @@ public extension NewsItem
 {
     @nonobjc class func fetchRequest() -> NSFetchRequest<NewsItem>
     {
-        return NSFetchRequest<NewsItem>(entityName: "NewsItem")
+        let fetchRequest = NSFetchRequest<NewsItem>(entityName: "NewsItem")
+        fetchRequest.predicate = NSPredicate(format: "%K == NO",
+                                             #keyPath(NewsItem.isDuplicate))
+        return fetchRequest
     }
 }

AltStoreCore/Model/Source.swift

@@ -11,29 +11,37 @@ import UIKit
 
 public extension Source
 {
-    #if ALPHA
-    static let altStoreIdentifier = Bundle.Info.appbundleIdentifier
-    #else
-    static let altStoreIdentifier = Bundle.Info.appbundleIdentifier
-    #endif
+    static var altStoreIdentifier: String {
+        let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        
+        if appVersion != nil {
+            if appVersion!.contains("beta") {
+                return Bundle.Info.appbundleIdentifier + ".Beta"
+            }
+            if appVersion!.contains("nightly") {
+                return Bundle.Info.appbundleIdentifier + ".Nightly"
+            }
+        }
+        
+        return Bundle.Info.appbundleIdentifier
+    }
     
-    #if STAGING
+    static let altStoreSourceBaseURL = "https://apps.sidestore.io/"
     
-    #if ALPHA
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
-    #else
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
-    #endif
-    
-    #else
-    
-    #if ALPHA
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
-    #else
-    static let altStoreSourceURL = URL(string: "https://apps.sidestore.io/")!
-    #endif
-    
-    #endif
+    static var altStoreSourceURL: URL {
+        let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        
+        if appVersion != nil {
+            if appVersion!.contains("beta") {
+                return URL(string: altStoreSourceBaseURL + "beta")!
+            }
+            if appVersion!.contains("nightly") {
+                return URL(string: altStoreSourceBaseURL + "nightly")!
+            }
+        }
+        
+        return URL(string: altStoreSourceBaseURL)!
+    }
 }
 
 public struct AppPermissionFeed: Codable {

AltStoreCore/Model/StoreApp.swift

@@ -343,16 +343,28 @@ public extension StoreApp
     {
         let app = StoreApp(context: context)
         app.name = "SideStore"
+        
+        let currentAppVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        
+        if currentAppVersion != nil {
+            if currentAppVersion!.contains("beta") {
+                app.name += " (Beta)"
+            }
+            if currentAppVersion!.contains("nightly") {
+                app.name += " (Nightly)"
+            }
+        }
+        
         app.bundleIdentifier = StoreApp.altstoreAppID
-        app.developerName = "Side Team"
-        app.localizedDescription = "SideStore is an alternative App Store."
-        app.iconURL = URL(string: "https://user-images.githubusercontent.com/705880/63392210-540c5980-c37b-11e9-968c-8742fc68ab2e.png")!
+        app.developerName = "SideStore Team"
+        app.localizedDescription = "SideStore is an alternative app store for non-jailbroken devices.\n\nSideStore allows you to sideload other .ipa files and apps from the Files app or via the SideStore Library."
+        app.iconURL = URL(string: "https://sidestore.io/assets/icon.png")!
         app.screenshotURLs = []
         app.sourceIdentifier = Source.altStoreIdentifier
         
-        let appVersion = AppVersion.makeAppVersion(version: "0.3.0",
+        let appVersion = AppVersion.makeAppVersion(version: "0.0.0", // this is set to the current app version later
                                                    date: Date(),
-                                                   downloadURL: URL(string: "http://rileytestut.com")!,
+                                                   downloadURL: URL(string: "https://sidestore.io")!,
                                                    size: 0,
                                                    appBundleID: app.bundleIdentifier,
                                                    sourceID: Source.altStoreIdentifier,
@@ -361,10 +373,6 @@ public extension StoreApp
         
         print("makeAltStoreApp StoreApp: \(String(describing: app))")
         
-        #if BETA
-        app.isBeta = true
-        #endif
-        
         return app
     }
 }

AltWidget/Info.plist

@@ -4,8 +4,8 @@
 <dict>
 	<key>ALTAppGroups</key>
 	<array>
-		<string>group.com.SideStore.SideStore</string>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>
+		<string>group.com.SideStore.SideStore</string>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>

Build.xcconfig

@@ -1,8 +1,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 0.5.2
-CURRENT_PROJECT_VERSION = 5020
+MARKETING_VERSION = 0.5.5
+CURRENT_PROJECT_VERSION = 5050
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ

trustedapps.json

@@ -4,6 +4,14 @@
     {
       "identifier": "io.sidestore.example"
     },
+    {
+      "identifier": "com.SideStore.SideStore",
+      "sourceURL": "https://apps.sidestore.io/"
+    },
+    {
+      "identifier": "com.SideStore.SideStore.Beta",
+      "sourceURL": "https://apps.sidestore.io/beta"
+    },
     {
       "identifier": "com.sidestoreapps.community",
       "sourceURL": "https://community-apps.sidestore.io/sidecommunity.json"
@@ -42,7 +50,7 @@
     },
     {
       "identifier": "com.litritt.litsource",
-      "sourceURL": "https://apps.litritt.com/"
+      "sourceURL": "https://altstore.ignitedemulator.com/"
     }
   ]
 }