chore: Merge branch 'master' into bumpCI

Project.swift

@@ -125,7 +125,8 @@ let project = Project(name: "kDrive",
                                  dependencies: [
                                      .target(name: "kDrive"),
                                      .target(name: "kDriveCore")
-                                 ]),
+                                 ],
+                                 settings: .settings(base: Constants.testSettings)),
                           Target(name: "kDriveResources",
                                  platform: .iOS,
                                  product: .staticLibrary,

Tuist/ProjectDescriptionHelpers/Constants.swift

@@ -19,6 +19,10 @@
 import ProjectDescription
 
 public enum Constants {
+    public static let testSettings: [String: SettingValue] = [
+        "SWIFT_ACTIVE_COMPILATION_CONDITIONS": "TEST DEBUG"
+    ]
+
     public static let baseSettings = SettingsDictionary()
         .automaticCodeSigning(devTeam: "864VDCS2QY")
         .currentProjectVersion("1")

kDrive/UI/Controller/Files/File List/FileListViewController.swift

@@ -229,6 +229,7 @@ class FileListViewController: UIViewController, UICollectionViewDataSource, Swip
 
         navigationController?.setInfomaniakAppearanceNavigationBar()
 
+        guard viewModel != nil else { return }
         #if !ISEXTENSION
         let plusButtonDirectory: File
         if viewModel.currentDirectory.id >= DriveFileManager.constants.rootID {

kDrive/UI/Controller/Files/File List/FileListViewModel.swift

@@ -107,7 +107,7 @@ class FileListViewModel: SelectDelegate {
     /// Internal realm collection of Files observed
     ///
     /// They should be frozen by convention.
-    #if DEBUG
+    #if DEBUG || TEST
     var _frozenFiles = AnyRealmCollection(List<File>()) {
         willSet {
             for item in newValue {

kDrive/UI/Controller/MainTabViewController.swift

@@ -101,6 +101,7 @@ class MainTabViewController: UITabBarController, Restorable {
         let homeViewController = HomeViewController(driveFileManager: driveFileManager)
         let navigationViewController = TitleSizeAdjustingNavigationController(rootViewController: homeViewController)
         navigationViewController.navigationBar.prefersLargeTitles = true
+        navigationViewController.restorationIdentifier = String(describing: HomeViewController.self)
         navigationViewController.tabBarItem.accessibilityLabel = KDriveResourcesStrings.Localizable.homeTitle
         navigationViewController.tabBarItem.image = KDriveResourcesAsset.house.image
         navigationViewController.tabBarItem.selectedImage = KDriveResourcesAsset.houseFill.image
@@ -111,6 +112,7 @@ class MainTabViewController: UITabBarController, Restorable {
         let menuViewController = MenuViewController(driveFileManager: driveFileManager)
         let navigationViewController = TitleSizeAdjustingNavigationController(rootViewController: menuViewController)
         let (placeholder, placeholderSelected) = generateProfileTabImages(image: KDriveResourcesAsset.placeholderAvatar.image)
+        navigationViewController.restorationIdentifier = String(describing: MenuViewController.self)
         navigationViewController.tabBarItem.accessibilityLabel = KDriveResourcesStrings.Localizable.menuTitle
         navigationViewController.tabBarItem.image = placeholder
         navigationViewController.tabBarItem.selectedImage = placeholderSelected
@@ -120,6 +122,7 @@ class MainTabViewController: UITabBarController, Restorable {
     private static func initRootViewController(with viewModel: FileListViewModel) -> UIViewController {
         let fileListViewController = FileListViewController.instantiate(viewModel: viewModel)
         let navigationViewController = TitleSizeAdjustingNavigationController(rootViewController: fileListViewController)
+        navigationViewController.restorationIdentifier = String(describing: type(of: viewModel))
         navigationViewController.navigationBar.prefersLargeTitles = true
         navigationViewController.tabBarItem.accessibilityLabel = viewModel.title
         navigationViewController.tabBarItem.image = viewModel.configuration.tabBarIcon.image

kDrive/Utils/MatomoUtils.swift

@@ -24,7 +24,7 @@ import MatomoTracker
 class MatomoUtils {
     static let shared: MatomoTracker = {
         let tracker = MatomoTracker(siteId: "8", baseURL: URLConstants.matomo.url)
-        #if DEBUG
+        #if DEBUG || TEST
         tracker.isOptedOut = true
         #endif
         @InjectService var accountManager: AccountManageable

kDriveCore/Utils/Logging.swift

@@ -50,7 +50,7 @@ public enum Logging {
         ]
         SentryDebug.capture(error: error, context: context, contextKey: "Realm")
 
-        #if DEBUG
+        #if DEBUG && !TEST
         copyDebugInformations()
         DDLogError(
             "Realm files \(realmConfiguration.fileURL?.lastPathComponent ?? "") will be deleted to prevent migration error for next launch"
@@ -79,9 +79,9 @@ public enum Logging {
     }
 
     private static func initNetworkLogging() {
-        #if DEBUG
+        #if DEBUG && !TEST
         if !Bundle.main.isExtension {
-//                Atlantis.start(hostName: ProcessInfo.processInfo.environment["hostname"])
+            Atlantis.start(hostName: ProcessInfo.processInfo.environment["hostname"])
         }
         #endif
     }
@@ -95,7 +95,7 @@ public enum Logging {
                     "AppLock enabled": UserDefaults.shared.isAppLockEnabled,
                     "Wifi only enabled": UserDefaults.shared.isWifiOnly
                 ]
-                #if DEBUG
+                #if DEBUG || TEST
                 return nil
                 #else
                 return event
@@ -105,7 +105,7 @@ public enum Logging {
     }
 
     private static func copyDebugInformations() {
-        #if DEBUG
+        #if DEBUG && !TEST
         guard !Bundle.main.isExtension else { return }
         let fileManager = FileManager.default
         let debugDirectory = (fileManager.urls(for: .documentDirectory, in: .userDomainMask).first?.appendingPathComponent(

kDriveTestShared/TestsPreconditions.swift

@@ -0,0 +1,36 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2022 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import XCTest
+
+/// Sanity checks of SWIFT_ACTIVE_COMPILATION_CONDITIONS
+final class TestsPreconditions: XCTestCase {
+    func testTestFlagIsSet() {
+        // WHEN
+        #if !TEST
+        XCTFail("the TEST flag is expected to be set in test target")
+        #endif
+    }
+
+    func testDebugFlagIsSet() {
+        // WHEN
+        #if !DEBUG
+        XCTFail("the DEBUG flag is expected to be set in test target")
+        #endif
+    }
+}