Revert to single FLS system

Author: SubvertDev

ForPDA/Resources/en.lproj/Localizable.strings

@@ -72,12 +72,10 @@
 "background.dark" = "Dark";
 "background.black" = "Black";
 "advanced" = "Advanced";
-"fast.loading.news" = "Fast loading news";
-"fast.loading.news.warning" = "After activiting this option some of the last news may not load and/or show wrong amount of comments";
-"fast.loading.article" = "Fast loading article";
-"fast.loading.article.warning" = "After activiting this option you won't see likes on the comments automatically";
+"fast.loading.system" = "Fast loading news";
+"fast.loading.system.warning" = "After activiting this option latest news may not load and show wrong amount of comments, and likes may not appear in articles";
 "comments.show.likes" = "Show likes";
-"comments.show.likes.warning" = "After activiting this option and \"Fast loading article\" you may see increase of traffic usage";
+"comments.show.likes.warning" = "After activiting this option with \"Fast loading article\" you may see increase in traffic usage";
 "account" = "Account";
 "sign.out" = "Sign Out";
 "about.app" = "About App";

ForPDA/Resources/ru.lproj/Localizable.strings

@@ -72,12 +72,10 @@
 "background.dark" = "Темный";
 "background.black" = "Черный";
 "advanced" = "Продвинутые";
-"fast.loading.news" = "Быстрая загрузка новостей";
-"fast.loading.news.warning" = "При активации этой функции последние статьи могут не отображаться, а количество лайков не соответствовать действительности";
-"fast.loading.article" = "Быстрая загрузка новости";
-"fast.loading.article.warning" = "После активации этой функции, количество лайков на комментариях не будет отображаться";
+"fast.loading.system" = "Быстрая загрузка новостей";
+"fast.loading.system.warning" = "При активации этой функции статьи могут обновляться с задержкой, отображать неверное количество комментариев, а лайки в статьях не отображаться";
 "comments.show.likes" = "Отображать лайки";
-"comments.show.likes.warning" = "При активации этой функции вместе с \"Быстрая загрузка новости\" может быть увеличенный расход трафика";
+"comments.show.likes.warning" = "При активации этой функции вместе с \"Быстрая загрузка новостей\" может быть увеличенный расход трафика";
 "account" = "Аккаунт";
 "sign.out" = "Выйти";
 "about.app" = "О приложении";

ForPDA/Sources/Modules/Article/ArticlePresenter.swift

@@ -72,10 +72,10 @@ final class ArticlePresenter: ArticlePresenterProtocol {
     // MARK: - Private Functions
 
     private func showLikesIfNeeded() async {
-        let articleUsesFLS = settingsService.getArticleFLS()
+        let isFLSEnabled = settingsService.getFastLoadingSystem()
         let showLikes = settingsService.getShowLikesInComments()
 
-        if articleUsesFLS && showLikes {
+        if isFLSEnabled && showLikes {
             await updateComments()
         }
     }

ForPDA/Sources/Modules/Comments/CommentsVC.swift

@@ -59,15 +59,15 @@ final class CommentsVC: CommentsViewController {
         tableView.isUserInteractionEnabled = false
         _currentlyDisplayed.removeAll()
 
-        DispatchQueue.global().async {
+        Task(priority: .background) {
             let newComments = self.parsingService.parseComments(from: document)
-            self.allComments = newComments
-            self.currentlyDisplayed = self.allComments
+            allComments = newComments
+            currentlyDisplayed = self.allComments
 
-            DispatchQueue.main.async {
-                self.updateDelegate?.updateFinished(true)
-                self.tableView.reloadData()
-                self.tableView.isUserInteractionEnabled = true
+            Task(priority: .userInitiated) {
+                updateDelegate?.updateFinished(true)
+                tableView.reloadData()
+                tableView.isUserInteractionEnabled = true
             }
         }
     }

ForPDA/Sources/Modules/Settings/SettingsPresenter.swift

@@ -13,7 +13,7 @@ protocol SettingsPresenterProtocol {
 
     func changeTheme(to theme: AppTheme)
     func changeDarkThemeBackgroundColor(to color: AppDarkThemeBackgroundColor)
-    func showNewsFLSSwitchTapped(isOn: Bool)
+    func fastLoadingSystemSwitchTapped(isOn: Bool)
     func showArticleFLSSwitchTapped(isOn: Bool)
     func showLikesInCommentsSwitchTapped(isOn: Bool)
 }
@@ -48,16 +48,12 @@ final class SettingsPresenter: SettingsPresenterProtocol {
         }
     }
 
-    private var currentShowLikesInComments: Bool {
-        settingsService.getShowLikesInComments()
+    private var isFLSEnabled: Bool {
+        settingsService.getFastLoadingSystem()
     }
 
-    private var newsUsesFLS: Bool {
-        settingsService.getNewsFLS()
-    }
-    
-    private var articleUsesFLS: Bool {
-        settingsService.getArticleFLS()
+    private var currentShowLikesInComments: Bool {
+        settingsService.getShowLikesInComments()
     }
 
     private let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0"
@@ -86,12 +82,8 @@ final class SettingsPresenter: SettingsPresenterProtocol {
             title: R.string.localizable.advanced(),
             options: [
                 .switchCell(model: SwitchOption(
-                    title: R.string.localizable.fastLoadingNews(),
-                    isOn: newsUsesFLS, handler: {})
-                ),
-                .switchCell(model: SwitchOption(
-                    title: R.string.localizable.fastLoadingArticle(),
-                    isOn: articleUsesFLS, handler: {})
+                    title: R.string.localizable.fastLoadingSystem(),
+                    isOn: isFLSEnabled, handler: {})
                 ),
                 .switchCell(model: SwitchOption(
                     title: R.string.localizable.commentsShowLikes(),
@@ -125,13 +117,13 @@ final class SettingsPresenter: SettingsPresenterProtocol {
         reloadData()
     }
 
-    func showNewsFLSSwitchTapped(isOn: Bool) {
-        settingsService.setNewsFLS(to: isOn)
+    func fastLoadingSystemSwitchTapped(isOn: Bool) {
+        settingsService.setFastLoadingSystem(to: isOn)
         reloadData(forceUpdate: false)
     }
 
     func showArticleFLSSwitchTapped(isOn: Bool) {
-        settingsService.setArticleFLS(to: isOn)
+        settingsService.setFastLoadingSystem(to: isOn)
         reloadData(forceUpdate: false)
     }
 
@@ -180,22 +172,16 @@ final class SettingsPresenter: SettingsPresenterProtocol {
         sections[1].options[1] = .descriptionCell(model: model2)
 
         let model3 = SwitchOption(
-            title: R.string.localizable.fastLoadingNews(),
-            isOn: settingsService.getNewsFLS(),
+            title: R.string.localizable.fastLoadingSystem(),
+            isOn: settingsService.getFastLoadingSystem(),
             handler: {})
         sections[2].options[0] = .switchCell(model: model3)
 
-        let model4 = SwitchOption(
-            title: R.string.localizable.fastLoadingArticle(),
-            isOn: settingsService.getArticleFLS(),
-            handler: {})
-        sections[2].options[1] = .switchCell(model: model4)
-        
         let model5 = SwitchOption(
             title: R.string.localizable.commentsShowLikes(),
             isOn: settingsService.getShowLikesInComments(),
             handler: {})
-        sections[2].options[2] = .switchCell(model: model5)
+        sections[2].options[1] = .switchCell(model: model5)
 
         if forceUpdate {
             view?.reloadData()

ForPDA/Sources/Modules/Settings/SettingsVC.swift

@@ -95,25 +95,18 @@ extension SettingsVC: UITableViewDelegate, UITableViewDataSource {
                 if !isOn {
                     switch indexPath.row {
                     case 0:
-                        presenter.showNewsFLSSwitchTapped(isOn: isOn)
+                        presenter.fastLoadingSystemSwitchTapped(isOn: isOn)
                     case 1:
-                        presenter.showArticleFLSSwitchTapped(isOn: isOn)
-                        // Workaround for always working comments on article sls
-                        if let cell = tableView.cellForRow(at: IndexPath(row: 2, section: 2)) as? SettingsSwitchCell {
-                            cell.forceSwitch(to: true)
-                            presenter.showLikesInCommentsSwitchTapped(isOn: true)
-                        }
-                    default:
                         presenter.showLikesInCommentsSwitchTapped(isOn: isOn)
+                    default:
+                        break
                     }
                     return
                 }
 
                 var message = ""
-                if model.title.contains("новостей") {
-                    message = R.string.localizable.fastLoadingNewsWarning()
-                } else if model.title.contains("новости") {
-                    message = R.string.localizable.fastLoadingArticleWarning()
+                if model.title.contains("новостей") || model.title.contains("news") {
+                    message = R.string.localizable.fastLoadingSystemWarning()
                 } else {
                     message = R.string.localizable.commentsShowLikesWarning()
                 }
@@ -126,24 +119,18 @@ extension SettingsVC: UITableViewDelegate, UITableViewDataSource {
 
                 let okAction = UIAlertAction(title: R.string.localizable.ok(), style: .default) { [weak self] _ in
                     guard let self else { return }
-                    switch indexPath.row {
-                    case 0:
-                        presenter.showNewsFLSSwitchTapped(isOn: isOn)
-                    case 1:
-                        presenter.showArticleFLSSwitchTapped(isOn: isOn)
-                    default:
+                    if indexPath.row == 0 {
+                        presenter.fastLoadingSystemSwitchTapped(isOn: isOn)
+                    } else {
                         presenter.showLikesInCommentsSwitchTapped(isOn: isOn)
                     }
                 }
                 let cancelAction = UIAlertAction(title: R.string.localizable.cancel(), style: .default) { [weak self] _ in
                     guard let self else { return }
                     cell.set(with: model)
-                    switch indexPath.row {
-                    case 0:
-                        presenter.showNewsFLSSwitchTapped(isOn: !isOn)
-                    case 1:
-                        presenter.showArticleFLSSwitchTapped(isOn: !isOn)
-                    default:
+                    if indexPath.row == 0 {
+                        presenter.fastLoadingSystemSwitchTapped(isOn: !isOn)
+                    } else {
                         presenter.showLikesInCommentsSwitchTapped(isOn: !isOn)
                     }
                 }

ForPDA/Sources/Services/Network/Base/HTTPClient.swift

@@ -9,11 +9,6 @@ import UIKit
 import WebKit
 import Factory
 
-enum LoadingSystem {
-    case fast // aka FLS
-    case slow // aka SLS
-}
-
 protocol HTTPClientProtocol {
     func request(endpoint: Endpoint) async throws -> String
 }
@@ -55,14 +50,8 @@ extension HTTPClient {
         switch endpoint {
         case let newsEndpoint as NewsEndpoint:
             switch newsEndpoint {
-            case .news:
-                if settingsService.getNewsFLS() {
-                    return try await fastRequest(endpoint: endpoint)
-                } else {
-                    return try await slowRequest(endpoint: endpoint)
-                }
-            case .article:
-                if settingsService.getArticleFLS() {
+            case .news, .article:
+                if settingsService.getFastLoadingSystem() {
                     return try await fastRequest(endpoint: endpoint)
                 } else {
                     return try await slowRequest(endpoint: endpoint)
@@ -117,7 +106,7 @@ extension HTTPClient {
         return try await withCheckedThrowingContinuation { continuation in
             if self.continuation != nil {
                 // Workaround for case when previous article is still loading,
-                // so continuation doesn't leak, object for testing
+                // so continuation doesn't leak, need testing
                 self.continuation?.resume(returning: "")
             }
             self.continuation = continuation

ForPDA/Sources/Services/Settings/SettingsService.swift

@@ -18,8 +18,7 @@ final class SettingsService {
         static let userId = "userId"
         static let appTheme = "appTheme"
         static let appDarkThemeBackgroundColor = "appDarkThemeBackgroundColor"
-        static let newsFLS = "newsFLS"
-        static let articleFLS = "articleFLS"
+        static let fastLoadingSystem = "fastLoadingSystem"
         static let showLikesInComments = "showLikesInComments"
         static let isDeeplinking = "isDeeplinking"
     }
@@ -120,24 +119,12 @@ final class SettingsService {
 
     // MARK: - Loading System
 
-    func setNewsFLS(to state: Bool) {
-        defaults.set(state, forKey: Keys.newsFLS)
+    func setFastLoadingSystem(to state: Bool) {
+        defaults.set(state, forKey: Keys.fastLoadingSystem)
     }
 
-    func getNewsFLS() -> Bool {
-        if let show = defaults.value(forKey: Keys.newsFLS) as? Bool {
-            return show
-        } else {
-            return true // Enabled by default
-        }
-    }
-    
-    func setArticleFLS(to state: Bool) {
-        defaults.set(state, forKey: Keys.articleFLS)
-    }
-    
-    func getArticleFLS() -> Bool {
-        if let show = defaults.value(forKey: Keys.articleFLS) as? Bool {
+    func getFastLoadingSystem() -> Bool {
+        if let show = defaults.value(forKey: Keys.fastLoadingSystem) as? Bool {
             return show
         } else {
             return true // Enabled by default