Skip to content

Commit 7f38d84

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (134.0.20241031050357)
1 parent 28e6b33 commit 7f38d84

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// swift-tools-version:5.4
22
import PackageDescription
33

4-
let checksum = "06d7430850ceff0365f4c98a4267b790332a3120db8fdf35b8f1652e6b2ed116"
5-
let version = "134.0.20241030050341"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241030050341/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "7d945934cef5688cb0628aa97ed9ec41d32af129c3b6709f9e4238d65aff26ff"
5+
let version = "134.0.20241031050357"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241031050357/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "1b6e0c9bc08f57c82ecb02336c290fc6da6d0a4fb9bdab6a6d3811798cb541f2"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241030050341/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "a170904793da456a9dbaf1d1aae11acf4bf0cf0a36cde44986ffcfc1e953d0dc"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241031050357/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

swift-source/all/FxAClient/FxAccountDeviceConstellation.swift

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ public struct ConstellationState {
1313
public let remoteDevices: [Device]
1414
}
1515

16+
public enum SendEventError: Error {
17+
case tabsNotClosed(urls: [String])
18+
case other(Error)
19+
}
20+
1621
public class DeviceConstellation {
1722
var constellationState: ConstellationState?
1823
let account: PersistedFirefoxAccount
@@ -87,18 +92,29 @@ public class DeviceConstellation {
8792
}
8893

8994
/// Send an event to another device such as Send Tab.
90-
public func sendEventToDevice(targetDeviceId: String, e: DeviceEventOutgoing) {
95+
public func sendEventToDevice(targetDeviceId: String,
96+
e: DeviceEventOutgoing,
97+
completionHandler: ((Result<Void, SendEventError>) -> Void)? = nil)
98+
{
9199
DispatchQueue.global().async {
92100
do {
93101
switch e {
94102
case let .sendTab(title, url): do {
95103
try self.account.sendSingleTab(targetDeviceId: targetDeviceId, title: title, url: url)
104+
completionHandler?(.success(()))
96105
}
97106
case let .closeTabs(urls):
98-
_ = try self.account.closeTabs(targetDeviceId: targetDeviceId, urls: urls)
107+
let result = try self.account.closeTabs(targetDeviceId: targetDeviceId, urls: urls)
108+
switch result {
109+
case .ok:
110+
completionHandler?(.success(()))
111+
case let .tabsNotClosed(urls):
112+
completionHandler?(.failure(.tabsNotClosed(urls: urls)))
113+
}
99114
}
100115
} catch {
101116
FxALog.error("Error sending event to another device: \(error).")
117+
completionHandler?(.failure(.other(error)))
102118
}
103119
}
104120
}

swift-source/all/Generated/Metrics/Metrics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension GleanMetrics {
2323
// Intentionally left private, no external user can instantiate a new global object.
2424
}
2525

26-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 10, day: 30, hour: 5, minute: 17, second: 0))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 10, day: 31, hour: 5, minute: 16, second: 46))
2727
}
2828

2929
enum NimbusEvents {

swift-source/focus/Generated/Metrics/Metrics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension GleanMetrics {
2323
// Intentionally left private, no external user can instantiate a new global object.
2424
}
2525

26-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 10, day: 30, hour: 5, minute: 17, second: 2))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 10, day: 31, hour: 5, minute: 16, second: 48))
2727
}
2828

2929
enum NimbusEvents {

0 commit comments

Comments
 (0)