From 84ce371b373c972aae0223f2229809a2868edc0d Mon Sep 17 00:00:00 2001
From: Luka Bratos <luka.bratos@gmail.com>
Date: Mon, 31 Dec 2018 14:58:37 +0000
Subject: [PATCH] Remove unnecessary synchronize() call. (#1613)

---
 Blockzilla/UserAgent.swift       | 1 -
 ClientTests/UserAgentTests.swift | 9 ---------
 SentryIntegration.swift          | 1 -
 Shared/Settings.swift            | 3 ---
 4 files changed, 14 deletions(-)

diff --git a/Blockzilla/UserAgent.swift b/Blockzilla/UserAgent.swift
index 6b01176b65..75a75d17f4 100644
--- a/Blockzilla/UserAgent.swift
+++ b/Blockzilla/UserAgent.swift
@@ -99,7 +99,6 @@ class UserAgent {
 
     private func setUserAgent(userAgent: String) {
         userDefaults.register(defaults: ["UserAgent": userAgent])
-        userDefaults.synchronize()
     }
 
     public func changeUserAgent() {
diff --git a/ClientTests/UserAgentTests.swift b/ClientTests/UserAgentTests.swift
index 2976e59258..d28c5b5753 100644
--- a/ClientTests/UserAgentTests.swift
+++ b/ClientTests/UserAgentTests.swift
@@ -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)
     }
@@ -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"))!)
@@ -52,7 +50,6 @@ class UserAgentTests: XCTestCase {
 }
 
 fileprivate class MockUserDefaults: UserDefaults {
-    var synchronizeCalled = false
     var registerValue: [String : Any]?
 
     func clear() {
@@ -60,15 +57,9 @@ fileprivate class MockUserDefaults: UserDefaults {
         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
     }
diff --git a/SentryIntegration.swift b/SentryIntegration.swift
index 3051dc4d20..8ef5f73c07 100644
--- a/SentryIntegration.swift
+++ b/SentryIntegration.swift
@@ -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
diff --git a/Shared/Settings.swift b/Shared/Settings.swift
index c6b9222797..1d5019b797 100644
--- a/Shared/Settings.swift
+++ b/Shared/Settings.swift
@@ -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 {
@@ -66,6 +64,5 @@ struct Settings {
 
     static func setSiriRequestErase(to value: Bool) {
         prefs.set(value, forKey: siriRequestsEraseKey)
-        prefs.synchronize()
     }
 }