-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into sam/upgrade-to-xcode-16-2
* main: CRCID Support when reporting crashes (#3653) Bump version to 1.119.0 (332) Update to Privacy Pro settings footer (#3679) Update to Privacy Pro settings footer (#3679) [Release PR] Update VPN localization (#3675) Bump version to 1.118.1 (331) Set marketing version to 1.118.1 [Release PR] Update VPN localization (#3675)
- Loading branch information
Showing
20 changed files
with
254 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| CURRENT_PROJECT_VERSION = 330 | ||
| CURRENT_PROJECT_VERSION = 332 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
DuckDuckGo/CrashReports/Model/CrashReportSenderExtensions.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // | ||
| // CrashReportSenderExtensions.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Crashes | ||
| import Common | ||
| import PixelKit | ||
|
|
||
| extension CrashReportSender { | ||
|
|
||
| static let pixelEvents: EventMapping<CrashReportSenderError> = .init { event, _, _, _ in | ||
| switch event { | ||
| case CrashReportSenderError.crcidMissing: | ||
| PixelKit.fire(GeneralPixel.crashReportCRCIDMissing) | ||
|
|
||
| case CrashReportSenderError.submissionFailed(let error): | ||
| if let error { | ||
| PixelKit.fire(DebugEvent(GeneralPixel.crashReportingSubmissionFailed), | ||
| frequency: .standard, | ||
| withHeaders: [:], | ||
| withAdditionalParameters: ["HTTPStatusCode": "\(error.statusCode)"], | ||
| withError: nil, | ||
| allowedQueryReservedCharacters: nil) | ||
| } else { | ||
| PixelKit.fire(GeneralPixel.crashReportingSubmissionFailed) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.