Skip to content

Move cellular check into PlaybackManager #3337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Move cellular check into PlaybackManager #3337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions podcasts/PlaybackActionHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@ class PlaybackActionHelper {
return
}

if !episode.downloaded(pathFinder: DownloadManager.shared) {
NetworkUtils.shared.streamEpisodeRequested({
performPlay(episode: episode, filterUuid: filterUuid, podcastUuid: podcastUuid)
}, disallowed: nil)
} else {
performPlay(episode: episode, filterUuid: filterUuid, podcastUuid: podcastUuid)
}
performPlay(episode: episode, filterUuid: filterUuid, podcastUuid: podcastUuid)
}

class func pause() {
Expand Down
17 changes: 16 additions & 1 deletion podcasts/PlaybackManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,24 @@ class PlaybackManager: ServerPlaybackDelegate {
}
}

func play(completion: (() -> Void)? = nil, userInitiated: Bool = true) {
private var cellularAllowedEpisodeUUID: String?

func play(completion: (() -> Void)? = nil, userInitiated: Bool = true, allowed: Bool = false) {
guard let currEpisode = currentEpisode() else { return }

if allowed {
cellularAllowedEpisodeUUID = currEpisode.uuid
}

#if !os(watchOS) && !APPCLIP
if !allowed && cellularAllowedEpisodeUUID != currEpisode.uuid && !currEpisode.downloaded(pathFinder: DownloadManager.shared) {
NetworkUtils.shared.streamEpisodeRequested({ [weak self] in
self?.play(completion: completion, userInitiated: userInitiated, allowed: true)
}, disallowed: nil)
return
}
#endif

FileLog.shared.addMessage("PlaybackManager Play \(currentEpisode()?.title ?? "unknown episode") userInitiated: \(userInitiated)")

if userInitiated {
Expand Down