Merge pull request #1245 from Automattic/merge/release-7.53.0.1-into-…

…trunk 7.53 Release: Merge changes from 7.53.0.1 into `trunk`
Automattic · Nov 30, 2023 · cde718f · cde718f
2 parents f5d708e + 9c90ce7
commit cde718f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Moves Bookmarks out of Early Access: [#1224]
 - Shows the Bookmarks tab after Chapters [#1240]
 - Makes the player transition faster, smoother and with a new effect [#1090]
+- Attempts to fix podcast being removed from their folders [#1239]
 
 7.52
 -----

diff --git a/Modules/Server/Sources/PocketCastsServer/Public/Sync/SyncTask+LocalChanges.swift b/Modules/Server/Sources/PocketCastsServer/Public/Sync/SyncTask+LocalChanges.swift
@@ -17,7 +17,13 @@ extension SyncTask {
             podcastRecord.isDeleted.value = !podcast.isSubscribed()
             podcastRecord.subscribed.value = podcast.isSubscribed()
             podcastRecord.sortPosition.value = podcast.sortOrder
+
+            // There's a bug on the watch app that resets all users folders
+            // Since the watch don't use folders at all, it shouldn't sync
+            #if !os(watchOS)
             podcastRecord.folderUuid.value = podcast.folderUuid ?? DataConstants.homeGridFolderUuid
+            #endif
+
             if let addedDate = podcast.addedDate {
                 podcastRecord.dateAdded = Google_Protobuf_Timestamp(date: addedDate)
             }

diff --git a/config/Version.xcconfig b/config/Version.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG=7.53.0.0
+VERSION_LONG=7.53.0.1
 VERSION_SHORT=7.53
diff --git a/podcasts/AboutView.swift b/podcasts/AboutView.swift
@@ -112,7 +112,7 @@ struct AboutView: View {
     }
 
     private func openShareApp() {
-        guard let controller = SceneHelper.rootViewController()?.presentedViewController else { return }
+        guard let controller = FeatureFlag.newPlayerTransition.enabled ? SceneHelper.rootViewController() : SceneHelper.rootViewController()?.presentedViewController else { return }
 
         SharingHelper.shared.shareLinkToApp(fromController: controller)
     }

diff --git a/podcasts/End of Year/EndOfYear.swift b/podcasts/End of Year/EndOfYear.swift
@@ -100,7 +100,7 @@ struct EndOfYear {
     }
 
     func share(assets: [Any], storyIdentifier: String = "unknown", onDismiss: (() -> Void)? = nil) {
-        let presenter = SceneHelper.rootViewController()?.presentedViewController
+        let presenter = FeatureFlag.newPlayerTransition.enabled ? SceneHelper.rootViewController() : SceneHelper.rootViewController()?.presentedViewController
 
         let fakeViewController = FakeViewController()
         fakeViewController.onDismiss = onDismiss

diff --git a/podcasts/End of Year/Stories/Views/PaidStoryWallView.swift b/podcasts/End of Year/Stories/Views/PaidStoryWallView.swift
@@ -15,7 +15,7 @@ struct PaidStoryWallView: View {
                 .padding(.bottom, geometry.size.height * 0.06)
 
                 Button(model.pricingInfo.hasFreeTrial ? L10n.eoyStartYourFreeTrial : L10n.upgradeToPlan(L10n.pocketCastsPlusShort)) {
-                    guard let storiesViewController = SceneHelper.rootViewController()?.presentedViewController else {
+                    guard let storiesViewController = FeatureFlag.newPlayerTransition.enabled ? SceneHelper.rootViewController() : SceneHelper.rootViewController()?.presentedViewController else {
                         return
                     }
 

diff --git a/podcasts/UIViewController+Presenting.swift b/podcasts/UIViewController+Presenting.swift
@@ -2,7 +2,7 @@ import UIKit
 
 extension UIViewController {
     var topMostPresentedViewController: UIViewController? {
-        guard UIApplication.shared.applicationState == .active else {
+        guard UIApplication.shared.applicationState != .background else {
             return nil
         }