[IB2-21] Disabled FireFox Telemetry

ghostery · Feb 20, 2018 · 42a0084b5b397f6087770301f4f7ec8c989748f6 · 42a0084
1 parent 49da9d5
commit 42a0084b5b397f6087770301f4f7ec8c989748f6
Unified Split

Showing with 24 additions and 7 deletions.

+2 −1 Cartfile

+0 −5 Client.xcodeproj/project.pbxproj

+4 −0 Client/Frontend/Browser/BrowserViewController.swift

+7 −1 Client/Frontend/Browser/SearchViewController.swift

+11 −0 Client/Telemetry/UnifiedTelemetry.swift
diff --git a/Cartfile b/Cartfile
@@ -16,5 +16,6 @@ github "SwiftyJSON/SwiftyJSON"              "3.1.4"
 github "farhanpatel/JSONSchema.swift"       "master"
 github "google/EarlGrey"                    "1.12.1"
 github "jhugman/SwiftRouter"                "master"
-github "mozilla-mobile/telemetry-ios"       "v1.0.10"
+# Cliqz: Disable FireFox Telemetry
+#github "mozilla-mobile/telemetry-ios"       "v1.0.10"
 github "mozilla-mobile/MappaMundi"          "master"
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
@@ -745,7 +745,6 @@
 		EBA31D791F7999030055463D /* SyncPingCentre.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA31D781F7999030055463D /* SyncPingCentre.swift */; };
 		EBA31D7B1F79990C0055463D /* SyncTelemetryEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA31D7A1F79990C0055463D /* SyncTelemetryEvents.swift */; };
 		EBA31D7D1F79996E0055463D /* SyncTelemetryUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA31D7C1F79996E0055463D /* SyncTelemetryUtils.swift */; };
-		EBA31D861F799BE20055463D /* Telemetry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBA31D7E1F799BE20055463D /* Telemetry.framework */; };
 		EBF47E701F7979DF00899189 /* UnifiedTelemetry.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBF47E6F1F7979DF00899189 /* UnifiedTelemetry.swift */; };
 		F35B8D2B1D6380EA008E3D61 /* SessionRestore.html in Resources */ = {isa = PBXBuildFile; fileRef = F35B8D2A1D6380EA008E3D61 /* SessionRestore.html */; };
 		F35B8D2D1D6383E9008E3D61 /* SessionRestoreHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F35B8D2C1D6383E9008E3D61 /* SessionRestoreHelper.swift */; };
@@ -2026,7 +2025,6 @@
 		EBA31D781F7999030055463D /* SyncPingCentre.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncPingCentre.swift; sourceTree = "<group>"; };
 		EBA31D7A1F79990C0055463D /* SyncTelemetryEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncTelemetryEvents.swift; sourceTree = "<group>"; };
 		EBA31D7C1F79996E0055463D /* SyncTelemetryUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncTelemetryUtils.swift; sourceTree = "<group>"; };
-		EBA31D7E1F799BE20055463D /* Telemetry.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Telemetry.framework; path = Carthage/Build/iOS/Telemetry.framework; sourceTree = "<group>"; };
 		EBF47E6F1F7979DF00899189 /* UnifiedTelemetry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnifiedTelemetry.swift; sourceTree = "<group>"; };
 		F35B8D2A1D6380EA008E3D61 /* SessionRestore.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = SessionRestore.html; sourceTree = "<group>"; };
 		F35B8D2C1D6383E9008E3D61 /* SessionRestoreHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionRestoreHelper.swift; sourceTree = "<group>"; };
@@ -2113,7 +2111,6 @@
 				7B604F9B1C4950F2006EEEC3 /* SDWebImage.framework in Frameworks */,
 				7B604FA21C495268006EEEC3 /* SnapKit.framework in Frameworks */,
 				3B4988CE1E42B01800A12FDA /* SwiftyJSON.framework in Frameworks */,
-				EBA31D861F799BE20055463D /* Telemetry.framework in Frameworks */,
 				7B604FBB1C495D8A006EEEC3 /* XCGLogger.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2886,7 +2883,6 @@
 			isa = PBXGroup;
 			children = (
 				392E18021FEC4D7B00EBA79C /* MappaMundi.framework */,
-				EBA31D7E1F799BE20055463D /* Telemetry.framework */,
 				E46175F21EBB73A10021AE8A /* Sentry.framework */,
 				3B4988CD1E42B01800A12FDA /* SwiftyJSON.framework */,
 				E6231C041B90A472005ABB0D /* libxml2.2.tbd */,
@@ -5045,7 +5041,6 @@
 				"$(SRCROOT)/Carthage/Build/iOS/SwiftyJSON.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Sentry.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/SwiftRouter.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/Telemetry.framework",
 			);
 			name = "Copy Carthage Dependencies";
 			outputPaths = (

diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -16,7 +16,9 @@ import ReadingList
 import MobileCoreServices
 import SDWebImage
 import SwiftyJSON
+/* Cliqz: Disable FireFox Telemetry
 import Telemetry
+ */
 import Sentry
 
 private let KVOs: [KVOConstants] = [
@@ -1453,7 +1455,9 @@ extension BrowserViewController: URLBarDelegate {
 
         if let searchURL = engine.searchURLForQuery(text) {
             // We couldn't find a matching search keyword, so do a search query.
+            /* Cliqz: Disable FireFox Telemetry
             Telemetry.default.recordSearch(location: .actionBar, searchEngine: engine.engineID ?? "other")
+            */
             finishEditingAndSubmit(searchURL, visitType: VisitType.typed)
         } else {
             // We still don't have a valid URL, so something is broken. Give up.

diff --git a/Client/Frontend/Browser/SearchViewController.swift b/Client/Frontend/Browser/SearchViewController.swift
@@ -5,7 +5,9 @@
 import UIKit
 import Shared
 import Storage
-import Telemetry
+/* Cliqz: Disable FireFox Telemetry
+ import Telemetry
+ */
 
 private enum SearchListSection: Int {
     case searchSuggestions
@@ -265,7 +267,9 @@ class SearchViewController: SiteTableViewController, KeyboardHelperDelegate, Loa
             return
         }
 
+        /* Cliqz: Disable FireFox Telemetry
         Telemetry.default.recordSearch(location: .quickSearch, searchEngine: engine.engineID ?? "other")
+        */
 
         searchDelegate?.searchViewController(self, didSelectURL: url)
     }
@@ -432,7 +436,9 @@ extension SearchViewController: SuggestionCellDelegate {
             url = engine.searchURLForQuery(suggestion)
         }
 
+        /* Cliqz: Disable FireFox Telemetry
         Telemetry.default.recordSearch(location: .suggestion, searchEngine: engine.engineID ?? "other")
+         */
 
         if let url = url {
             searchDelegate?.searchViewController(self, didSelectURL: url)

diff --git a/Client/Telemetry/UnifiedTelemetry.swift b/Client/Telemetry/UnifiedTelemetry.swift
@@ -3,13 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Shared
+/* Cliqz: Disable FireFox Telemetry
 import Telemetry
+*/
 
 //
 // 'Unified Telemetry' is the name for Mozilla's telemetry system
 //
 class UnifiedTelemetry {
     init(profile: Profile) {
+        /* Cliqz: Disable FireFox Telemetry
         NotificationCenter.default.addObserver(self, selector: #selector(uploadError), name: Telemetry.notificationReportError, object: nil)
 
         let telemetryConfig = Telemetry.default.configuration
@@ -56,11 +59,15 @@ class UnifiedTelemetry {
 
        Telemetry.default.add(pingBuilderType: CorePingBuilder.self)
        Telemetry.default.add(pingBuilderType: MobileEventPingBuilder.self)
+        */
+
     }
 
     @objc func uploadError(notification: NSNotification) {
+        /* Cliqz: Disable FireFox Telemetry
         guard !DeviceInfo.isSimulator(), let error = notification.userInfo?["error"] as? NSError else { return }
         Sentry.shared.send(message: "Upload Error", tag: SentryTag.unifiedTelemetry, severity: .info, description: error.debugDescription)
+        */
     }
 }
 
@@ -110,10 +117,14 @@ extension UnifiedTelemetry {
     }
 
     public static func recordEvent(category: EventCategory, method: EventMethod, object: EventObject, value: EventValue, extras: [String : Any?]? = nil) {
+        /* Cliqz: Disable FireFox Telemetry
         Telemetry.default.recordEvent(category: category.rawValue, method: method.rawValue, object: object.rawValue, value: value.rawValue, extras: extras)
+        */
     }
 
     public static func recordEvent(category: EventCategory, method: EventMethod, object: EventObject, value: String? = nil, extras: [String : Any?]? = nil) {
+        /* Cliqz: Disable FireFox Telemetry
         Telemetry.default.recordEvent(category: category.rawValue, method: method.rawValue, object: object.rawValue, value: value, extras: extras)
+        */
     }
 }