Skip to content

Commit

Permalink
Merge branch 'main' into sam/upgrade-to-xcode-16-2
Browse files Browse the repository at this point in the history 
* main:
  Crash report cohort ID support for iOS (#3692)
  Fix sharing via the Share & Action extensions on iOS 18 (#3745)
  DuckPlayer: Don’t open new tabs or DuckPlayer at launch when in alwaysAsk mode (#3738)
  Fix BrowsingMenu layout (#3712)
  • Loading branch information
@samsymons
samsymons committed Dec 19, 2024
2 parents ab71ee6 + 8ce3815 commit 71cd03b
Show file tree
Hide file tree
Showing 16 changed files with 146 additions and 62 deletions.
5 changes: 5 additions & 0 deletions Core/PixelEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,9 @@ extension Pixel {
case dbCrashDetectedDaily
case crashOnCrashHandlersSetUp

case crashReportCRCIDMissing
case crashReportingSubmissionFailed

case dbMigrationError
case dbRemovalError
case dbDestroyError
Expand Down Expand Up @@ -1456,6 +1459,8 @@ extension Pixel.Event {

case .dbCrashDetected: return "m_d_crash"
case .dbCrashDetectedDaily: return "m_d_crash_daily"
case .crashReportCRCIDMissing: return "m_crashreporting_crcid-missing"
case .crashReportingSubmissionFailed: return "m_crashreporting_submission-failed"
case .crashOnCrashHandlersSetUp: return "m_d_crash_on_handlers_setup"
case .dbMigrationError: return "m_d_dbme"
case .dbRemovalError: return "m_d_dbre"
Expand Down
6 changes: 5 additions & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
37FCAABC2992F592000E420A /* MultilineScrollableTextFix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FCAABB2992F592000E420A /* MultilineScrollableTextFix.swift */; };
37FCAAC029930E26000E420A /* FailedAssertionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FCAABF29930E26000E420A /* FailedAssertionView.swift */; };
37FD780F2A29E28B00B36DB1 /* SyncErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD780E2A29E28B00B36DB1 /* SyncErrorHandler.swift */; };
46DD3D5A2D0A29F600F33D49 /* CrashReportSenderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46DD3D592D0A29F400F33D49 /* CrashReportSenderExtensions.swift */; };
4B0295192537BC6700E00CEF /* ConfigurationDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0295182537BC6700E00CEF /* ConfigurationDebugViewController.swift */; };
4B0F3F502B9BFF2100392892 /* NetworkProtectionFAQView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0F3F4F2B9BFF2100392892 /* NetworkProtectionFAQView.swift */; };
4B274F602AFEAECC003F0745 /* NetworkProtectionWidgetRefreshModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B274F5F2AFEAECC003F0745 /* NetworkProtectionWidgetRefreshModel.swift */; };
Expand Down Expand Up @@ -1597,6 +1598,7 @@
37FCAABF29930E26000E420A /* FailedAssertionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FailedAssertionView.swift; sourceTree = "<group>"; };
37FCAACB2993149A000E420A /* Waitlist */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Waitlist; sourceTree = "<group>"; };
37FD780E2A29E28B00B36DB1 /* SyncErrorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncErrorHandler.swift; sourceTree = "<group>"; };
46DD3D592D0A29F400F33D49 /* CrashReportSenderExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportSenderExtensions.swift; sourceTree = "<group>"; };
4B0295182537BC6700E00CEF /* ConfigurationDebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationDebugViewController.swift; sourceTree = "<group>"; };
4B0F3F4F2B9BFF2100392892 /* NetworkProtectionFAQView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionFAQView.swift; sourceTree = "<group>"; };
4B274F5F2AFEAECC003F0745 /* NetworkProtectionWidgetRefreshModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionWidgetRefreshModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3888,6 +3890,7 @@
37CF915E2BB4735F00BADCAE /* Crashes */ = {
isa = PBXGroup;
children = (
46DD3D592D0A29F400F33D49 /* CrashReportSenderExtensions.swift */,
37CF915F2BB4737300BADCAE /* CrashCollectionOnboarding.swift */,
37CF91612BB474AA00BADCAE /* CrashCollectionOnboardingView.swift */,
37CF91632BB4A82A00BADCAE /* CrashCollectionOnboardingViewModel.swift */,
Expand Down Expand Up @@ -8235,6 +8238,7 @@
BDF8D0022C1B87F4003E3B27 /* NetworkProtectionDNSSettingsViewModel.swift in Sources */,
9838059F2228208E00385F1A /* PositiveFeedbackViewController.swift in Sources */,
8590CB67268A2E520089F6BF /* RootDebugViewController.swift in Sources */,
46DD3D5A2D0A29F600F33D49 /* CrashReportSenderExtensions.swift in Sources */,
1DEAADEA2BA4539800E25A97 /* SettingsAppearanceView.swift in Sources */,
B623C1C22862CA9E0043013E /* DownloadSession.swift in Sources */,
317CA3432CFF82E100F88848 /* SettingsAIChatView.swift in Sources */,
Expand Down Expand Up @@ -11719,7 +11723,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 221.3.0;
version = 222.1.0;
};
};
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "b71ed70ce9b0ef3ce51d4f96da0193ab70493944",
"version" : "221.3.0"
"revision" : "5704d77e3b4c77c7387518d796d31a35f7a1ffcf",
"version" : "222.1.0"
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion DuckDuckGo/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ import os.log
private var syncStateCancellable: AnyCancellable?
private var isSyncInProgressCancellable: AnyCancellable?

private let crashCollection = CrashCollection(platform: .iOS)
private let crashCollection = CrashCollection(crashReportSender: CrashReportSender(platform: .iOS,
pixelEvents: CrashReportSender.pixelEvents),
crashCollectionStorage: UserDefaults())
private var crashReportUploaderOnboarding: CrashCollectionOnboarding?

private var autofillPixelReporter: AutofillPixelReporter?
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/AppUserDefaults.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class AppUserDefaults: AppSettings {

static let crashCollectionOptInStatus = "com.duckduckgo.ios.crashCollectionOptInStatus"
static let crashCollectionShouldRevertOptedInStatusTrigger = "com.duckduckgo.ios.crashCollectionShouldRevertOptedInStatusTrigger"

static let duckPlayerMode = "com.duckduckgo.ios.duckPlayerMode"
static let duckPlayerAskModeOverlayHidden = "com.duckduckgo.ios.duckPlayerAskModeOverlayHidden"
static let duckPlayerOpenInNewTab = "com.duckduckgo.ios.duckPlayerOpenInNewTab"
Expand Down
39 changes: 21 additions & 18 deletions DuckDuckGo/BrowsingMenu/BrowsingMenuButton.xib
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view autoresizesSubviews="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="BrowsingMenuButton" customModule="DuckDuckGo" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="70" height="86"/>
<view autoresizesSubviews="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="BrowsingMenuButton" customModule="DuckDuckGo" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="73" height="85"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LOb-q4-bUE">
<rect key="frame" x="3" y="3" width="64" height="80"/>
<rect key="frame" x="3" y="3" width="67" height="79"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9Fs-Fi-0RY">
<rect key="frame" x="23" y="19" width="24" height="24"/>
<rect key="frame" x="24.5" y="20" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="E0z-1N-BWl"/>
<constraint firstAttribute="height" constant="24" id="hs8-zA-JVo"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="hw1-7w-6TO">
<rect key="frame" x="6" y="49" width="58" height="14"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="30" id="zpy-Rt-FMO"/>
</constraints>
<label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.90000000000000002" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hw1-7w-6TO">
<rect key="frame" x="23" y="50" width="27.5" height="15"/>
<attributedString key="attributedText">
<fragment content="Label">
<fragment content="Text">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" metaFont="system"/>
<color key="NSColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<font key="NSFont" metaFont="system" size="14"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="truncatingTail" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
Expand All @@ -47,15 +44,21 @@
<bool key="isElement" value="YES"/>
</accessibility>
<constraints>
<constraint firstAttribute="bottom" secondItem="LOb-q4-bUE" secondAttribute="bottom" constant="3" id="55D-XN-Ym9"/>
<constraint firstItem="LOb-q4-bUE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="3" id="7HI-5U-WcD"/>
<constraint firstAttribute="trailing" secondItem="LOb-q4-bUE" secondAttribute="trailing" constant="3" id="7gg-sa-eLs"/>
<constraint firstItem="hw1-7w-6TO" firstAttribute="leading" secondItem="LOb-q4-bUE" secondAttribute="leading" constant="3" id="LEv-qH-9tx"/>
<constraint firstItem="LOb-q4-bUE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="3" id="IHd-KQ-2bw"/>
<constraint firstItem="hw1-7w-6TO" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="LOb-q4-bUE" secondAttribute="leading" constant="3" id="LEv-qH-9tx"/>
<constraint firstAttribute="bottom" secondItem="LOb-q4-bUE" secondAttribute="bottom" constant="3" id="MDm-Aq-L3X"/>
<constraint firstItem="LOb-q4-bUE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="3" id="NO8-nC-ozd"/>
<constraint firstItem="hw1-7w-6TO" firstAttribute="top" secondItem="9Fs-Fi-0RY" secondAttribute="bottom" constant="6" id="QIA-za-5uG"/>
<constraint firstItem="9Fs-Fi-0RY" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="SPD-A7-yw9"/>
<constraint firstItem="9Fs-Fi-0RY" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" constant="-12" id="XT0-VM-7DB"/>
<constraint firstItem="hw1-7w-6TO" firstAttribute="trailing" secondItem="LOb-q4-bUE" secondAttribute="trailing" constant="-3" id="ZWx-kh-tBq"/>
<constraint firstAttribute="bottom" secondItem="hw1-7w-6TO" secondAttribute="bottom" constant="20" id="VLe-if-xLk"/>
<constraint firstItem="LOb-q4-bUE" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hw1-7w-6TO" secondAttribute="trailing" constant="3" id="ZWx-kh-tBq"/>
<constraint firstItem="hw1-7w-6TO" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="bnY-r8-Owk"/>
<constraint firstAttribute="trailing" secondItem="LOb-q4-bUE" secondAttribute="trailing" constant="3" id="oNy-pg-H00"/>
<constraint firstItem="LOb-q4-bUE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="3" id="ogG-SA-wPN"/>
<constraint firstItem="9Fs-Fi-0RY" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="rJ1-zN-Udy"/>
</constraints>
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
Expand All @@ -65,7 +68,7 @@
<outlet property="image" destination="9Fs-Fi-0RY" id="Fpu-am-HAk"/>
<outlet property="label" destination="hw1-7w-6TO" id="2K5-cO-z7K"/>
</connections>
<point key="canvasLocation" x="66.666666666666671" y="75.669642857142847"/>
<point key="canvasLocation" x="67.391304347826093" y="73.995535714285708"/>
</view>
</objects>
<resources>
Expand Down
Loading

0 comments on commit 71cd03b

Please sign in to comment.