diff --git a/AltBackup/Info.plist b/AltBackup/Info.plist index 038e8ed6..c40c1c3c 100644 --- a/AltBackup/Info.plist +++ b/AltBackup/Info.plist @@ -5,7 +5,7 @@ ALTAppGroups group.$(APP_GROUP_IDENTIFIER) - group.com.rileytestut.AltStore + group.com.SideStore.SideStore ALTBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 07abc778..ce5142ad 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 03F06CD52942C27E001C4D68 /* Bundle+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1E314122A05D4C00370A3C /* Bundle+AltStore.swift */; }; 19104D952909BAEA00C49C7B /* libimobiledevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF45872B2298D31600BD7491 /* libimobiledevice.a */; }; 19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */; }; 19104DBB2909C11700C49C7B /* libem_proxy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19104DA32909BC1000C49C7B /* libem_proxy.a */; }; @@ -2162,6 +2163,7 @@ BF580496246A3CB5008AE704 /* UIColor+AltBackup.swift in Sources */, BF580482246A28F7008AE704 /* ViewController.swift in Sources */, BF44EEF0246B08BA002A52F2 /* BackupController.swift in Sources */, + 03F06CD52942C27E001C4D68 /* Bundle+AltStore.swift in Sources */, BF58049B246A432D008AE704 /* NSError+AltStore.swift in Sources */, BF58047E246A28F7008AE704 /* AppDelegate.swift in Sources */, ); diff --git a/AltStore/Info.plist b/AltStore/Info.plist index 485b460b..f98dc02b 100644 --- a/AltStore/Info.plist +++ b/AltStore/Info.plist @@ -5,7 +5,7 @@ ALTAppGroups group.$(APP_GROUP_IDENTIFIER) - group.com.rileytestut.AltStore + group.com.SideStore.SideStore ALTDeviceID 00008101-000129D63698001E diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/My Apps/MyAppsViewController.swift index c671d9aa..19d993f0 100644 --- a/AltStore/My Apps/MyAppsViewController.swift +++ b/AltStore/My Apps/MyAppsViewController.swift @@ -461,17 +461,10 @@ private extension MyAppsViewController func updateDataSource() { - 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) - } + + } } diff --git a/AltStore/Operations/FetchProvisioningProfilesOperation.swift b/AltStore/Operations/FetchProvisioningProfilesOperation.swift index d2ce34d5..3ed6ad82 100644 --- a/AltStore/Operations/FetchProvisioningProfilesOperation.swift +++ b/AltStore/Operations/FetchProvisioningProfilesOperation.swift @@ -131,19 +131,19 @@ extension FetchProvisioningProfilesOperation // or if installedApp.team is nil but resignedBundleIdentifier contains the team's identifier. let teamsMatch = installedApp.team?.identifier == team.identifier || (installedApp.team == nil && installedApp.resignedBundleIdentifier.contains(team.identifier)) - #if DEBUG - - if app.isAltStoreApp - { - // Use legacy bundle ID format for AltStore. - preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil - } - else - { - preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil - } - - #else +// #if DEBUG +// +// if app.isAltStoreApp +// { +// // Use legacy bundle ID format for AltStore. +// preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil +// } +// else +// { +// preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil +// } +// +// #else if teamsMatch { @@ -157,7 +157,7 @@ extension FetchProvisioningProfilesOperation preferredBundleID = nil } - #endif + // #endif } else { diff --git a/AltStore/Resources/AltBackup.ipa b/AltStore/Resources/AltBackup.ipa index 627b12de..b35f6bea 100644 Binary files a/AltStore/Resources/AltBackup.ipa and b/AltStore/Resources/AltBackup.ipa differ diff --git a/AltStoreCore/Model/InstalledApp.swift b/AltStoreCore/Model/InstalledApp.swift index 54f8e32e..3caca0de 100644 --- a/AltStoreCore/Model/InstalledApp.swift +++ b/AltStoreCore/Model/InstalledApp.swift @@ -173,15 +173,15 @@ public extension InstalledApp { var predicate = NSPredicate(format: "%K == YES AND %K != %@", #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID) - if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated - { - // No additional predicate - } - else - { - predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, - NSPredicate(format: "%K == nil OR %K == NO", #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.isBeta))]) - } +// if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated +// { +// // No additional predicate +// } +// else +// { +// predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, +// NSPredicate(format: "%K == nil OR %K == NO", #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.isBeta))]) +// } var installedApps = InstalledApp.all(satisfying: predicate, sortedBy: [NSSortDescriptor(keyPath: \InstalledApp.expirationDate, ascending: true)], @@ -206,15 +206,15 @@ public extension InstalledApp #keyPath(InstalledApp.refreshedDate), date as NSDate, #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID) - if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated - { - // No additional predicate - } - else - { - predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, - NSPredicate(format: "%K == nil OR %K == NO", #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.isBeta))]) - } +// if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated +// { +// // No additional predicate +// } +// else +// { +// predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, +// NSPredicate(format: "%K == nil OR %K == NO", #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.isBeta))]) +// } var installedApps = InstalledApp.all(satisfying: predicate, sortedBy: [NSSortDescriptor(keyPath: \InstalledApp.expirationDate, ascending: true)], diff --git a/AltStoreCore/Model/PatreonAccount.swift b/AltStoreCore/Model/PatreonAccount.swift index 95259c1e..3b2a32b2 100644 --- a/AltStoreCore/Model/PatreonAccount.swift +++ b/AltStoreCore/Model/PatreonAccount.swift @@ -52,15 +52,16 @@ public class PatreonAccount: NSManagedObject, Fetchable self.name = response.data.attributes.full_name self.firstName = response.data.attributes.first_name - if let patronResponse = response.included?.first - { - let patron = Patron(response: patronResponse) - self.isPatron = (patron.status == .active) - } - else - { - self.isPatron = false - } +// if let patronResponse = response.included?.first +// { +// let patron = Patron(response: patronResponse) +// self.isPatron = (patron.status == .active) +// } +// else +// { +// self.isPatron = false +// } + self.isPatron = true } } diff --git a/AltStoreCore/Patreon/PatreonAPI.swift b/AltStoreCore/Patreon/PatreonAPI.swift index 92db9608..df758653 100644 --- a/AltStoreCore/Patreon/PatreonAPI.swift +++ b/AltStoreCore/Patreon/PatreonAPI.swift @@ -271,7 +271,7 @@ public extension PatreonAPI if let context = account.managedObjectContext, !account.isPatron { // Deactivate all beta apps now that we're no longer a patron. - self.deactivateBetaApps(in: context) + //self.deactivateBetaApps(in: context) } try account.managedObjectContext?.save() diff --git a/AltWidget/Info.plist b/AltWidget/Info.plist index e6228c88..ce461d39 100644 --- a/AltWidget/Info.plist +++ b/AltWidget/Info.plist @@ -5,7 +5,7 @@ ALTAppGroups group.$(APP_GROUP_IDENTIFIER) - group.com.rileytestut.AltStore + group.com.SideStore.SideStore CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE)