[AltStore] Renames App to StoreApp

AltStore/Model/AltStore.xcdatamodeld/AltStore.xcdatamodel/contents

@@ -13,7 +13,48 @@
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
-    <entity name="App" representedClassName="App" syncable="YES">
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="type" attributeType="String" syncable="YES"/>
+        <attribute name="usageDescription" attributeType="String" syncable="YES"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp" syncable="YES"/>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String" syncable="YES"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String" syncable="YES"/>
+        <attribute name="version" attributeType="String" syncable="YES"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="sourceURL" attributeType="URI" syncable="YES"/>
+        <relationship name="apps" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
         <attribute name="bundleIdentifier" attributeType="String" syncable="YES"/>
         <attribute name="developerName" attributeType="String" syncable="YES"/>
         <attribute name="downloadURL" attributeType="URI" syncable="YES"/>
@@ -37,47 +78,6 @@
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
-    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
-        <attribute name="type" attributeType="String" syncable="YES"/>
-        <attribute name="usageDescription" attributeType="String" syncable="YES"/>
-        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="App" inverseName="permissions" inverseEntity="App" syncable="YES"/>
-    </entity>
-    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
-        <attribute name="bundleIdentifier" attributeType="String" syncable="YES"/>
-        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="resignedBundleIdentifier" attributeType="String" syncable="YES"/>
-        <attribute name="version" attributeType="String" syncable="YES"/>
-        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="App" inverseName="installedApp" inverseEntity="App" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="bundleIdentifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
-        <attribute name="date" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="errorDescription" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="Source" representedClassName="Source" syncable="YES">
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="sourceURL" attributeType="URI" syncable="YES"/>
-        <relationship name="apps" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="App" inverseName="source" inverseEntity="App" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
     <entity name="Team" representedClassName="Team" syncable="YES">
         <attribute name="identifier" attributeType="String" syncable="YES"/>
         <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
@@ -92,7 +92,7 @@
     </entity>
     <elements>
         <element name="Account" positionX="-36" positionY="90" width="128" height="135"/>
-        <element name="App" positionX="-63" positionY="-18" width="128" height="300"/>
+        <element name="StoreApp" positionX="-63" positionY="-18" width="128" height="300"/>
         <element name="AppPermission" positionX="-45" positionY="90" width="128" height="90"/>
         <element name="InstalledApp" positionX="-63" positionY="0" width="128" height="150"/>
         <element name="Source" positionX="-45" positionY="99" width="128" height="105"/>

AltStore/Model/App.swift

@@ -1,5 +1,5 @@
 //
-//  App.swift
+//  StoreApp.swift
 //  AltStore
 //
 //  Created by Riley Testut on 5/20/19.
@@ -12,13 +12,13 @@ import CoreData
 import Roxas
 import AltSign
 
-extension App
+extension StoreApp
 {
     static let altstoreAppID = "com.rileytestut.AltStore"
 }
 
-@objc(App)
-class App: NSManagedObject, Decodable, Fetchable
+@objc(StoreApp)
+class StoreApp: NSManagedObject, Decodable, Fetchable
 {
     /* Properties */
     @NSManaged private(set) var name: String
@@ -77,7 +77,7 @@ class App: NSManagedObject, Decodable, Fetchable
     {
         guard let context = decoder.managedObjectContext else { preconditionFailure("Decoder must have non-nil NSManagedObjectContext.") }
         
-        super.init(entity: App.entity(), insertInto: nil)
+        super.init(entity: StoreApp.entity(), insertInto: nil)
         
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.name = try container.decode(String.self, forKey: .name)
@@ -116,18 +116,18 @@ class App: NSManagedObject, Decodable, Fetchable
     }
 }
 
-extension App
+extension StoreApp
 {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<App>
+    @nonobjc class func fetchRequest() -> NSFetchRequest<StoreApp>
     {
-        return NSFetchRequest<App>(entityName: "App")
+        return NSFetchRequest<StoreApp>(entityName: "StoreApp")
     }
     
-    class func makeAltStoreApp(in context: NSManagedObjectContext) -> App
+    class func makeAltStoreApp(in context: NSManagedObjectContext) -> StoreApp
     {
-        let app = App(context: context)
+        let app = StoreApp(context: context)
         app.name = "AltStore"
-        app.bundleIdentifier = App.altstoreAppID
+        app.bundleIdentifier = StoreApp.altstoreAppID
         app.developerName = "Riley Testut"
         app.localizedDescription = "AltStore is an alternative App Store."
         app.iconName = ""

AltStore/Model/AppPermission.swift

@@ -50,7 +50,7 @@ class AppPermission: NSManagedObject, Decodable, Fetchable
     @NSManaged var usageDescription: String
     
     /* Relationships */
-    @NSManaged private(set) var app: App!
+    @NSManaged private(set) var app: StoreApp!
     
     private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
     {

AltStore/Model/DatabaseManager.swift

@@ -125,9 +125,9 @@ private extension DatabaseManager
         context.performAndWait {
             guard let localApp = ALTApplication(fileURL: Bundle.main.bundleURL) else { return }
             
-            let storeApp: App
+            let storeApp: StoreApp
             
-            if let app = App.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(App.bundleIdentifier), App.altstoreAppID), in: context)
+            if let app = StoreApp.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID), in: context)
             {
                 storeApp = app
             }
@@ -135,7 +135,7 @@ private extension DatabaseManager
             {
                 let source = Source.makeAltStoreSource(in: context)
                 
-                storeApp = App.makeAltStoreApp(in: context)
+                storeApp = StoreApp.makeAltStoreApp(in: context)
                 storeApp.version = localApp.version
                 storeApp.source = source
             }
@@ -148,7 +148,7 @@ private extension DatabaseManager
             }
             else
             {
-                installedApp = InstalledApp(resignedApp: localApp, originalBundleIdentifier: App.altstoreAppID, context: context)
+                installedApp = InstalledApp(resignedApp: localApp, originalBundleIdentifier: StoreApp.altstoreAppID, context: context)
                 installedApp.storeApp = storeApp
             }
             

AltStore/Model/InstalledApp.swift

@@ -24,7 +24,7 @@ class InstalledApp: NSManagedObject, Fetchable
     @NSManaged var expirationDate: Date
     
     /* Relationships */
-    @NSManaged var storeApp: App?
+    @NSManaged var storeApp: StoreApp?
     
     var isSideloaded: Bool {
         return self.storeApp == nil
@@ -74,7 +74,7 @@ extension InstalledApp
     
     class func fetchAltStore(in context: NSManagedObjectContext) -> InstalledApp?
     {
-        let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), App.altstoreAppID)
+        let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
         
         let altStore = InstalledApp.first(satisfying: predicate, in: context)
         return altStore
@@ -82,7 +82,7 @@ extension InstalledApp
     
     class func fetchAppsForRefreshingAll(in context: NSManagedObjectContext) -> [InstalledApp]
     {
-        let predicate = NSPredicate(format: "%K != %@", #keyPath(InstalledApp.bundleIdentifier), App.altstoreAppID)
+        let predicate = NSPredicate(format: "%K != %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
         
         var installedApps = InstalledApp.all(satisfying: predicate,
                                              sortedBy: [NSSortDescriptor(keyPath: \InstalledApp.expirationDate, ascending: true)],
@@ -103,7 +103,7 @@ extension InstalledApp
         
         let predicate = NSPredicate(format: "(%K < %@) AND (%K != %@)",
                                     #keyPath(InstalledApp.refreshedDate), date as NSDate,
-                                    #keyPath(InstalledApp.bundleIdentifier), App.altstoreAppID)
+                                    #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
         
         var installedApps = InstalledApp.all(satisfying: predicate,
                                              sortedBy: [NSSortDescriptor(keyPath: \InstalledApp.expirationDate, ascending: true)],

AltStore/Model/MergePolicy.swift

@@ -23,7 +23,7 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
         {
             switch conflict.databaseObject
             {
-            case let databaseObject as App:
+            case let databaseObject as StoreApp:
                 // Delete previous permissions
                 for permission in databaseObject.permissions
                 {

AltStore/Model/Source.swift

@@ -24,9 +24,9 @@ class Source: NSManagedObject, Fetchable, Decodable
     /* Relationships */
     @objc(apps) @NSManaged private(set) var _apps: NSOrderedSet
     
-    @nonobjc var apps: [App] {
+    @nonobjc var apps: [StoreApp] {
         get {
-            return self._apps.array as! [App]
+            return self._apps.array as! [StoreApp]
         }
         set {
             self._apps = NSOrderedSet(array: newValue)
@@ -57,7 +57,7 @@ class Source: NSManagedObject, Fetchable, Decodable
         self.identifier = try container.decode(String.self, forKey: .identifier)
         self.sourceURL = try container.decode(URL.self, forKey: .sourceURL)
         
-        let apps = try container.decodeIfPresent([App].self, forKey: .apps) ?? []
+        let apps = try container.decodeIfPresent([StoreApp].self, forKey: .apps) ?? []
         for (index, app) in apps.enumerated()
         {
             app.sortIndex = Int32(index)