neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-enables checking if Patreon account is a patron

Browse Source
This commit is contained in:
Riley Testut
2019-09-25 00:53:36 -07:00
parent 865e3778b8
commit 1504a277d5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltStore/Browse/BrowseViewController.swift
View File

@@ -151,7 +151,7 @@ private extension BrowseViewController
func updateDataSource()
{
if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron
if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
{
self.dataSource.predicate = nil
}

4
AltStore/Model/InstalledApp.swift
View File

@@ -84,7 +84,7 @@ extension InstalledApp
{
var predicate = NSPredicate(format: "%K != %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron
if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
{
// No additional predicate
}
@@ -116,7 +116,7 @@ extension InstalledApp
#keyPath(InstalledApp.refreshedDate), date as NSDate,
#keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron
if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
{
// No additional predicate
}

6
AltStore/Model/PatreonAccount.swift
View File

@@ -54,12 +54,12 @@ class PatreonAccount: NSManagedObject, Fetchable
if let patronResponse = response.included?.first
{
_ = Patron(response: patronResponse)
self.isPatron = true
let patron = Patron(response: patronResponse)
self.isPatron = (patron.status == .active)
}
else
{
self.isPatron = true
self.isPatron = false
}
}
}

2
AltStore/My Apps/MyAppsViewController.swift
View File

@@ -320,7 +320,7 @@ private extension MyAppsViewController
func updateDataSource()
{
if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron
if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
{
self.dataSource.predicate = nil
}