Revision: 29787
http://sourceforge.net/p/bibdesk/svn/29787
Author: hofman
Date: 2025-11-13 10:33:43 +0000 (Thu, 13 Nov 2025)
Log Message:
-----------
revert part of previous commits, UI classes don't use secure coding
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKColorLabelWell.m
trunk/bibdesk/BDSKEdgeView.m
trunk/bibdesk/BDSKEditorTextField.m
trunk/bibdesk/BDSKFileSearchIndex.m
trunk/bibdesk/BDSKFontWell.m
trunk/bibdesk/BDSKImagePopUpButtonCell.m
trunk/bibdesk/BDSKSecureTextField.m
Modified: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m 2025-11-12 23:20:10 UTC (rev
29786)
+++ trunk/bibdesk/BDSKAddressTextField.m 2025-11-13 10:33:43 UTC (rev
29787)
@@ -123,8 +123,8 @@
[self setCell:myCell];
}
- imageView = [aDecoder decodeObjectOfClass:[NSImageView class]
forKey:@"imageView"];
- button = [aDecoder decodeObjectOfClass:[NSButton class]
forKey:@"button"];
+ imageView = [aDecoder decodeObjectForKey:@"imageView"];
+ button = [aDecoder decodeObjectForKey:@"button"];
[self commonInit];
}
return self;
Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKColorLabelWell.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -115,14 +115,14 @@
if (self) {
NSMutableArray *array = [NSMutableArray array];
for (NSUInteger i = 0; i < 9; i++) {
- NSButton *button = [coder decodeObjectOfClass:[NSButton class]
forKey:[NSString stringWithFormat:@"button%lu", i]];
+ NSButton *button = [coder decodeObjectForKey:[NSString
stringWithFormat:@"button%lu", i]];
if (button)
[array addObject:button];
}
buttons = [array copy];
suppressSelection = [coder decodeBoolForKey:@"suppressSelection"];
- titleCell = [coder decodeObjectOfClass:[NSTextFieldCell class]
forKey:@"titleCell"];
- labelCell = [coder decodeObjectOfClass:[NSTextFieldCell class]
forKey:@"labelCell"];
+ titleCell = [coder decodeObjectForKey:@"titleCell"];
+ labelCell = [coder decodeObjectForKey:@"labelCell"];
[self commonInit];
}
return self;
Modified: trunk/bibdesk/BDSKEdgeView.m
===================================================================
--- trunk/bibdesk/BDSKEdgeView.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKEdgeView.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -96,18 +96,12 @@
self = [super initWithCoder:decoder];
if (self) {
// this decodes only the reference, the actual view should already be
decoded as a subview
- contentView = [decoder decodeObjectOfClass:[NSView class]
forKey:@"contentView"];
+ contentView = [decoder decodeObjectForKey:@"contentView"];
wantsSubviews = NO;
- if (@available(macOS 11.0, *))
- edgeColors = [[decoder decodeArrayOfObjectsOfClass:[NSColor class]
forKey:@"edgeColors"] mutableCopy];
- else
- edgeColors = [[decoder decodeObjectOfClass:[NSArray class]
forKey:@"edgeColors"] mutableCopy];
+ edgeColors = [[decoder decodeObjectForKey:@"edgeColors"] mutableCopy];
edges = [decoder decodeIntegerForKey:@"edges"];
- if (@available(macOS 11.0, *))
- backgroundColors = [decoder decodeArrayOfObjectsOfClass:[NSColor
class] forKey:@"v"];
- else
- backgroundColors = [decoder decodeObjectOfClass:[NSArray class]
forKey:@"backgroundColors"];
- backgroundView = [decoder decodeObjectOfClass:[NSView class]
forKey:@"backgroundView"];
+ backgroundColors = [decoder decodeObjectForKey:@"backgroundColors"];
+ backgroundView = [decoder decodeObjectForKey:@"backgroundView"];
if (@available(macOS 10.14, *))
reflectViewEnabled = YES;
else
Modified: trunk/bibdesk/BDSKEditorTextField.m
===================================================================
--- trunk/bibdesk/BDSKEditorTextField.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKEditorTextField.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -73,8 +73,8 @@
[self setCell:myCell];
}
- button = [decoder decodeObjectOfClass:[NSButton class]
forKey:@"button"];
- buttonAction = NSSelectorFromString([decoder
decodeObjectOfClass:[NSString class] forKey:@"buttonAction"]);
+ button = [decoder decodeObjectForKey:@"button"];
+ buttonAction = NSSelectorFromString([decoder
decodeObjectForKey:@"buttonAction"]);
}
return self;
}
Modified: trunk/bibdesk/BDSKFileSearchIndex.m
===================================================================
--- trunk/bibdesk/BDSKFileSearchIndex.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKFileSearchIndex.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -500,10 +500,7 @@
if (indexData != NULL) {
tmpIndex = SKIndexOpenWithMutableData((__bridge
CFMutableDataRef)indexData, NULL);
if (tmpIndex) {
- if (@available(macOS 11.0, *))
- [signatures setDictionary:[unarchiver
decodeDictionaryWithKeysOfClasses:[NSSet setWithObject:[NSString class]]
objectsOfClasses:[NSSet setWithObjects:[NSData class], [NSDate class], nil]
forKey:@"signatures"]];
- else
- [signatures setDictionary:[unarchiver
decodeObjectOfClass:[NSDictionary class] forKey:@"signatures"]];
+ [signatures setDictionary:[unarchiver
decodeObjectOfClass:[NSDictionary class] forKey:@"signatures"]];
} else {
indexData = nil;
}
Modified: trunk/bibdesk/BDSKFontWell.m
===================================================================
--- trunk/bibdesk/BDSKFontWell.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKFontWell.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -100,8 +100,8 @@
[newCell setAction:[oldCell action]];
[self setCell:newCell];
}
- action = NSSelectorFromString([decoder decodeObjectOfClass:[NSString
class] forKey:ACTION_KEY]);
- target = [decoder decodeObjectOfClass:[NSObject class]
forKey:TARGET_KEY];
+ action = NSSelectorFromString([decoder decodeObjectForKey:ACTION_KEY]);
+ target = [decoder decodeObjectForKey:TARGET_KEY];
[self commonInit];
}
return self;
Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKImagePopUpButtonCell.m 2025-11-12 23:20:10 UTC (rev
29786)
+++ trunk/bibdesk/BDSKImagePopUpButtonCell.m 2025-11-13 10:33:43 UTC (rev
29787)
@@ -67,7 +67,7 @@
- (instancetype)initWithCoder:(NSCoder *)coder{
self = [super initWithCoder:coder];
if (self) {
- buttonCell = [coder decodeObjectOfClass:[NSButtonCell class]
forKey:@"buttonCell"];
+ buttonCell = [coder decodeObjectForKey:@"buttonCell"];
[self setBordered:NO];
if (buttonCell == nil)
[self makeButtonCell];
Modified: trunk/bibdesk/BDSKSecureTextField.m
===================================================================
--- trunk/bibdesk/BDSKSecureTextField.m 2025-11-12 23:20:10 UTC (rev 29786)
+++ trunk/bibdesk/BDSKSecureTextField.m 2025-11-13 10:33:43 UTC (rev 29787)
@@ -153,7 +153,7 @@
- (instancetype)initWithCoder:(NSCoder *)coder {
self = [super initWithCoder:coder];
if (self) {
- button = [coder decodeObjectOfClass:[NSButton class] forKey:@"button"];
+ button = [coder decodeObjectForKey:@"button"];
showsText = [coder decodeBoolForKey:@"showsText"];
Class cellClass = [self cellClass];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit