Skip to content

Commit efefc5b

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (117.0.20230718050246)
1 parent 1047a89 commit efefc5b

File tree

10 files changed

+7
-224
lines changed

10 files changed

+7
-224
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 = "5a0ff2232d3882973760042a82bb04547b16323e0c964d455086e481cc8a4f61"
5-
let version = "117.0.20230717050335"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.117.20230717050335/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "9a276c8d4de5c3187378b5cfcc0c033533fefedd5661228f6661945d15b04a53"
5+
let version = "117.0.20230718050246"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.117.20230718050246/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "396d72f3bf00b284a9ca2e875b116efebbf0920f93b9f6b3679a9c270682cd66"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.117.20230717050335/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "697abfd632990f089d1c74e5c5b8ddfdc167b8c4c8cc8f30dcdffd3fa6e0e2fe"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.117.20230718050246/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v11)],

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

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

28-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 7, day: 17, hour: 5, minute: 13, second: 9))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 7, day: 18, hour: 5, minute: 20, second: 29))
2929
}
3030

3131
enum NimbusEvents {

‎swift-source/all/Generated/logins.swift

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ public protocol LoginStoreProtocol {
380380
func findLoginToUpdate(look: LoginEntry, encryptionKey: String) throws -> Login?
381381
func get(id: String) throws -> EncryptedLogin?
382382
func registerWithSyncManager()
383-
func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localEncryptionKey: String) throws -> String
384383
}
385384

386385
public class LoginStore: LoginStoreProtocol {
@@ -516,19 +515,6 @@ public class LoginStore: LoginStoreProtocol {
516515
uniffi_logins_fn_method_loginstore_register_with_sync_manager(self.pointer, $0)
517516
}
518517
}
519-
520-
public func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localEncryptionKey: String) throws -> String {
521-
return try FfiConverterString.lift(
522-
rustCallWithError(FfiConverterTypeLoginsApiError.lift) {
523-
uniffi_logins_fn_method_loginstore_sync(self.pointer,
524-
FfiConverterString.lower(keyId),
525-
FfiConverterString.lower(accessToken),
526-
FfiConverterString.lower(syncKey),
527-
FfiConverterString.lower(tokenserverUrl),
528-
FfiConverterString.lower(localEncryptionKey), $0)
529-
}
530-
)
531-
}
532518
}
533519

534520
public struct FfiConverterTypeLoginStore: FfiConverter {
@@ -1262,9 +1248,6 @@ private var initializationResult: InitializationResult {
12621248
if uniffi_logins_checksum_method_loginstore_register_with_sync_manager() != 60984 {
12631249
return InitializationResult.apiChecksumMismatch
12641250
}
1265-
if uniffi_logins_checksum_method_loginstore_sync() != 38391 {
1266-
return InitializationResult.apiChecksumMismatch
1267-
}
12681251
if uniffi_logins_checksum_constructor_loginstore_new() != 54731 {
12691252
return InitializationResult.apiChecksumMismatch
12701253
}

‎swift-source/all/Generated/loginsFFI.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ RustBuffer uniffi_logins_fn_method_loginstore_get(void*_Nonnull ptr, RustBuffer
9696
);
9797
void uniffi_logins_fn_method_loginstore_register_with_sync_manager(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
9898
);
99-
RustBuffer uniffi_logins_fn_method_loginstore_sync(void*_Nonnull ptr, RustBuffer key_id, RustBuffer access_token, RustBuffer sync_key, RustBuffer tokenserver_url, RustBuffer local_encryption_key, RustCallStatus *_Nonnull out_status
100-
);
10199
RustBuffer uniffi_logins_fn_func_create_key(RustCallStatus *_Nonnull out_status
102100

103101
);
@@ -185,9 +183,6 @@ uint16_t uniffi_logins_checksum_method_loginstore_get(void
185183
);
186184
uint16_t uniffi_logins_checksum_method_loginstore_register_with_sync_manager(void
187185

188-
);
189-
uint16_t uniffi_logins_checksum_method_loginstore_sync(void
190-
191186
);
192187
uint16_t uniffi_logins_checksum_constructor_loginstore_new(void
193188

‎swift-source/all/Generated/tabs.swift

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,6 @@ public protocol TabsStoreProtocol {
520520
func getAll() -> [ClientRemoteTabs]
521521
func setLocalTabs(remoteTabs: [RemoteTabRecord])
522522
func registerWithSyncManager()
523-
func reset() throws
524-
func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localId: String) throws -> String
525523
func bridgedEngine() -> TabsBridgedEngine
526524
}
527525

@@ -571,26 +569,6 @@ public class TabsStore: TabsStoreProtocol {
571569
}
572570
}
573571

574-
public func reset() throws {
575-
try
576-
rustCallWithError(FfiConverterTypeTabsApiError.lift) {
577-
uniffi_tabs_fn_method_tabsstore_reset(self.pointer, $0)
578-
}
579-
}
580-
581-
public func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localId: String) throws -> String {
582-
return try FfiConverterString.lift(
583-
rustCallWithError(FfiConverterTypeTabsApiError.lift) {
584-
uniffi_tabs_fn_method_tabsstore_sync(self.pointer,
585-
FfiConverterString.lower(keyId),
586-
FfiConverterString.lower(accessToken),
587-
FfiConverterString.lower(syncKey),
588-
FfiConverterString.lower(tokenserverUrl),
589-
FfiConverterString.lower(localId), $0)
590-
}
591-
)
592-
}
593-
594572
public func bridgedEngine() -> TabsBridgedEngine {
595573
return try! FfiConverterTypeTabsBridgedEngine.lift(
596574
try!
@@ -989,12 +967,6 @@ private var initializationResult: InitializationResult {
989967
if uniffi_tabs_checksum_method_tabsstore_register_with_sync_manager() != 21590 {
990968
return InitializationResult.apiChecksumMismatch
991969
}
992-
if uniffi_tabs_checksum_method_tabsstore_reset() != 39644 {
993-
return InitializationResult.apiChecksumMismatch
994-
}
995-
if uniffi_tabs_checksum_method_tabsstore_sync() != 26627 {
996-
return InitializationResult.apiChecksumMismatch
997-
}
998970
if uniffi_tabs_checksum_method_tabsstore_bridged_engine() != 20794 {
999971
return InitializationResult.apiChecksumMismatch
1000972
}

‎swift-source/all/Generated/tabsFFI.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ void uniffi_tabs_fn_method_tabsstore_set_local_tabs(void*_Nonnull ptr, RustBuffe
7777
);
7878
void uniffi_tabs_fn_method_tabsstore_register_with_sync_manager(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
7979
);
80-
void uniffi_tabs_fn_method_tabsstore_reset(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
81-
);
82-
RustBuffer uniffi_tabs_fn_method_tabsstore_sync(void*_Nonnull ptr, RustBuffer key_id, RustBuffer access_token, RustBuffer sync_key, RustBuffer tokenserver_url, RustBuffer local_id, RustCallStatus *_Nonnull out_status
83-
);
8480
void*_Nonnull uniffi_tabs_fn_method_tabsstore_bridged_engine(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
8581
);
8682
void uniffi_tabs_fn_free_tabsbridgedengine(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -127,12 +123,6 @@ uint16_t uniffi_tabs_checksum_method_tabsstore_set_local_tabs(void
127123
);
128124
uint16_t uniffi_tabs_checksum_method_tabsstore_register_with_sync_manager(void
129125

130-
);
131-
uint16_t uniffi_tabs_checksum_method_tabsstore_reset(void
132-
133-
);
134-
uint16_t uniffi_tabs_checksum_method_tabsstore_sync(void
135-
136126
);
137127
uint16_t uniffi_tabs_checksum_method_tabsstore_bridged_engine(void
138128

‎swift-source/all/Logins/LoginsStorage.swift

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,6 @@ open class LoginsStorage {
2121
store = try LoginStore(path: databasePath)
2222
}
2323

24-
/// Delete all locally stored login sync metadata. It's unclear if
25-
/// there's ever a reason for users to call this
26-
open func reset() throws {
27-
try queue.sync {
28-
try self.store.reset()
29-
}
30-
}
31-
32-
/// Delete all locally stored login data.
33-
open func wipe() throws {
34-
try queue.sync {
35-
try self.store.wipe()
36-
}
37-
}
38-
3924
open func wipeLocal() throws {
4025
try queue.sync {
4126
try self.store.wipeLocal()
@@ -103,19 +88,6 @@ open class LoginsStorage {
10388
self.store.registerWithSyncManager()
10489
}
10590
}
106-
107-
open func sync(unlockInfo: SyncUnlockInfo) throws -> String {
108-
return try queue.sync {
109-
try self.store
110-
.sync(
111-
keyId: unlockInfo.kid,
112-
accessToken: unlockInfo.fxaAccessToken,
113-
syncKey: unlockInfo.syncKey,
114-
tokenserverUrl: unlockInfo.tokenserverURL,
115-
localEncryptionKey: unlockInfo.loginEncryptionKey
116-
)
117-
}
118-
}
11991
}
12092

12193
public func migrateLoginsFromSqlcipher(

‎swift-source/all/Places/Places.swift

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -70,105 +70,6 @@ public class PlacesAPI {
7070
}
7171
}
7272

73-
/**
74-
* Sync the bookmarks collection.
75-
*
76-
* - Returns: A JSON string representing a telemetry ping for this sync. The
77-
* string contains the ping payload, and should be sent to the
78-
* telemetry submission endpoint.
79-
*
80-
* - Throws:
81-
* - `PlacesApiError.databaseInterrupted`: If a call is made to `interrupt()` on this
82-
* object from another thread.
83-
* - `PlacesApiError.unexpected`: When an error that has not specifically been exposed
84-
* to Swift is encountered (for example IO errors from
85-
* the database code, etc).
86-
* - `PlacesApiError.panic`: If the rust code panics while completing this
87-
* operation. (If this occurs, please let us know).
88-
*/
89-
open func syncBookmarks(unlockInfo: SyncUnlockInfo) throws -> String {
90-
return try queue.sync {
91-
try self.api.bookmarksSync(
92-
keyId: unlockInfo.kid,
93-
accessToken: unlockInfo.fxaAccessToken,
94-
syncKey: unlockInfo.syncKey,
95-
tokenserverUrl: unlockInfo.tokenserverURL
96-
)
97-
}
98-
}
99-
100-
/**
101-
* Sync the History collection.
102-
*
103-
* - Returns: A JSON string representing a telemetry ping for this sync. The
104-
* string contains the ping payload, and should be sent to the
105-
* telemetry submission endpoint.
106-
*
107-
* - Throws:
108-
* - `PlacesApiError.databaseInterrupted`: If a call is made to `interrupt()` on this
109-
* object from another thread.
110-
* - `PlacesApiError.unexpected`: When an error that has not specifically been exposed
111-
* to Swift is encountered (for example IO errors from
112-
* the database code, etc).
113-
* - `PlacesApiError.panic`: If the rust code panics while completing this
114-
* operation. (If this occurs, please let us know).
115-
*/
116-
open func syncHistory(unlockInfo: SyncUnlockInfo) throws -> String {
117-
return try queue.sync {
118-
try self.api.historySync(
119-
keyId: unlockInfo.kid,
120-
accessToken: unlockInfo.fxaAccessToken,
121-
syncKey: unlockInfo.syncKey,
122-
tokenserverUrl: unlockInfo.tokenserverURL
123-
)
124-
}
125-
}
126-
127-
/**
128-
* Resets all sync metadata for history, including change flags,
129-
* sync statuses, and last sync time. The next sync after reset
130-
* will behave the same way as a first sync when connecting a new
131-
* device.
132-
*
133-
* This method only needs to be called when the user disconnects
134-
* from Sync. There are other times when Places resets sync metadata,
135-
* but those are handled internally in the Rust code.
136-
*
137-
* - Throws:
138-
* - `PlacesApiError.databaseInterrupted`: If a call is made to `interrupt()` on this
139-
* object from another thread.
140-
* - `PlacesApiError.unexpected`: When an error that has not specifically been exposed
141-
* to Swift is encountered (for example IO errors from
142-
* the database code, etc).
143-
* - `PlacesApiError.panic`: If the rust code panics while completing this
144-
* operation. (If this occurs, please let us know).
145-
*/
146-
open func resetHistorySyncMetadata() throws {
147-
return try queue.sync {
148-
try self.api.resetHistory()
149-
}
150-
}
151-
152-
/**
153-
* Resets all sync metadata for bookmarks, including change flags, sync statuses, and
154-
* last sync time. The next sync after reset will behave the same way as a first sync
155-
* when connecting a new device.
156-
*
157-
* - Throws:
158-
* - `PlacesApiError.databaseInterrupted`: If a call is made to `interrupt()` on this
159-
* object from another thread.
160-
* - `PlacesApiError.unexpected`: When an error that has not specifically been exposed
161-
* to Swift is encountered (for example IO errors from
162-
* the database code, etc).
163-
* - `PlacesApiError.panic`: If the rust code panics while completing this
164-
* operation. (If this occurs, please let us know).
165-
*/
166-
open func resetBookmarkSyncMetadata() throws {
167-
return try queue.sync {
168-
try self.api.bookmarksReset()
169-
}
170-
}
171-
17273
open func registerWithSyncManager() {
17374
queue.sync {
17475
self.api.registerWithSyncManager()
@@ -877,13 +778,6 @@ public class PlacesWriteConnection: PlacesReadConnection {
877778
}
878779
}
879780

880-
open func wipeLocalHistory() throws {
881-
try queue.sync {
882-
try self.checkApi()
883-
try self.conn.wipeLocalHistory()
884-
}
885-
}
886-
887781
open func deleteEverythingHistory() throws {
888782
try queue.sync {
889783
try self.checkApi()

‎swift-source/all/Tabs/Tabs.swift

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,9 @@ open class TabsStorage {
2626
}
2727
}
2828

29-
open func reset() throws {
30-
try queue.sync {
31-
try self.store.reset()
32-
}
33-
}
34-
3529
open func registerWithSyncManager() {
3630
queue.sync {
3731
self.store.registerWithSyncManager()
3832
}
3933
}
40-
41-
open func sync(unlockInfo: SyncUnlockInfo) throws -> String {
42-
guard let tabsLocalId = unlockInfo.tabsLocalId else {
43-
throw TabsApiError.UnexpectedTabsError(reason: "tabs local ID was not provided")
44-
}
45-
46-
return try queue.sync {
47-
try self.store
48-
.sync(
49-
keyId: unlockInfo.kid,
50-
accessToken: unlockInfo.fxaAccessToken,
51-
syncKey: unlockInfo.syncKey,
52-
tokenserverUrl: unlockInfo.tokenserverURL,
53-
localId: tabsLocalId
54-
)
55-
}
56-
}
5734
}

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

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

28-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 7, day: 17, hour: 5, minute: 13, second: 11))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 7, day: 18, hour: 5, minute: 20, second: 32))
2929
}
3030

3131
enum NimbusEvents {

0 commit comments

Comments
 (0)