Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Remove unnecessary synchronize() call. (#1613)
Browse files Browse the repository at this point in the history
  • Loading branch information
lukabratos authored and sblatz committed Dec 31, 2018
1 parent a647f90 commit 84ce371
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 14 deletions.
1 change: 0 additions & 1 deletion Blockzilla/UserAgent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ class UserAgent {

private func setUserAgent(userAgent: String) {
userDefaults.register(defaults: ["UserAgent": userAgent])
userDefaults.synchronize()
}

public func changeUserAgent() {
Expand Down
9 changes: 0 additions & 9 deletions ClientTests/UserAgentTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class UserAgentTests: XCTestCase {
mockUserDefaults.set(fakeUserAgent, forKey: "UserAgent")

_ = UserAgent(userDefaults: mockUserDefaults)
XCTAssertTrue(mockUserDefaults.synchronizeCalled)
XCTAssertNotNil(mockUserDefaults.registerValue)
XCTAssertEqual(mockUserDefaults.registerValue!["UserAgent"] as? String, fakeUserAgent)
}
Expand All @@ -40,7 +39,6 @@ class UserAgentTests: XCTestCase {
mockUserDefaults.removeObject(forKey: "UserAgent")

_ = UserAgent(userDefaults: mockUserDefaults)
XCTAssertTrue(mockUserDefaults.synchronizeCalled)
XCTAssertNotNil(mockUserDefaults.registerValue)
XCTAssertNotNil(mockUserDefaults.string(forKey: "LastFocusVersionNumber"))
XCTAssertTrue(((mockUserDefaults.registerValue!["UserAgent"] as? String)?.contains("FxiOS"))!)
Expand All @@ -52,23 +50,16 @@ class UserAgentTests: XCTestCase {
}

fileprivate class MockUserDefaults: UserDefaults {
var synchronizeCalled = false
var registerValue: [String : Any]?

func clear() {
removeObject(forKey: "LastFocusVersionNumber")
removeObject(forKey: "LastFocusBuildNumber")
removeObject(forKey: "LastDeviceSystemVersionNumber")
removeObject(forKey: "UserAgent")
synchronizeCalled = false
registerValue = nil
}

override func synchronize() -> Bool {
synchronizeCalled = true
return true
}

override func register(defaults registrationDictionary: [String : Any]) {
registerValue = registrationDictionary
}
Expand Down
1 change: 0 additions & 1 deletion SentryIntegration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public class SentryIntegration {
// be used for both the main application and the app extensions.
if let defaults = UserDefaults(suiteName: AppInfo.sharedContainerIdentifier), defaults.string(forKey: SentryDeviceAppHashKey) == nil {
defaults.set(Bytes.generateRandomBytes(DeviceAppHashLength).hexEncodedString, forKey: SentryDeviceAppHashKey)
defaults.synchronize()
}

// For all outgoing reports, override the default device identifier with our own random
Expand Down
3 changes: 0 additions & 3 deletions Shared/Settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ struct Settings {

static func setCustomDomainSetting(domains: [String]) {
prefs.set(domains, forKey: customDomainSettingKey)
prefs.synchronize()
}

static func set(_ value: Bool, forToggle toggle: SettingsToggle) {
prefs.set(value, forKey: toggle.rawValue)
prefs.synchronize()
}

static func siriRequestsErase() -> Bool {
Expand All @@ -66,6 +64,5 @@ struct Settings {

static func setSiriRequestErase(to value: Bool) {
prefs.set(value, forKey: siriRequestsEraseKey)
prefs.synchronize()
}
}

0 comments on commit 84ce371

Please sign in to comment.