![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 124.0.6361.0 * chore: bump chromium in DEPS to 124.0.6363.0 * chore: update patches Manually apply printing.patch w/no code changes due to upstream shear. Xref:5349263
* chore: bump chromium in DEPS to 124.0.6365.0 * chore: bump chromium in DEPS to 124.0.6367.0 * update patches * 5371735: Rename SystemGeolocationSourceMac to SystemGeolocationSourceApple5371735
* missed a MAS bit * chore: update windows toolchain 5350823: New toolchain for Windows 11 10.0.22621.2428 SDK |5350823
* chore: bump chromium in DEPS to 125.0.6368.0 * fix patches * chore: update patches * 5232401: [PDF] Move generic utils from //chrome to //components/pdf (1/2)5232401
* revert5380898
* chore: bump chromium in DEPS to 125.0.6370.0 * build: use updated windows toolchain * fix patches * chore: update patches * more pdf_util to components * 5372414: [Extensions] Remove DispatcherDelegate5372414
* fix accessibility_ui patch * chore: bump chromium in DEPS to 125.0.6372.0 * chore: bump chromium in DEPS to 125.0.6374.0 * chore: bump chromium in DEPS to 125.0.6376.0 * chore: bump chromium in DEPS to 125.0.6378.0 * chore: bump chromium in DEPS to 125.0.6379.3 * chore: update patches (+ MAS patch changes) * chore: update patches * 5381159: Cleanup media::KeySystemSupportObserver5381159
* 5382233: Reland "Web `Speech to Text` with SODA backend"5382233
* chore: update `exclusive_access` patch - 5367497: Add a metric for the website state when Fullscreen API is requested -5367497
* chore: add build dependency 5367497: Add a metric for the website state when Fullscreen API is requested5367497
* chore: bump chromium in DEPS to 125.0.6382.0 * chore: update libcxx filenames * chore: update patches * chore: bump chromium in DEPS to 125.0.6384.0 * chore: remove old patch * 5394039: [Extensions] Change "blessed" -> "privileged" in extension feature files5394039
* fix: remove deprecated errno constants in node/libuv * 5362194: Return expected from ProcessMetrics CPU methods5362194
* 5383927: Add new Pickle factory functions with explicit ownership5383927
* 5373340: Simplify app-region/Draggable Region implementation5373340
* 5386875: Cleanup printing preferences files5386875
* chore: update libc++ filenames * fix: add enterprise buildflags dep * chore: bump chromium in DEPS to 125.0.6386.0 * chore: add build dep * chore: update patches * chore: bump chromium in DEPS to 125.0.6388.0 * chore: bump chromium in DEPS to 125.0.6390.0 * chore: update patches * 4918014: preloading: Add NewTabPagePageLoadMetricsObserver4918014
* 5401234: [PDF] Remove `PDFDocumentHelperClient::FindPdfChildFrame` API5401234
* 5116175: Relocate Windows XPS printing feature helper methods5116175
* fixup! 5373340: Simplify app-region/Draggable Region implementation5373340
* fixup! chore: add build dep * chore: remove dead code & dead patch Was dealing with5402805
when I realized this code is no longer possible to call. It seems like this code became dead in the previous roll (#41514). The patch exposed a `DxdiagDx12VulkanRequested` method on Chromium's `GpuDataManagerImpl`, which we consumed only in our own `GPUInfoManager::NeedsCompleteGpuInfoCollection`. There are no other references to this method, so it and the patch can both be deleted. Yay! * chore: bump chromium in DEPS to 125.0.6392.0 * chore: bump chromium in DEPS to 125.0.6393.0 * chore: update patches * chore: bump chromium in DEPS to 125.0.6394.0 * chore: bump chromium in DEPS to 125.0.6396.0 * chore: bump chromium in DEPS to 125.0.6397.0 * chore: update printing.patch Xref:5100842
No code changes, but had to apply patch manually due to upstream code shear * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; patch applied with fuzz 1 * chore: update feat_allow_code_cache_in_custom_schemes.patch No manual changes; patch applied with fuzz 2 * chore: silence "space before tab in indent" git rebase-apply warning * chore: e patches all * build: update all.gn to avoid FTBFS when disabling raw_ptr Xref:5371737
* Rename PdfService Mojo interface to PdfHost Xref:5411957
* chore: bump chromium in DEPS to 125.0.6398.0 * chore: update patches * chore: bump chromium in DEPS to 125.0.6400.0 * chore: update patches * [media] Remove unused `GetSupportedKeySystems` from MediaClient Xref:5420247
* chore: update JSInjection::New call to match upstream change Xref:5403967
[Extensions] Wire up the renderer for multiple user script worlds * 5362362: Derive display ID from monitor adapter ID instead of szDevice.5362362
* 5116175: Relocate Windows XPS printing feature helper methods5116175
* chore: add v8-sandbox.h to electron-node * chore: update patches * chore: update patches * fixup! 5394039: [Extensions] Change blessed -> privileged in extension feature files * chore: bump chromium in DEPS to 125.0.6412.0 * chore: update patches * chore: node script/gen-libc++-filenames.js * [FPF] Create Fingerprinting Protection ruleset service. Refs5420158
* Add ExclusiveAccessPermissionManager Refs5273787
* Preserve the PNG colorspace when decoding into a SkBitmap. Refs5421254
* chore: iwyu * fix: abstract-socket compilation * ci: bump container for node 20 support * fixup! abstract-socket compilation * fix: compiling nan specs * chore: revert winreg version bump accidental bump to 1.2.5 revealed failing app.setasdefaultprotocolclient test suite. Should be revisited separately. * ci: set node 20 for darwin x64 tests * fix: broken patch export * chore: cleanup mas_avoid_private_macos_api_usage.patch.patch Removed code that was inadvertently put back after5348565
removed it --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
60 lines
3 KiB
Diff
60 lines
3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Thu, 22 Jun 2023 12:26:24 +0200
|
|
Subject: refactor: use non-deprecated NSKeyedArchiver APIs
|
|
|
|
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4628901
|
|
|
|
Several NSKeyedArchiver methods have been deprecated and replaced as of macOS 10.13:
|
|
|
|
- unarchiveObjectWithData -> unarchivedObjectOfClass:fromData:error:
|
|
- archivedDataWithRootObject -> archivedDataWithRootObject:requiringSecureCoding:error:
|
|
|
|
diff --git a/Squirrel/SQRLInstaller.m b/Squirrel/SQRLInstaller.m
|
|
index f502df2f88424ea902a061adfeb30358daf212e4..8969cfda03efd5a11bfe0c531e2702ff12a3f610 100644
|
|
--- a/Squirrel/SQRLInstaller.m
|
|
+++ b/Squirrel/SQRLInstaller.m
|
|
@@ -182,14 +182,40 @@ - (SQRLInstallerOwnedBundle *)ownedBundle {
|
|
id archiveData = CFBridgingRelease(CFPreferencesCopyValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost));
|
|
if (![archiveData isKindOfClass:NSData.class]) return nil;
|
|
|
|
- SQRLInstallerOwnedBundle *ownedBundle = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
|
|
- if (![ownedBundle isKindOfClass:SQRLInstallerOwnedBundle.class]) return nil;
|
|
+ // unarchivedObjectOfClass:fromData:error: sets secureCoding to true and we don't
|
|
+ // archive data with secureCoding enabled - use our own unarchiver to work around that.
|
|
+ NSError *error;
|
|
+ NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:archiveData
|
|
+ error:&error];
|
|
+ unarchiver.requiresSecureCoding = NO;
|
|
+ SQRLInstallerOwnedBundle *ownedBundle = [unarchiver decodeObjectForKey:NSKeyedArchiveRootObjectKey];
|
|
+ [unarchiver finishDecoding];
|
|
+
|
|
+ if (error) {
|
|
+ NSLog(@"Error while unarchiving ownedBundle - %@", error.localizedDescription);
|
|
+ return nil;
|
|
+ }
|
|
+
|
|
+ if (!ownedBundle || ![ownedBundle isKindOfClass:SQRLInstallerOwnedBundle.class]) {
|
|
+ NSLog(@"Unknown error while unarchiving ownedBundle - did not conform to SQRLInstallerOwnedBundle");
|
|
+ return nil;
|
|
+ }
|
|
|
|
return ownedBundle;
|
|
}
|
|
|
|
- (void)setOwnedBundle:(SQRLInstallerOwnedBundle *)ownedBundle {
|
|
- NSData *archiveData = (ownedBundle == nil ? nil : [NSKeyedArchiver archivedDataWithRootObject:ownedBundle]);
|
|
+ NSData *archiveData = nil;
|
|
+ if (ownedBundle != nil) {
|
|
+ NSError *error;
|
|
+ archiveData = [NSKeyedArchiver archivedDataWithRootObject:ownedBundle
|
|
+ requiringSecureCoding:NO
|
|
+ error:&error];
|
|
+
|
|
+ if (error)
|
|
+ NSLog(@"Couldn't archive ownedBundle - %@", error.localizedDescription);
|
|
+ }
|
|
+
|
|
CFPreferencesSetValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFPropertyListRef)archiveData, (__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
|
|
CFPreferencesSynchronize((__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
|
|
}
|