Merge pull request #35 from cliqz-oss/firefox-merge-v11

Firefox merge v11
ghostery · May 15, 2018 · ef5a662105dd0f14de1e8b1b4d3827c05f751502 · ef5a662
2 parents b04080e + 97c114f
commit ef5a662105dd0f14de1e8b1b4d3827c05f751502
Unified Split

Showing 1,755 changed files with 10,499 additions and 3,421 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.swiftlint.yml b/.swiftlint.yml
diff --git a/AUTHORS b/AUTHORS
diff --git a/Account/Account-Bridging-Header.h b/Account/Account-Bridging-Header.h
diff --git a/Account/FirefoxAccount.swift b/Account/FirefoxAccount.swift
diff --git a/Account/FirefoxAccountConfiguration.swift b/Account/FirefoxAccountConfiguration.swift
diff --git a/Account/FxAClient10.swift b/Account/FxAClient10.swift
diff --git a/Account/FxADevice.swift b/Account/FxADevice.swift
diff --git a/Account/FxADeviceRegistration.swift b/Account/FxADeviceRegistration.swift
diff --git a/Account/FxALoginStateMachine.swift b/Account/FxALoginStateMachine.swift
diff --git a/Account/FxAPushMessageHandler.swift b/Account/FxAPushMessageHandler.swift
diff --git a/Account/FxAState.swift b/Account/FxAState.swift
diff --git a/Account/HawkHelper.swift b/Account/HawkHelper.swift
diff --git a/Account/Info.plist b/Account/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.4</string>
+	<string>11.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Account/SyncAuthState.swift b/Account/SyncAuthState.swift
diff --git a/Account/TokenServerClient.swift b/Account/TokenServerClient.swift
diff --git a/AccountTests/FirefoxAccountTests.swift b/AccountTests/FirefoxAccountTests.swift
diff --git a/AccountTests/FxAClient10Tests.swift b/AccountTests/FxAClient10Tests.swift
diff --git a/AccountTests/FxALoginStateMachineTests.swift b/AccountTests/FxALoginStateMachineTests.swift
diff --git a/AccountTests/FxAStateTests.swift b/AccountTests/FxAStateTests.swift
diff --git a/AccountTests/HawkHelperTests.swift b/AccountTests/HawkHelperTests.swift
diff --git a/AccountTests/Info.plist b/AccountTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.4</string>
+	<string>11.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/AccountTests/LiveAccountTest.swift b/AccountTests/LiveAccountTest.swift
diff --git a/AccountTests/SyncAuthStateTests.swift b/AccountTests/SyncAuthStateTests.swift
diff --git a/AccountTests/TokenServerClientTests.swift b/AccountTests/TokenServerClientTests.swift
diff --git a/Cartfile b/Cartfile
@@ -4,18 +4,16 @@ github "sleroux/Deferred"                   "Swift3.0"
 github "SnapKit/SnapKit"                    "3.1.2"
 github "rs/SDWebImage"                      "4.1.0"
 github "swisspol/GCDWebServer"              "3.3.2"
-github "kif-framework/KIF"                  "v3.6.0"
+github "kif-framework/KIF"                  "v3.7.3"
 # Cliqz: Disable Adjust Integration
-#github "adjust/ios_sdk"                     "v4.11.5"
+#github "adjust/ios_sdk"                     "v4.12.1"
 github "AgileBits/onepassword-app-extension"    "add-framework-support"
-github "mozilla/readability"                "master"
+github "jrendel/SwiftKeychainWrapper" "master"
-github "jrendel/SwiftKeychainWrapper"       "3.0.1"
 github "DaveWoodCom/XCGLogger"              "Version_4.0.0"
-github "cezheng/Fuzi"                       "1.0.1"
+github "cezheng/Fuzi"                       "2.0.2"
 github "SwiftyJSON/SwiftyJSON"              "3.1.4"
 github "farhanpatel/JSONSchema.swift"       "master"
-github "google/EarlGrey"                    "1.12.1"
+github "google/EarlGrey"                    "1.13.0"
-github "jhugman/SwiftRouter"                "master"
 # Cliqz: Disable FireFox Telemetry
 #github "mozilla-mobile/telemetry-ios"       "v1.0.10"
 github "mozilla-mobile/MappaMundi"          "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,15 @@
+github "AgileBits/onepassword-app-extension" "bcc4cc97fed9a6e73fa204f2e61138e353cb3ef7"
+github "Alamofire/Alamofire" "4.7.2"
+github "DaveWoodCom/XCGLogger" "Version_4.0.0"
+github "SnapKit/SnapKit" "3.1.2"
+github "SwiftyJSON/SwiftyJSON" "3.1.4"
+github "cezheng/Fuzi" "2.0.2"
+github "farhanpatel/JSONSchema.swift" "1c052b83baa8c497e12cde6a8afca0f54574612f"
+github "getsentry/sentry-cocoa" "3.11.1"
+github "google/EarlGrey" "1.13.0"
+github "jrendel/SwiftKeychainWrapper" "46e5980ee7630be015aae6a6307c2fe1e8f3661d"
+github "kif-framework/KIF" "v3.7.3"
+github "mozilla-mobile/MappaMundi" "0b4f70e2feb941f4d56bd9e27e408d4300656a87"
+github "rs/SDWebImage" "4.1.0"
+github "sleroux/Deferred" "35b8927c1b94ce074e10793c57e1f80d0e2227fa"
+github "swisspol/GCDWebServer" "3.3.2"
diff --git a/Client-Bridging-Header.h b/Client-Bridging-Header.h
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
diff --git a/Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Client.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Client.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/...cbaselines/2FCAE2231ABB51F800877008.xcbaseline/FE8885C6-BB1A-48D2-9B90-E9F952C98F6B.plist b/...cbaselines/2FCAE2231ABB51F800877008.xcbaseline/FE8885C6-BB1A-48D2-9B90-E9F952C98F6B.plist
diff --git a/Client.xcodeproj/xcshareddata/xcbaselines/2FCAE2231ABB51F800877008.xcbaseline/Info.plist b/Client.xcodeproj/xcshareddata/xcbaselines/2FCAE2231ABB51F800877008.xcbaseline/Info.plist
diff --git a/...cbaselines/E6F9650B1B2F1CF20034B023.xcbaseline/F9839E4F-67D2-4920-8CE8-94CEE3A6C3D7.plist b/...cbaselines/E6F9650B1B2F1CF20034B023.xcbaseline/F9839E4F-67D2-4920-8CE8-94CEE3A6C3D7.plist
diff --git a/Client.xcodeproj/xcshareddata/xcbaselines/E6F9650B1B2F1CF20034B023.xcbaseline/Info.plist b/Client.xcodeproj/xcshareddata/xcbaselines/E6F9650B1B2F1CF20034B023.xcbaseline/Info.plist
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Account.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Account.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_UITests.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_UITests.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_XCUITests.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_XCUITests.xcscheme
@@ -178,6 +178,9 @@
                <Test
                   Identifier = "BaseTestCase">
                </Test>
+               <Test
+                  Identifier = "DragAndDropTests">
+               </Test>
                <Test
                   Identifier = "HomePageUITest">
                </Test>
@@ -199,12 +202,30 @@
                <Test
                   Identifier = "PrivateBrowsingTest/testiPadDirectAccessPrivateModeBrowserTab()">
                </Test>
+               <Test
+                  Identifier = "ReaderViewTest">
+               </Test>
                <Test
                   Identifier = "SearchTests/testDismissPromptPresence()">
                </Test>
                <Test
                   Identifier = "SiteLoadTest">
                </Test>
+               <Test
+                  Identifier = "ThirdPartySearchTest/testCustomEngineFromCorrectTemplate()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowDoNotShowToolbarWhenScrollingLandscape()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowDoNotShowToolbarWhenScrollingPortrait()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowToolbarWhenScrollingDefaultOption()">
+               </Test>
+               <Test
+                  Identifier = "TopTabsTest/testCloseTabFromPageOptionsMenu()">
+               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference

diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_XCUITests_iPad.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_XCUITests_iPad.xcscheme
@@ -190,12 +190,27 @@
                <Test
                   Identifier = "NavigationTest/testToggleBetweenMobileAndDesktopSiteFromSite()">
                </Test>
+               <Test
+                  Identifier = "ReaderViewTest">
+               </Test>
                <Test
                   Identifier = "SearchTests/testDismissPromptPresence()">
                </Test>
                <Test
                   Identifier = "SiteLoadTest">
                </Test>
+               <Test
+                  Identifier = "ThirdPartySearchTest/testCustomEngineFromCorrectTemplate()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowDoNotShowToolbarWhenScrollingLandscape()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowDoNotShowToolbarWhenScrollingPortrait()">
+               </Test>
+               <Test
+                  Identifier = "ToolbarTests/testShowToolbarWhenScrollingDefaultOption()">
+               </Test>
                <Test
                   Identifier = "TopTabsTest/testAddPrivateTabByLongPressTabsButton()">
                </Test>
@@ -208,6 +223,12 @@
                <Test
                   Identifier = "TopTabsTest/testCloseTabFromPageOptionsMenu()">
                </Test>
+               <Test
+                  Identifier = "TopTabsTest/testSwitchBetweenTabsNoPrivatePrivateToastButton()">
+               </Test>
+               <Test
+                  Identifier = "TopTabsTest/testSwitchBetweenTabsToastButton()">
+               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference

diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/L10nSnapshotTests.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/L10nSnapshotTests.xcscheme
@@ -49,6 +49,9 @@
                <Test
                   Identifier = "L10nSnapshotTests/test07AddSearchProvider()">
                </Test>
+               <Test
+                  Identifier = "L10nSnapshotTests/test13ReloadButtonContextMenu()">
+               </Test>
                <Test
                   Identifier = "L10nSnapshotTests/test14SetHompage()">
                </Test>

diff --git a/Client.xcodeproj/xcshareddata/xcschemes/MarketingUITests.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/MarketingUITests.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/ReadingList.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/ReadingList.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/SendTo.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/SendTo.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/ShareTo.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/ShareTo.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Storage.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Storage.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Sync.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Sync.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Telemetry.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Telemetry.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Today.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Today.xcscheme
diff --git a/Client.xcodeproj/xcshareddata/xcschemes/ViewLater.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/ViewLater.xcscheme
diff --git a/Client/Application/AdjustIntegration.swift b/Client/Application/AdjustIntegration.swift