Version 6.1.7 (#3221)

Author: marinofaggiana

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 366
+let databaseSchemaVersion: UInt64   = 367

Brand/Intro/NCIntroCollectionViewCell.swift

@@ -31,9 +31,4 @@ class NCIntroCollectionViewCell: UICollectionViewCell {
     @IBOutlet weak var imageView: UIImageView!
 
     var indexPath = IndexPath()
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-    }
-
 }

Brand/NCBrand.swift

@@ -72,12 +72,13 @@ let userAgent: String = {
     var disable_show_more_nextcloud_apps_in_settings: Bool = false
     var doNotAskPasscodeAtStartup: Bool = false
     var disable_source_code_in_settings: Bool = false
+    var enforce_passcode_lock = false
 
     // (name: "Name 1", url: "https://cloud.nextcloud.com"),(name: "Name 2", url: "https://cloud.nextcloud.com")
     var enforce_servers: [(name: String, url: String)] = []
 
     // Internal option behaviour
-    var cleanUpDay: Int = 0                                                        // Set default "Delete, in the cache, all files older than" possible days value are: 0, 1, 7, 30, 90, 180, 365
+    var cleanUpDay: Int = 0                                                        // Set default "Delete all cached files older than" possible days value are: 0, 1, 7, 30, 90, 180, 365
 
     // Max download/upload concurrent
     let maxConcurrentOperationDownload: Int = 5
@@ -95,7 +96,6 @@ let userAgent: String = {
     override init() {
         // wrapper AppConfig
         if let configurationManaged = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"), use_AppConfig {
-
             if let str = configurationManaged[NCGlobal.shared.configuration_brand] as? String {
                 brand = str
             }
@@ -117,6 +117,9 @@ let userAgent: String = {
             if let str = configurationManaged[NCGlobal.shared.configuration_disable_openin_file] as? String {
                 disable_openin_file = (str as NSString).boolValue
             }
+            if let str = configurationManaged[NCGlobal.shared.configuration_enforce_passcode_lock] as? String {
+                enforce_passcode_lock = (str as NSString).boolValue
+            }
         }
     }
 

File Provider Extension UI/Base.lproj/MainInterface.storyboard renamed to File Provider Extension UI/MainInterface.storyboard

@@ -23,12 +23,13 @@ import UIKit
 import UserNotifications
 
 class NotificationService: UNNotificationServiceExtension {
-
     var contentHandler: ((UNNotificationContent) -> Void)?
     var bestAttemptContent: UNMutableNotificationContent?
+    var request: UNNotificationRequest?
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         self.contentHandler = contentHandler
+        self.request = request
         bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
 
         if let bestAttemptContent = bestAttemptContent {
@@ -37,11 +38,19 @@ class NotificationService: UNNotificationServiceExtension {
             do {
                 if let message = bestAttemptContent.userInfo["subject"] as? String {
                     for tableAccount in NCManageDatabase.shared.getAllTableAccount() {
-                        guard let privateKey = NCKeychain().getPushNotificationPrivateKey(account: tableAccount.account),
-                              let decryptedMessage = NCPushNotificationEncryption.shared().decryptPushNotification(message, withDevicePrivateKey: privateKey),
-                              let data = decryptedMessage.data(using: .utf8) else {
+                        guard let privateKey = NCKeychain().getPushNotificationPrivateKey(account: tableAccount.account) else {
+                            bestAttemptContent.body = "Error retrieving private key for \(tableAccount.account)"
+                            continue
+                        }
+                        guard let decryptedMessage = NCPushNotificationEncryption.shared().decryptPushNotification(message, withDevicePrivateKey: privateKey) else {
+                            bestAttemptContent.body = "Error decryption for \(tableAccount.account)"
+                            continue
+                        }
+                        guard let data = decryptedMessage.data(using: .utf8) else {
+                            bestAttemptContent.body = "Error decryption data utf8 for \(tableAccount.account)"
                             continue
                         }
+
                         if var json = try JSONSerialization.jsonObject(with: data) as? [String: AnyObject],
                            let subject = json["subject"] as? String {
                             bestAttemptContent.body = subject
@@ -50,7 +59,10 @@ class NotificationService: UNNotificationServiceExtension {
                                 pref.set(json, forKey: "NOTIFICATION_DATA")
                                 pref.synchronize()
                             }
+                        } else {
+                            bestAttemptContent.body = "Error JSON Serialization for  \(tableAccount.account)"
                         }
+                        break
                     }
                 }
             } catch let error as NSError {
@@ -66,9 +78,8 @@ class NotificationService: UNNotificationServiceExtension {
         // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
         if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
             bestAttemptContent.title = ""
-            bestAttemptContent.body = "Nextcloud notification"
+            bestAttemptContent.body = "Nextcloud Notification Time Will Expire"
             contentHandler(bestAttemptContent)
         }
     }
-
 }

Nextcloud.xcodeproj/project.pbxproj

@@ -106,6 +106,7 @@ extension NCShareExtension: NCCreateFormUploadConflictDelegate {
         }
 
         self.uploadMetadata.append(contentsOf: metadatas)
+        uploadStarted = true
         self.upload()
     }
 }

Notification Service Extension/NotificationService.swift

@@ -338,7 +338,7 @@ extension NCShareExtension {
             metadataForUpload.size = utilityFileSystem.getFileSize(filePath: toPath)
             metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
             metadataForUpload.sessionDate = Date()
-            if self.database.getMetadataConflict(account: session.account, serverUrl: serverUrl, fileNameView: fileName) != nil {
+            if self.database.getMetadataConflict(account: session.account, serverUrl: serverUrl, fileNameView: fileName, nativeFormat: metadataForUpload.nativeFormat) != nil {
                 conflicts.append(metadataForUpload)
             } else {
                 uploadMetadata.append(metadataForUpload)

Share/NCShareExtension+NCAccountRequestDelegate.swift

@@ -225,7 +225,7 @@ func getDashboardDataEntry(configuration: DashboardIntent?, isPreview: Bool, dis
                                     if FileManager().fileExists(atPath: fileNamePath), let image = UIImage(contentsOfFile: fileNamePath) {
                                         icon = image
                                     } else {
-                                        let (_, data, error) = await NCNetworking.shared.downloadPreview(url: url, account: activeTableAccount.account)
+                                        let (_, _, error) = await NCNetworking.shared.downloadPreview(url: url, account: activeTableAccount.account)
                                         if error == .success,
                                            let data = responseData?.data,
                                            let image = convertDataToImage(data: data, size: NCGlobal.shared.size256, fileNameToWrite: fileName) {

Share/NCShareExtension.swift

@@ -0,0 +1,18 @@
+"13zjVT" = "Account";
+
+"CAIVXf" = "Applications";
+
+"DN8Bxl" = "Account";
+
+"LIw8E9" = "Widget";
+
+"NO1rJU" = "Dashboard";
+
+"V3exc2" = "Account";
+
+"VfbA9C" = "Account";
+
+"ZgvlYN" = "Dashboard Widget";
+
+"tAlZ1R" = "Accounts";
+