Switches from StoreApp.isBeta to isPledged to determine whether app is visible

If StoreApp.isHiddenWithoutPledge == false (default), we’ll still show the app.

AltStore/Browse/BrowseViewController.swift

@@ -92,7 +92,6 @@ class BrowseViewController: UICollectionViewController, PeekPopPreviewing
         super.viewWillAppear(animated)
         
         self.fetchSource()
-        self.updateDataSource()
         
         self.update()
     }
@@ -109,7 +108,8 @@ private extension BrowseViewController
                                         NSSortDescriptor(keyPath: \StoreApp.bundleIdentifier, ascending: true)]
         fetchRequest.returnsObjectsAsFaults = false
         
-        let predicate = NSPredicate(format: "%K != %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID)
+        let predicate = StoreApp.visibleAppsPredicate
+        
         if let source = self.source
         {
             let filterPredicate = NSPredicate(format: "%K == %@", #keyPath(StoreApp._source), source)
@@ -202,18 +202,6 @@ private extension BrowseViewController
         return dataSource
     }
     
-    func updateDataSource()
-    {
-        if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
-        {
-            self.dataSource.predicate = nil
-        }
-        else
-        {
-            self.dataSource.predicate = NSPredicate(format: "%K == NO", #keyPath(StoreApp.isBeta))
-        }
-    }
-    
     func fetchSource()
     {
         self.loadingState = .loading

AltStore/My Apps/MyAppsViewController.swift

@@ -112,11 +112,10 @@ class MyAppsViewController: UICollectionViewController, PeekPopPreviewing
         (self as PeekPopPreviewing).registerForPreviewing(with: self, sourceView: self.collectionView)
     }
     
-    override func viewWillAppear(_ animated: Bool)
+    override func viewIsAppearing(_ animated: Bool)
     {
-        super.viewWillAppear(animated)
+        super.viewIsAppearing(animated)
         
-        self.updateDataSource()
         self.update()
         
         self.fetchAppIDs()
@@ -475,33 +474,6 @@ private extension MyAppsViewController
         
         return dataSource
     }
-    
-    func updateDataSource()
-    {
-        do
-        {
-            if self.updatesDataSource.fetchedResultsController.fetchedObjects == nil
-            {
-                try self.updatesDataSource.fetchedResultsController.performFetch()
-            }
-        }
-        catch
-        {
-            print("[ALTLog] Failed to fetch updates:", error)
-        }
-        
-        if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
-        {
-            self.dataSource.predicate = nil
-        }
-        else
-        {
-            self.dataSource.predicate = NSPredicate(format: "%K == nil OR %K == NO OR %K == %@",
-                                                    #keyPath(InstalledApp.storeApp),
-                                                    #keyPath(InstalledApp.storeApp.isBeta),
-                                                    #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
-        }
-    }
 }
 
 private extension MyAppsViewController

AltStore/Sources/SourceDetailContentViewController.swift

@@ -215,7 +215,7 @@ private extension SourceDetailContentViewController
         
         let dataSource = RSTArrayCollectionViewPrefetchingDataSource<StoreApp, UIImage>(items: limitedFeaturedApps)
         dataSource.cellIdentifierHandler = { _ in "AppCell" }
-        dataSource.predicate = NSPredicate(format: "%K == NO", #keyPath(StoreApp.isBeta)) // Never show beta apps (at least until we support betas for other sources).
+        dataSource.predicate = StoreApp.visibleAppsPredicate
         dataSource.cellConfigurationHandler = { [weak self] (cell, storeApp, indexPath) in
             let cell = cell as! AppBannerCollectionViewCell
             cell.tintColor = storeApp.tintColor

AltStore/Sources/SourcesViewController.swift

@@ -204,15 +204,7 @@ private extension SourcesViewController
             cell.bannerView.iconImageView.image = nil
             cell.bannerView.iconImageView.isIndicatingActivity = true
             
-            let numberOfApps: Int
+            let numberOfApps = source.apps.filter { StoreApp.visibleAppsPredicate.evaluate(with: $0) }.count
-            if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
-            {
-                numberOfApps = source.apps.count
-            }
-            else
-            {
-                numberOfApps = source.apps.filter { !$0.isBeta }.count
-            }
             
             if let error = source.error
             {

AltStoreCore/Model/InstalledApp.swift

@@ -194,13 +194,19 @@ public extension InstalledApp
             // We have to also check !(latestSupportedVersion.buildVersion == '' && installedApp.storeBuildVersion == nil)
             // because latestSupportedVersion.buildVersion stores an empty string for nil, while installedApp.storeBuildVersion uses NULL.
             "(%K != %K OR (%K != %K AND NOT (%K == '' AND %K == nil)))",
+            
+            "AND",
+            
+            // !isPledgeRequired || isPledged
+            "(%K == NO OR %K == YES)"
         ].joined(separator: " ")
         
         fetchRequest.predicate = NSPredicate(format: predicateFormat,
                                              #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.latestSupportedVersion),
                                              #keyPath(InstalledApp.storeApp.latestSupportedVersion.version), #keyPath(InstalledApp.version),
                                              #keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeBuildVersion),
-                                             #keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeBuildVersion))
+                                             #keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeBuildVersion),
+                                             #keyPath(InstalledApp.storeApp.isPledgeRequired), #keyPath(InstalledApp.storeApp.isPledged))
         return fetchRequest
     }
     

AltStoreCore/Model/StoreApp.swift

@@ -436,6 +436,18 @@ public extension StoreApp
         let globallyUniqueID = self.bundleIdentifier + "|" + sourceIdentifier
         return globallyUniqueID
     }
+}
+
+public extension StoreApp
+{
+    class var visibleAppsPredicate: NSPredicate {
+        let predicate = NSPredicate(format: "(%K != %@) AND ((%K == NO) OR (%K == NO) OR (%K == YES))",
+                                    #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID,
+                                    #keyPath(StoreApp.isPledgeRequired),
+                                    #keyPath(StoreApp.isHiddenWithoutPledge),
+                                    #keyPath(StoreApp.isPledged))
+        return predicate
+    }
     
     @nonobjc class func fetchRequest() -> NSFetchRequest<StoreApp>
     {