NMC 2575 - App update changes

Author: harshada-15-tsys

iOSClient/AppUpdate/AppUpdater.swift

@@ -29,8 +29,8 @@ class AppUpdater {
             }
         }
     }
-    
-    func showUpdateAlert(version: String, isForceUpdate: Bool){
+
+    func showUpdateAlert(version: String, isForceUpdate: Bool) {
         guard let appDelegate = UIApplication.shared.delegate as? AppDelegate, let viewControlller = appDelegate.window?.rootViewController else { return }
         let descriptionMsg = String(format: NSLocalizedString("update_description", comment: ""), version)
         let alert = UIAlertController(title: NSLocalizedString("update_available", comment: ""), message: descriptionMsg, preferredStyle: .alert)
@@ -47,7 +47,7 @@ class AppUpdater {
         alert.preferredAction = updateAction
         viewControlller.present(alert, animated: true, completion: {})
     }
-    
+
     func checkLastUpdate() -> Bool {
         if let lastUpdateCheckDate = UserDefaults.standard.object(forKey: AppUpdaterKey.lastUpdateCheckDate) as? Date {
             return daysBetweenDate(from: lastUpdateCheckDate) > 7
@@ -56,7 +56,7 @@ class AppUpdater {
         }
     }
 
-    func checkUpdate(completion: @escaping (String?, Bool?) -> Void)  {
+    func checkUpdate(completion: @escaping (String?, Bool?) -> Void) {
         let remoteConfig = RemoteConfig.remoteConfig()
         remoteConfig.fetch(withExpirationDuration: 1) { (status, error) in
             if status == .success {
@@ -70,21 +70,12 @@ class AppUpdater {
 //                    if let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
                         if iOSVersion != currentVersion {
                             // There is an update available
-                            completion(iOSVersionString,isForcheUpdate)
+                            completion(iOSVersionString, isForcheUpdate)
                         } else {
                             completion(nil, nil)
                         }
                     }
-//                    let iOSVersion = remoteConfig["ios_app_version"].stringValue ?? "default_value"
-//                    let isForcheUpdate = remoteConfig["ios_force_update"].boolValue
-//                    if let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
-//                        if iOSVersion != currentVersion {
-//                            // There is an update available
-//                            completion(iOSVersion,isForcheUpdate)
-//                        } else {
-//                            completion(nil, nil)
-//                        }
-//                    }
+
                 }
             } else {
                 // Handle error
@@ -93,11 +84,11 @@ class AppUpdater {
             }
         }
     }
-    
+
     func saveAppUpdateCheckDate() {
         UserDefaults.standard.setValue(Date(), forKey: AppUpdaterKey.lastUpdateCheckDate)
     }
-    
+
     func daysBetweenDate(from date: Date) -> Int {
         return Calendar.current.dateComponents([.day], from: date, to: Date()).day ?? 0
     }

iOSClient/SceneDelegate.swift

@@ -114,11 +114,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             NCPreferences().removeAll()
 
             if let bundleID = Bundle.main.bundleIdentifier {
-                let lastUpdateCheckDate = UserDefaults.standard.object(forKey: AppUpdaterKey.lastUpdateCheckDate)
                 UserDefaults.standard.removePersistentDomain(forName: bundleID)
-                if lastUpdateCheckDate != nil {
-                    UserDefaults.standard.setValue(lastUpdateCheckDate, forKey: AppUpdaterKey.lastUpdateCheckDate)
-                }
             }
 
             if NCBrandOptions.shared.disable_intro {
@@ -128,7 +124,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                     window?.makeKeyAndVisible()
                 }
             } else {
-                if let navigationController = UIStoryboard(name: "NCIntro", bundle: nil).instantiateInitialViewController() as? UINavigationController {
+                if let viewController = UIStoryboard(name: "NCIntro", bundle: nil).instantiateInitialViewController() as? NCIntroViewController {
+                    let navigationController = UINavigationController(rootViewController: viewController)
                     window?.rootViewController = navigationController
                     window?.makeKeyAndVisible()
                 }
@@ -211,15 +208,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     func sceneWillEnterForeground(_ scene: UIScene) {
         hidePrivacyProtectionWindow()
-
+        
         if let rootHostingController = scene.rootHostingController() {
             if rootHostingController.anyRootView is Maintenance {
                 return
             }
         }
         let session = SceneManager.shared.getSession(scene: scene)
         let controller = SceneManager.shared.getController(scene: scene)
-
+        
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             Task {
                 if let tableAccount = await self.database.getTableAccountAsync(account: session.account) {
@@ -229,29 +226,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             }
         }
         AppUpdater().checkForUpdate()
-
+        
         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterRichdocumentGrabFocus)
+        activateSceneForAccount(scene, account: session.account, controller: controller)
     }
 
     func sceneDidBecomeActive(_ scene: UIScene) {
-        let session = SceneManager.shared.getSession(scene: scene)
-        let controller = SceneManager.shared.getController(scene: scene)
-        NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Scene did become active")
-
-        let oldVersion = UserDefaults.standard.value(forKey: NCSettingsBundleHelper.SettingsBundleKeys.BuildVersionKey) as? String
-        AppUpdater().checkForUpdate()
-        AnalyticsHelper.shared.trackAppVersion(oldVersion: oldVersion)
-        if let userAccount = NCManageDatabase.shared.getActiveTableAccount() {
-            AnalyticsHelper.shared.trackUsedStorageData(quotaUsed: userAccount.quotaUsed)
-        }
-
-        NCSettingsBundleHelper.setVersionAndBuildNumber()
-        NCSettingsBundleHelper.checkAndExecuteSettings(delay: 0.5)
-        
-//        if !NCAskAuthorization().isRequesting {
-//            NCPasscode.shared.hidePrivacyProtectionWindow()
-//        }
-        
         hidePrivacyProtectionWindow()
 
         if !NextcloudKit.shared.isNetworkReachable(),
@@ -266,13 +246,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
-//    func sceneDidBecomeActive(_ scene: UIScene) {
-//        let session = SceneManager.shared.getSession(scene: scene)
-//        guard !session.account.isEmpty else { return }
-//
-//        hidePrivacyProtectionWindow()
-//    }
-
     func sceneWillResignActive(_ scene: UIScene) {
         nkLog(debug: "Scene will resign active")
 
@@ -281,6 +254,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             return
         }
 
+        WidgetCenter.shared.reloadAllTimelines()
+
         if NCPreferences().privacyScreenEnabled {
             showPrivacyProtectionWindow()
         }
@@ -290,6 +265,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         let app = UIApplication.shared
         var bgID: UIBackgroundTaskIdentifier = .invalid
         let isBackgroundRefreshStatus = (UIApplication.shared.backgroundRefreshStatus == .available)
+        // Must be outside the Task otherwise isSuspendingDatabaseOperation suspends it
         let session = SceneManager.shared.getSession(scene: scene)
         guard let tblAccount = NCManageDatabase.shared.getTableAccount(predicate: NSPredicate(format: "account == %@", session.account)) else {
             return
@@ -542,10 +518,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     private func showPrivacyProtectionWindow() {
-        guard privacyProtectionWindow == nil else {
-            privacyProtectionWindow?.isHidden = false
-            return
-        }
         guard let windowScene = self.window?.windowScene else {
             return
         }