Fix trackers list out of bounds

XITRIX · Nov 22, 2024 · 03b43e2 · 03b43e2
1 parent ec6c70a
commit 03b43e2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/iTorrent/Screens/TorrentTrackers/TorrentTrackersViewModel.swift b/iTorrent/Screens/TorrentTrackers/TorrentTrackersViewModel.swift
@@ -94,7 +94,7 @@ private extension TorrentTrackersViewModel {
 
         var newTrackers: [TrackerCellViewModel] = []
         var trackerListChanged = false
-        for tracker in torrentHandle.trackers {
+        for tracker in torrentHandle.snapshot.trackers {
             if let oldTracker = trackers.first(where: { $0.url == tracker.trackerUrl }) {
                 oldTracker.update(with: tracker)
                 newTrackers.append(oldTracker)

diff --git a/iTorrent/Utils/NSUserDefaultItem.swift b/iTorrent/Utils/NSUserDefaultItem.swift
@@ -48,10 +48,11 @@ private extension NSUserDefaultItem {
         return try? NSKeyedUnarchiver.unarchivedObject(ofClass: Value.self, from: data)
     }
 
-    static func setValue(_ value: Value, for key: String) {
-        do {
-            let data = try NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: true)
+    static func setValue(_ value: Value?, for key: String) {
+        if let value, let data = try? NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: true) {
             userDefaults.set(data, forKey: key)
-        } catch {}
+        } else {
+            userDefaults.set(nil, forKey: key)
+        }
     }
 }
diff --git a/iTorrent/Utils/UserDefaultItem.swift b/iTorrent/Utils/UserDefaultItem.swift
@@ -43,15 +43,14 @@ private extension UserDefaultItem {
     static var userDefaults: UserDefaults { .itorrentGroup }
 
     static func value(for key: String) -> Value? {
-        guard let decoded = userDefaults.data(forKey: key),
-              let res = try? JSONDecoder().decode(Value.self, from: decoded)
+        guard let data = userDefaults.data(forKey: key)
         else { return nil }
-        return res
+        return try? JSONDecoder().decode(Value.self, from: data)
     }
 
     static func setValue(_ value: Value?, for key: String) {
-        if let value, let encodedData: Data = try? JSONEncoder().encode(value) {
-            userDefaults.set(encodedData, forKey: key)
+        if let value, let data: Data = try? JSONEncoder().encode(value) {
+            userDefaults.set(data, forKey: key)
         } else {
             userDefaults.set(nil, forKey: key)
         }