Merge pull request #2208 from nextcloud/develop4.5.3

V 4.5.3

7 files changed, 11 insertions, 5 deletions

diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
index d95284192..596c63aaa 100644
--- a/Nextcloud.xcodeproj/project.pbxproj
+++ b/Nextcloud.xcodeproj/project.pbxproj
@@ -3631,7 +3631,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.5.2;
+				MARKETING_VERSION = 4.5.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -3692,7 +3692,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.5.2;
+				MARKETING_VERSION = 4.5.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
diff --git a/iOSClient/Data/NCManageDatabase.swift b/iOSClient/Data/NCManageDatabase.swift
index 086539348..e57458eba 100644
--- a/iOSClient/Data/NCManageDatabase.swift
+++ b/iOSClient/Data/NCManageDatabase.swift
@@ -86,11 +86,12 @@ class NCManageDatabase: NSObject {
 
                 migrationBlock: { migration, oldSchemaVersion in
 
-                    if oldSchemaVersion < 254 {
+                    if oldSchemaVersion < 255 {
                         migration.deleteData(forType: tableActivity.className())
                         migration.deleteData(forType: tableActivityLatestId.className())
                         migration.deleteData(forType: tableActivityPreview.className())
                         migration.deleteData(forType: tableActivitySubjectRich.className())
+                        migration.deleteData(forType: tableDirectory.className())
                         migration.deleteData(forType: tableMetadata.className())
                     }
 
diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift
index 3316e61fd..b914c3fef 100644
--- a/iOSClient/NCGlobal.swift
+++ b/iOSClient/NCGlobal.swift
@@ -116,7 +116,7 @@ class NCGlobal: NSObject {
     // Database Realm
     //
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 254
+    let databaseSchemaVersion: UInt64               = 255
 
     // Intro selector
     //
diff --git a/iOSClient/Networking/NCAutoUpload.swift b/iOSClient/Networking/NCAutoUpload.swift
index 8f430aafe..22eef062f 100644
--- a/iOSClient/Networking/NCAutoUpload.swift
+++ b/iOSClient/Networking/NCAutoUpload.swift
@@ -34,7 +34,7 @@ class NCAutoUpload: NSObject {
 
     private var endForAssetToUpload: Bool = false
     private let appDelegate = UIApplication.shared.delegate as? AppDelegate
-    private let applicationState = UIApplication.shared.applicationState
+    private var applicationState = UIApplication.shared.applicationState
 
     // MARK: -
 
@@ -43,6 +43,7 @@ class NCAutoUpload: NSObject {
             completion(0)
             return
         }
+        applicationState = UIApplication.shared.applicationState
 
         NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
             guard hasPermission else {
@@ -60,6 +61,8 @@ class NCAutoUpload: NSObject {
 
     @objc func autoUploadFullPhotos(viewController: UIViewController?, log: String) {
 
+        applicationState = UIApplication.shared.applicationState
+
         NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
             guard hasPermission else { return }
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_create_full_upload_")
@@ -169,8 +172,10 @@ class NCAutoUpload: NSObject {
 
             self.endForAssetToUpload = true
             if selector == NCGlobal.shared.selectorUploadAutoUploadAll || self.applicationState == .active {
+                NKCommon.shared.writeLog("[INFO] Start createProcessUploads")
                 self.appDelegate?.networkingProcessUpload?.createProcessUploads(metadatas: metadatas, completion: completion)
             } else {
+                NKCommon.shared.writeLog("[INFO] Start createUploadProcessAutoUploadInBackground")
                 var metadatasForUpload: [tableMetadata] = []
                 for metadata in metadatas {
                     if NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ && serverUrl == %@ && fileName == %@ && session != ''", metadata.account, metadata.serverUrl, metadata.fileName)) != nil { continue }
diff --git a/iOSClient/Supporting Files/ru.lproj/Localizable.strings b/iOSClient/Supporting Files/ru.lproj/Localizable.strings
index a5b13079e..696027d60 100644
--- a/iOSClient/Supporting Files/ru.lproj/Localizable.strings
+++ b/iOSClient/Supporting Files/ru.lproj/Localizable.strings
diff --git a/iOSClient/Supporting Files/uk.lproj/Localizable.strings b/iOSClient/Supporting Files/uk.lproj/Localizable.strings
index aa322e869..50c3c7563 100644
--- a/iOSClient/Supporting Files/uk.lproj/Localizable.strings
+++ b/iOSClient/Supporting Files/uk.lproj/Localizable.strings
diff --git a/iOSClient/Supporting Files/zh-Hans.lproj/InfoPlist.strings b/iOSClient/Supporting Files/zh-Hans.lproj/InfoPlist.strings
index a732957e9..701370691 100644
--- a/iOSClient/Supporting Files/zh-Hans.lproj/InfoPlist.strings
+++ b/iOSClient/Supporting Files/zh-Hans.lproj/InfoPlist.strings