diff --git a/ProgressWidget/ProgressWidgetBundle.swift b/ProgressWidget/ProgressWidgetBundle.swift index 887fca15..f4dde899 100644 --- a/ProgressWidget/ProgressWidgetBundle.swift +++ b/ProgressWidget/ProgressWidgetBundle.swift @@ -12,6 +12,8 @@ import WidgetKit struct ProgressWidgetBundle: WidgetBundle { var body: some Widget { // ProgressWidget() +#if canImport(ActivityKit) ProgressWidgetLiveActivity() +#endif } } diff --git a/ProgressWidget/ProgressWidgetLiveActivity.swift b/ProgressWidget/ProgressWidgetLiveActivity.swift index 73322689..0dc38847 100644 --- a/ProgressWidget/ProgressWidgetLiveActivity.swift +++ b/ProgressWidget/ProgressWidgetLiveActivity.swift @@ -5,6 +5,7 @@ // Created by Даниил Виноградов on 06.04.2024. // +#if canImport(ActivityKit) import ActivityKit import SwiftUI import WidgetKit @@ -88,3 +89,4 @@ struct ProgressWidgetLiveActivity: Widget { // ProgressWidgetAttributes.ContentState(progress: 0.2, downSpeed: 2000, upSpeed: 1000, timeRemainig: "Осталось САСАТБ", timeStamp: .now) // ProgressWidgetAttributes.ContentState(progress: 0.7, downSpeed: 12000000, upSpeed: 1000000, timeRemainig: "Осталось САСАТБ", timeStamp: .now) //} +#endif diff --git a/Submodules/LibTorrent-Swift b/Submodules/LibTorrent-Swift index 170c8abb..73652b2e 160000 --- a/Submodules/LibTorrent-Swift +++ b/Submodules/LibTorrent-Swift @@ -1 +1 @@ -Subproject commit 170c8abb1c5ba5831196886774d73b4b9faa703f +Subproject commit 73652b2e7647d5cacb578390b8040cd1b1de4c4c diff --git a/iTorrent/Core/SceneDelegate/SceneDelegate.swift b/iTorrent/Core/SceneDelegate/SceneDelegate.swift index 238e5328..68748194 100644 --- a/iTorrent/Core/SceneDelegate/SceneDelegate.swift +++ b/iTorrent/Core/SceneDelegate/SceneDelegate.swift @@ -89,7 +89,7 @@ class SceneDelegate: MvvmSceneDelegate { override func binding() { bindLiveActivity() - bind(in: disposeBag) { + disposeBag.bind { tintColorBind appAppearanceBind backgroundDownloadModeBind diff --git a/iTorrent/Core/iTorrent.entitlements b/iTorrent/Core/iTorrent.entitlements index 0fbbab96..dcdb269d 100644 --- a/iTorrent/Core/iTorrent.entitlements +++ b/iTorrent/Core/iTorrent.entitlements @@ -16,5 +16,7 @@ com.apple.security.network.server + com.apple.security.personal-information.location + diff --git a/iTorrent/Services/NetworkMonitoringService.swift b/iTorrent/Services/NetworkMonitoringService.swift index 6f09cbee..8b25ebc0 100644 --- a/iTorrent/Services/NetworkMonitoringService.swift +++ b/iTorrent/Services/NetworkMonitoringService.swift @@ -14,7 +14,7 @@ import CoreTelephony class NetworkMonitoringService { @Published var availableInterfaces: [NWInterface] = [] -#if canImport(CoreTelephony) +#if canImport(CoreTelephony) && !targetEnvironment(macCatalyst) @Published var cellularState: CTCellularDataRestrictedState = .restrictedStateUnknown #endif @@ -24,7 +24,7 @@ class NetworkMonitoringService { updateAvailableInterfaces() } -#if canImport(CoreTelephony) +#if canImport(CoreTelephony) && !targetEnvironment(macCatalyst) cellularData.cellularDataRestrictionDidUpdateNotifier = { [weak self] newState in guard let self else { return } cellularState = newState @@ -37,14 +37,14 @@ class NetworkMonitoringService { } private let monitor = NWPathMonitor() -#if canImport(CoreTelephony) +#if canImport(CoreTelephony) && !targetEnvironment(macCatalyst) private let cellularData = CTCellularData() #endif } private extension NetworkMonitoringService { func updateAvailableInterfaces() { -#if canImport(CoreTelephony) +#if canImport(CoreTelephony) && !targetEnvironment(macCatalyst) let isCellularRestricted = cellularData.restrictedState == .restricted #else let isCellularRestricted = false diff --git a/iTorrent/Services/RssFeed/RssModel.swift b/iTorrent/Services/RssFeed/RssModel.swift index dfe87a3b..b768bcbb 100644 --- a/iTorrent/Services/RssFeed/RssModel.swift +++ b/iTorrent/Services/RssFeed/RssModel.swift @@ -37,7 +37,7 @@ class RssModel: Hashable, Codable { init(link: URL) async throws { xmlLink = link - let (data, response) = try await URLSession.shared.data(from: xmlLink) + let (data, _) = try await URLSession.shared.data(from: xmlLink) guard let contents = String(data: data, encoding: .utf8) else { throw Error.corruptedData }