Address deprecations with NSKeyedUnarchiver

transmission · Apr 23, 2022 · fa1da2b · fa1da2b
1 parent 4f70baa
commit fa1da2b
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 8 deletions.
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
@@ -3563,7 +3563,15 @@ - (BOOL)outlineView:(NSOutlineView*)outlineView acceptDrop:(id<NSDraggingInfo>)i
     NSPasteboard* pasteboard = info.draggingPasteboard;
     if ([pasteboard.types containsObject:TORRENT_TABLE_VIEW_DATA_TYPE])
     {
-        NSIndexSet* indexes = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:TORRENT_TABLE_VIEW_DATA_TYPE]];
+        NSIndexSet* indexes;
+        if (@available(macOS 10.13, *))
+        {
+            indexes = [NSKeyedUnarchiver unarchivedObjectOfClass:NSIndexSet.class fromData:[pasteboard dataForType:TORRENT_TABLE_VIEW_DATA_TYPE] error:nil];
+        }
+        else
+        {
+            indexes = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:TORRENT_TABLE_VIEW_DATA_TYPE]];
+        }
 
         //get the torrents to move
         NSMutableArray* movingTorrents = [NSMutableArray arrayWithCapacity:indexes.count];

diff --git a/macosx/GroupsController.mm b/macosx/GroupsController.mm
@@ -40,15 +40,22 @@ - (instancetype)init
         NSData* data;
         if ((data = [NSUserDefaults.standardUserDefaults dataForKey:@"GroupDicts"]))
         {
-            _fGroups = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+            if (@available(macOS 10.13, *))
+            {
+                _fGroups = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet setWithObjects:NSMutableArray.class, NSMutableDictionary.class, NSNumber.class, NSColor.class, NSString.class, nil] fromData:data error:nil];
+            }
+            else
+            {
+                _fGroups = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+            }
         }
         else if ((data = [NSUserDefaults.standardUserDefaults dataForKey:@"Groups"])) //handle old groups
         {
             _fGroups = [NSUnarchiver unarchiveObjectWithData:data];
             [NSUserDefaults.standardUserDefaults removeObjectForKey:@"Groups"];
             [self saveGroups];
         }
-        else
+        if (_fGroups == nil)
         {
             //default groups
             NSMutableDictionary* red = [NSMutableDictionary

diff --git a/macosx/GroupsPrefsController.mm b/macosx/GroupsPrefsController.mm
@@ -122,7 +122,15 @@ - (BOOL)tableView:(NSTableView*)tableView
     NSPasteboard* pasteboard = info.draggingPasteboard;
     if ([pasteboard.types containsObject:GROUP_TABLE_VIEW_DATA_TYPE])
     {
-        NSIndexSet* indexes = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:GROUP_TABLE_VIEW_DATA_TYPE]];
+        NSIndexSet* indexes;
+        if (@available(macOS 10.13, *))
+        {
+            indexes = [NSKeyedUnarchiver unarchivedObjectOfClass:NSIndexSet.class fromData:[pasteboard dataForType:GROUP_TABLE_VIEW_DATA_TYPE] error:nil];
+        }
+        else
+        {
+            indexes = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:GROUP_TABLE_VIEW_DATA_TYPE]];
+        }
         NSInteger oldRow = indexes.firstIndex;
 
         if (oldRow < newRow)

diff --git a/macosx/TorrentTableView.mm b/macosx/TorrentTableView.mm
@@ -69,12 +69,22 @@ - (instancetype)initWithCoder:(NSCoder*)decoder
 
         _fTorrentCell = [[TorrentCell alloc] init];
 
-        NSData* groupData = [_fDefaults dataForKey:@"CollapsedGroups"];
-        if (groupData)
+        NSData* groupData;
+        if ((groupData = [_fDefaults dataForKey:@"CollapsedGroupIndexes"]))
+        {
+            if (@available(macOS 10.13, *)) {
+                _fCollapsedGroups = [NSKeyedUnarchiver unarchivedObjectOfClass:NSMutableIndexSet.class fromData:groupData error:nil];
+            } else {
+                _fCollapsedGroups = [NSKeyedUnarchiver unarchiveObjectWithData:groupData];
+            }
+        }
+        else if ((groupData = [_fDefaults dataForKey:@"CollapsedGroups"])) //handle old groups
         {
             _fCollapsedGroups = [[NSUnarchiver unarchiveObjectWithData:groupData] mutableCopy];
+            [_fDefaults removeObjectForKey:@"CollapsedGroups"];
+            [self saveCollapsedGroups];
         }
-        else
+        if (_fCollapsedGroups == nil)
         {
             _fCollapsedGroups = [[NSMutableIndexSet alloc] init];
         }
@@ -139,7 +149,7 @@ - (void)removeAllCollapsedGroups
 
 - (void)saveCollapsedGroups
 {
-    [self.fDefaults setObject:[NSArchiver archivedDataWithRootObject:self.fCollapsedGroups] forKey:@"CollapsedGroups"];
+    [self.fDefaults setObject:[NSKeyedArchiver archivedDataWithRootObject:self.fCollapsedGroups] forKey:@"CollapsedGroupIndexes"];
 }
 
 - (BOOL)outlineView:(NSOutlineView*)outlineView isGroupItem:(id)item