瀏覽代碼

lint

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>
Marino Faggiana 1 年之前
父節點
當前提交
3902ccc6da
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      iOSClient/NCGlobal.swift
  2. 2 2
      iOSClient/Utility/NCLivePhoto.swift

+ 2 - 2
iOSClient/NCGlobal.swift

@@ -103,6 +103,8 @@ class NCGlobal: NSObject {
     let nextcloudVersion25: Int                     = 25
     let nextcloudVersion25: Int                     = 25
     let nextcloudVersion26: Int                     = 26
     let nextcloudVersion26: Int                     = 26
     let nextcloudVersion27: Int                     = 27
     let nextcloudVersion27: Int                     = 27
+    let nextcloudVersion28: Int                     = 28
+    let nextcloudVersion29: Int                     = 29
 
 
     // Nextcloud unsupported
     // Nextcloud unsupported
     //
     //
@@ -448,8 +450,6 @@ class NCGlobal: NSObject {
     var capabilityFileSharingRemoteExpireDateEnforced: Bool     = false
     var capabilityFileSharingRemoteExpireDateEnforced: Bool     = false
     var capabilityFileSharingRemoteExpireDateDays: Int          = 0
     var capabilityFileSharingRemoteExpireDateDays: Int          = 0
     var capabilityFileSharingDefaultPermission: Int             = 0
     var capabilityFileSharingDefaultPermission: Int             = 0
-    var capabilityFileLivePhoto: Bool                           = false
-
 
 
     var capabilityThemingColor: String                          = ""
     var capabilityThemingColor: String                          = ""
     var capabilityThemingColorElement: String                   = ""
     var capabilityThemingColorElement: String                   = ""

+ 2 - 2
iOSClient/Utility/NCLivePhoto.swift

@@ -472,7 +472,7 @@ extension NCLivePhoto {
 
 
     func setLivephotoUpload(metadata: tableMetadata) {
     func setLivephotoUpload(metadata: tableMetadata) {
 
 
-        guard NCGlobal.shared.capabilityFileLivePhoto else { return }
+        guard NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion28 else { return }
 
 
         livePhotoFile = metadata.livePhotoFile
         livePhotoFile = metadata.livePhotoFile
         livePhotoFile2 = metadata.fileName
         livePhotoFile2 = metadata.fileName
@@ -504,7 +504,7 @@ extension NCLivePhoto {
 
 
     func setLivePhoto(metadata1: tableMetadata, metadata2: tableMetadata) {
     func setLivePhoto(metadata1: tableMetadata, metadata2: tableMetadata) {
 
 
-        guard NCGlobal.shared.capabilityFileLivePhoto,
+        guard NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion28,
               (!metadata1.livePhotoFile.isEmpty && !metadata2.livePhotoFile.isEmpty) else { return }
               (!metadata1.livePhotoFile.isEmpty && !metadata2.livePhotoFile.isEmpty) else { return }
 
 
         Task {
         Task {