Fix/issue 581

Core/Core/Configuration/Connectivity.swift

@@ -2,7 +2,7 @@
 //  Connectivity.swift
 //  OpenEdX
 //
-//  Created by  Stepanok Ivan on 15.12.2022.
+//  Created by  Stepanok Ivan on 15.12.2022.
 //
 
 import Alamofire
@@ -14,55 +14,99 @@ public enum InternetState: Sendable {
     case notReachable
 }
 
-//sourcery: AutoMockable
+// sourcery: AutoMockable
 @MainActor
 public protocol ConnectivityProtocol: Sendable {
     var isInternetAvaliable: Bool { get }
     var isMobileData: Bool { get }
     var internetReachableSubject: CurrentValueSubject<InternetState?, Never> { get }
 }
 
-@MainActor
 public class Connectivity: ConnectivityProtocol {
-    let networkManager = NetworkReachabilityManager()
-
-    public var isInternetAvaliable: Bool {
-        //        false
-        networkManager?.isReachable ?? false
+
+    private let networkManager = NetworkReachabilityManager()
+    private let verificationURL: URL
+    private let verificationTimeout: TimeInterval
+    private let cacheValidity: TimeInterval = 30
+
+    private var lastVerificationDate: TimeInterval?
+    private var lastVerificationResult: Bool = true
+
+    public let internetReachableSubject = CurrentValueSubject<InternetState?, Never>(nil)
+
+    private(set) var _isInternetAvailable: Bool = true {
+        didSet {
+            Task { @MainActor in
+                internetReachableSubject.send(_isInternetAvailable ? .reachable : .notReachable)
+            }
+        }
     }
-
-    public var isMobileData: Bool {
-        if let networkManager {
-           return networkManager.isReachableOnCellular
-        } else {
-            return false
+
+    public var isInternetAvaliable: Bool {
+        if let last = lastVerificationDate,
+           Date().timeIntervalSince1970 - last < cacheValidity {
+            return lastVerificationResult
+        }
+
+        Task {
+            await performVerification()
         }
+
+        return lastVerificationResult
     }
-
-    public let internetReachableSubject = CurrentValueSubject<InternetState?, Never>(nil)
-
-    public init() {
-        checkInternet()
+
+    public var isMobileData: Bool {
+        networkManager?.isReachableOnCellular == true
     }
-
-    func checkInternet() {
-        if let networkManager {
-            networkManager.startListening { status in
-                DispatchQueue.main.async {
-                    switch status {
-                    case .unknown:
-                        self.internetReachableSubject.send(InternetState.notReachable)
-                    case .notReachable:
-                        self.internetReachableSubject.send(InternetState.notReachable)
-                    case .reachable:
-                        self.internetReachableSubject.send(InternetState.reachable)
-                    }
+
+    public init(
+        config: ConfigProtocol,
+        timeout: TimeInterval = 15
+    ) {
+        self.verificationURL = config.baseURL
+        self.verificationTimeout = timeout
+
+        networkManager?.startListening(onQueue: .global()) { [weak self] status in
+            guard let self = self else { return }
+            Task { @MainActor in
+                switch status {
+                case .reachable:
+                    await self.performVerification()
+                case .notReachable, .unknown:
+                    self.updateAvailability(false, at: 0)
                 }
             }
-        } else {
-            DispatchQueue.main.async {
-                self.internetReachableSubject.send(InternetState.notReachable)
+        }
+    }
+
+    deinit {
+        networkManager?.stopListening()
+    }
+
+    private func performVerification() async {
+        let now = Date().timeIntervalSince1970
+        let live = await verifyInternet()
+        updateAvailability(live, at: now)
+    }
+
+    private func updateAvailability(_ available: Bool, at timestamp: TimeInterval) {
+        _isInternetAvailable = available
+        lastVerificationDate = timestamp
+        lastVerificationResult = available
+    }
+
+    private func verifyInternet() async -> Bool {
+        var request = URLRequest(url: verificationURL)
+        request.httpMethod = "HEAD"
+        request.timeoutInterval = verificationTimeout
+        do {
+            let (_, response) = try await URLSession.shared.data(for: request)
+            if let http = response as? HTTPURLResponse, (200..<400).contains(http.statusCode) {
+                return true
             }
+        } catch {
+            return false
         }
+        return false
     }
 }

Core/Core/View/Base/OfflineSnackBarView.swift

@@ -79,6 +79,7 @@ public struct OfflineSnackBarView: View {
 
 struct OfflineSnackBarView_Previews: PreviewProvider {
     static var previews: some View {
-        OfflineSnackBarView(connectivity: Connectivity(), reloadAction: {})
+        let configMock = ConfigMock()
+        OfflineSnackBarView(connectivity: Connectivity(config: configMock), reloadAction: {})
     }
 }

Core/Core/View/Base/WebBrowser.swift

@@ -81,6 +81,7 @@ public struct WebBrowser: View {
 
 struct WebBrowser_Previews: PreviewProvider {
     static var previews: some View {
-        WebBrowser(url: "", pageTitle: "", connectivity: Connectivity())
+        let configMock = ConfigMock()
+        WebBrowser(url: "", pageTitle: "", connectivity: Connectivity(config: configMock))
     }
 }

Course/Course/Presentation/Container/CourseContainerView.swift

@@ -387,7 +387,7 @@ public struct CourseContainerView: View {
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
             config: ConfigMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             manager: DownloadManagerMock(),
             storage: CourseStorageMock(),
             isActive: true,
@@ -403,7 +403,7 @@ public struct CourseContainerView: View {
             interactor: CourseInteractor.mock,
             router: CourseRouterMock(),
             cssInjector: CSSInjectorMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             config: ConfigMock(),
             courseID: "1",
             courseName: "a",
@@ -414,7 +414,7 @@ public struct CourseContainerView: View {
             interactor: CourseInteractor.mock,
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
         ),
         courseID: "",
         title: "Title of Course",

Course/Course/Presentation/Container/CourseContainerViewModel.swift

@@ -122,6 +122,7 @@ public final class CourseContainerViewModel: BaseCourseViewModel {
 
     private let interactor: CourseInteractorProtocol
     private let authInteractor: AuthInteractorProtocol
+
     let analytics: CourseAnalytics
     let coreAnalytics: CoreAnalytics
     private(set) var storage: CourseStorage
@@ -214,7 +215,7 @@ public final class CourseContainerViewModel: BaseCourseViewModel {
             courseVideoStructure: nil
         )
     }
-    
+
     @MainActor
     func getCourseStructure(courseID: String) async throws -> CourseStructure? {
         if isInternetAvaliable {
@@ -1766,7 +1767,7 @@ extension CourseContainerViewModel {
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
             config: ConfigMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             manager: DownloadManagerMock(),
             storage: CourseStorageMock(),
             isActive: true,

Course/Course/Presentation/Content/CourseContentView.swift

@@ -266,7 +266,7 @@ public struct CourseContentView: View {
         router: CourseRouterMock(),
         analytics: CourseAnalyticsMock(),
         config: ConfigMock(),
-        connectivity: Connectivity(),
+        connectivity: Connectivity(config: ConfigMock()),
         manager: DownloadManagerMock(),
         storage: CourseStorageMock(),
         isActive: true,

Course/Course/Presentation/Content/Subviews/AllContentView.swift

@@ -142,7 +142,7 @@ struct AllContentView: View {
         router: CourseRouterMock(),
         analytics: CourseAnalyticsMock(),
         config: ConfigMock(),
-        connectivity: Connectivity(),
+        connectivity: Connectivity(config: ConfigMock()),
         manager: DownloadManagerMock(),
         storage: CourseStorageMock(),
         isActive: true,

Course/Course/Presentation/Dates/CourseDatesView.swift

@@ -196,7 +196,7 @@ struct CourseDatesView_Previews: PreviewProvider {
             interactor: CourseInteractor(repository: CourseRepositoryMock()),
             router: CourseRouterMock(),
             cssInjector: CSSInjectorMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             config: ConfigMock(),
             courseID: "",
             courseName: "",

Course/Course/Presentation/Handouts/HandoutsView.swift

@@ -123,7 +123,7 @@ struct HandoutsView_Previews: PreviewProvider {
         let viewModel = HandoutsViewModel(interactor: CourseInteractor.mock,
                                           router: CourseRouterMock(),
                                           cssInjector: CSSInjectorMock(),
-                                          connectivity: Connectivity(),
+                                          connectivity: Connectivity(config: ConfigMock()),
                                           courseID: "",
                                           analytics: CourseAnalyticsMock())
         HandoutsView(

Course/Course/Presentation/NewOutlIineAndProgress/CourseOutlineAndProgressView.swift

@@ -466,15 +466,15 @@ public struct CourseOutlineAndProgressView: View {
         interactor: CourseInteractor.mock,
         router: CourseRouterMock(),
         analytics: CourseAnalyticsMock(),
-        connectivity: Connectivity()
+        connectivity: Connectivity(config: ConfigMock())
     )
     let vmOutline = CourseContainerViewModel(
         interactor: CourseInteractor.mock,
         authInteractor: AuthInteractor.mock,
         router: CourseRouterMock(),
         analytics: CourseAnalyticsMock(),
         config: ConfigMock(),
-        connectivity: Connectivity(),
+        connectivity: Connectivity(config: ConfigMock()),
         manager: DownloadManagerMock(),
         storage: CourseStorageMock(),
         isActive: true,
@@ -487,7 +487,7 @@ public struct CourseOutlineAndProgressView: View {
         courseHelper: CourseDownloadHelper(courseStructure: nil, manager: DownloadManagerMock())
     )
 
-    return PreviewContainer(
+    PreviewContainer(
         viewModelContainer: vmOutline,
         viewModelProgress: vmProgress
     )
@@ -514,7 +514,7 @@ private struct PreviewContainer: View {
             collapsed: $collapsed,
             viewHeight: $viewHeight,
             dateTabIndex: 2,
-            connectivity: Connectivity()
+            connectivity: Connectivity(config: ConfigMock())
         )
         .loadFonts()
         .task {

Course/Course/Presentation/Offline/OfflineView.swift

@@ -249,7 +249,7 @@ struct OfflineView: View {
         router: CourseRouterMock(),
         analytics: CourseAnalyticsMock(),
         config: ConfigMock(),
-        connectivity: Connectivity(),
+        connectivity: Connectivity(config: ConfigMock()),
         manager: DownloadManagerMock(),
         storage: CourseStorageMock(),
         isActive: true,

Course/Course/Presentation/Offline/Subviews/LargestDownloadsView.swift

@@ -93,7 +93,7 @@ struct LargestDownloadsView_Previews: PreviewProvider {
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
             config: ConfigMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             manager: DownloadManagerMock(),
             storage: CourseStorageMock(),
             isActive: true,

Course/Course/Presentation/Outline/CourseOutlineView.swift

@@ -67,7 +67,9 @@ public struct CourseOutlineView: View {
                                 collapsed: $collapsed,
                                 viewHeight: $viewHeight
                             )
+
                             RefreshProgressView(isShowRefresh: $viewModel.isShowRefresh)
+
                             VStack(alignment: .leading) {
 
                                 if isVideo,
@@ -334,7 +336,7 @@ struct CourseOutlineView_Previews: PreviewProvider {
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
             config: ConfigMock(),
-            connectivity: Connectivity(),
+            connectivity: Connectivity(config: ConfigMock()),
             manager: DownloadManagerMock(),
             storage: CourseStorageMock(),
             isActive: true,

Course/Course/Presentation/Outline/CourseVertical/CourseVerticalView.swift

@@ -184,9 +184,9 @@ struct CourseVerticalView_Previews: PreviewProvider {
             sequentialIndex: 0,
             router: CourseRouterMock(),
             analytics: CourseAnalyticsMock(),
-            connectivity: Connectivity()
+            connectivity: Connectivity(config: ConfigMock())
         )
-        
+
         return Group {
             CourseVerticalView(
                 title: "Course title",

Course/Course/Presentation/Progress/CourseProgressScreenView.swift

@@ -19,6 +19,7 @@ struct CourseProgressScreenView: View {
 
     @StateObject
     private var viewModel: CourseProgressViewModel
+    private let initialCourseStructure: CourseStructure?
 
     private let connectivity: ConnectivityProtocol
 
@@ -37,7 +38,7 @@ struct CourseProgressScreenView: View {
         self._viewHeight = viewHeight
         self._viewModel = StateObject(wrappedValue: { viewModel }())
         self.connectivity = connectivity
-        self.viewModel.courseStructure = courseStructure
+        self.initialCourseStructure = courseStructure
     }
 
     public var body: some View {
@@ -111,6 +112,9 @@ struct CourseProgressScreenView: View {
                     .ignoresSafeArea()
             )
             .onFirstAppear {
+                if viewModel.courseStructure == nil {
+                    viewModel.courseStructure = initialCourseStructure
+                }
                 Task {
                     await viewModel.getCourseProgress(courseID: courseID)
                 }
@@ -222,3 +226,25 @@ struct CourseProgressScreenView: View {
         }
     }
 }
+
+#if DEBUG
+#Preview {
+    let vm = CourseProgressViewModel(
+        interactor: CourseInteractor.mock,
+        router: CourseRouterMock(),
+        analytics: CourseAnalyticsMock(),
+        connectivity: Connectivity(config: ConfigMock())
+    )
+
+    CourseProgressScreenView(
+        courseID: "test",
+        coordinate: .constant(0),
+        collapsed: .constant(false),
+        viewHeight: .constant(0),
+        viewModel: vm,
+        connectivity: Connectivity(config: ConfigMock()),
+        courseStructure: nil
+    )
+    .loadFonts()
+}
+#endif