Browse Source

Fix files lock negative timeout

- don't show negative timeouts, instead fallback to lock creation time
  -if a lock is expired but hasn't updated yet
  - for infinite locks with a TTL of 0s

Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>
Henrik Storch 2 năm trước cách đây
mục cha
commit
79e64d0a9f
1 tập tin đã thay đổi với 4 bổ sung2 xóa
  1. 4 2
      iOSClient/Menu/NCCollectionViewCommon+Menu.swift

+ 4 - 2
iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -73,7 +73,6 @@ extension NCCollectionViewCommon {
         )
 
         if metadata.lock {
-            var lockTimeString: String?
             var lockOwnerName = metadata.lockOwnerDisplayName.isEmpty ? metadata.lockOwner : metadata.lockOwnerDisplayName
             var lockIcon = NCUtility.shared.loadUserImage(for: metadata.lockOwner, displayName: lockOwnerName, userBaseUrl: metadata)
             if metadata.lockOwnerType != 0 {
@@ -82,7 +81,10 @@ extension NCCollectionViewCommon {
                     lockIcon = appIcon
                 }
             }
-            if let lockTime = metadata.lockTimeOut, let timeInterval = (lockTime.timeIntervalSince1970 - Date().timeIntervalSince1970).format() {
+
+            var lockTimeString: String?
+            if let lockTime = metadata.lockTimeOut, lockTime > Date(),
+               let timeInterval = (lockTime.timeIntervalSince1970 - Date().timeIntervalSince1970).format() {
                 lockTimeString = String(format: NSLocalizedString("_time_remaining_", comment: ""), timeInterval)
             } else if let lockTime = metadata.lockTime {
                 lockTimeString = DateFormatter.localizedString(from: lockTime, dateStyle: .short, timeStyle: .short)