Added About section

ghostery · Mar 26, 2018 · 3432b6ee1abd5eff98c5e41847e7eff6fc5b357c · 3432b6e
1 parent 9cf1c64
commit 3432b6ee1abd5eff98c5e41847e7eff6fc5b357c
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
@@ -55,6 +55,10 @@
 		1EAFE4CF205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */; };
 		1EAFE4DF205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */; };
 		1EAFE4E1205AE35E006A36B4 /* ShowCliqzPageSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.swift */; };
+		1EAFE4E3205BC7D9006A36B4 /* AboutSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4E2205BC7D9006A36B4 /* AboutSettingsTableViewController.swift */; };
+		1EAFE4E5205BD88A006A36B4 /* LocalResourceSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4E4205BD88A006A36B4 /* LocalResourceSetting.swift */; };
+		1EAFE4EC205BDB51006A36B4 /* Eula.html in Resources */ = {isa = PBXBuildFile; fileRef = 1EAFE4EB205BDB50006A36B4 /* Eula.html */; };
+		1EAFE4F0205BDEC0006A36B4 /* cliqz.json in Resources */ = {isa = PBXBuildFile; fileRef = 1EAFE4EF205BDEC0006A36B4 /* cliqz.json */; };
 		2805F5A61B8BCA7A00268FD1 /* ReadingList.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4D567181ADECE2700F1EFE7 /* ReadingList.framework */; };
 		28078A471B1507EF0053B46A /* ReadingList.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4D567181ADECE2700F1EFE7 /* ReadingList.framework */; };
 		280CB1371C20E0A3005AF147 /* BookmarksSynchronizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280CB1361C20E0A3005AF147 /* BookmarksSynchronizer.swift */; };
@@ -1467,6 +1471,10 @@
 		1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LimitMobileDataUsageTableViewController.swift; sourceTree = "<group>"; };
 		1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBlockerSettingsTableViewController.swift; sourceTree = "<group>"; };
 		1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowCliqzPageSetting.swift; sourceTree = "<group>"; };
+		1EAFE4E2205BC7D9006A36B4 /* AboutSettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutSettingsTableViewController.swift; sourceTree = "<group>"; };
+		1EAFE4E4205BD88A006A36B4 /* LocalResourceSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalResourceSetting.swift; sourceTree = "<group>"; };
+		1EAFE4EB205BDB50006A36B4 /* Eula.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Eula.html; sourceTree = "<group>"; };
+		1EAFE4EF205BDEC0006A36B4 /* cliqz.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = cliqz.json; path = "node_modules/browser-core/build/config/cliqz.json"; sourceTree = SOURCE_ROOT; };
 		280CB1361C20E0A3005AF147 /* BookmarksSynchronizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BookmarksSynchronizer.swift; path = Sync/Synchronizers/Bookmarks/BookmarksSynchronizer.swift; sourceTree = SOURCE_ROOT; };
 		28126F471C2F948E006466CC /* SQLiteBookmarksHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteBookmarksHelpers.swift; sourceTree = "<group>"; };
 		28126F6D1C2F94F9006466CC /* SQLiteBookmarksModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteBookmarksModel.swift; sourceTree = "<group>"; };
@@ -2488,13 +2496,15 @@
 				1E3CBC142057D83700898B05 /* CliqzAppSettingsTableViewController.swift */,
 				1E3CBC242058213500898B05 /* CliqzOnOffSetting.swift */,
 				1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.swift */,
+				1EAFE4E4205BD88A006A36B4 /* LocalResourceSetting.swift */,
 				1E3CBC162058057700898B05 /* CliqzAppSettingsOptions.swift */,
 				1E3CBC1A2058064000898B05 /* SubSettingsTableViewController.swift */,
 				1E3CBC202058149900898B05 /* ToggleSubSettingsTableViewController.swift */,
 				1E3CBC18205805E200898B05 /* HumanWebSettingsTableViewController.swift */,
 				1E3CBC2220581C4B00898B05 /* AutoForgetTabTableViewController.swift */,
 				1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */,
 				1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */,
+				1EAFE4E2205BC7D9006A36B4 /* AboutSettingsTableViewController.swift */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
@@ -3054,6 +3064,7 @@
 			isa = PBXGroup;
 			children = (
 				1EAFE515205FBBBC006A36B4 /* CliqzLaunchScreen.xib */,
+				1EAFE4EF205BDEC0006A36B4 /* cliqz.json */,
 				4F30F5422051E3F90049E4F6 /* etld.plist */,
 				4F3046BA204FF69200C99162 /* logo-database.json */,
 				4F3046AC204FF0EA00C99162 /* Cliqz.xcassets */,
@@ -3811,6 +3822,7 @@
 		E699220D1B94E3EF007C480D /* About */ = {
 			isa = PBXGroup;
 			children = (
+				1EAFE4EB205BDB50006A36B4 /* Eula.html */,
 				E69922121B94E3EF007C480D /* Licenses.html */,
 			);
 			path = About;
@@ -5285,7 +5297,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				D38A1EE01CB458EC0080C842 /* CertError.html in Resources */,
+				1EAFE4EC205BDB51006A36B4 /* Eula.html in Resources */,
 				0BA1E0301B051A07007675AF /* NetError.css in Resources */,
+				1EAFE4F0205BDEC0006A36B4 /* cliqz.json in Resources */,
 				D03F8F21200EABB0003C2224 /* __firefox__.js in Resources */,
 				3BC659491E5BA4AE006D560F /* TopSites in Resources */,
 				E4B7B77E1A793CF20022C5E0 /* FiraSans-SemiBold.ttf in Resources */,
@@ -6088,6 +6102,7 @@
 				D31A0FC71A65D6D000DC8C7E /* SearchSuggestClient.swift in Sources */,
 				A83E5AB71C1D993D0026D912 /* UIPasteboardExtensions.swift in Sources */,
 				D0E55C4F1FB4FD23006DC274 /* FormPostHelper.swift in Sources */,
+				1EAFE4E5205BD88A006A36B4 /* LocalResourceSetting.swift in Sources */,
 				E650754E1E37F6AE006961AC /* GeometryExtensions.swift in Sources */,
 				D3972BF41C22412B00035B87 /* TitleActivityItemProvider.swift in Sources */,
 				D38A1BEE1A9FA2CA00F6A386 /* SiteTableViewController.swift in Sources */,
@@ -6187,6 +6202,7 @@
 				C88601C61F4228AD00BBDE4F /* ContentBlockerSettingViewController.swift in Sources */,
 				E6327A641BF6438E008D12E0 /* DebugSettingsBundleOptions.swift in Sources */,
 				1E3CBC1D205806F000898B05 /* DateExtension.swift in Sources */,
+				1EAFE4E3205BC7D9006A36B4 /* AboutSettingsTableViewController.swift in Sources */,
 				D3E8EF101B97BE69001900FB /* ClearPrivateDataTableViewController.swift in Sources */,
 				C8F457AA1F1FDD9B000CB895 /* BrowserViewController+KeyCommands.swift in Sources */,
 				1E3CBC212058149900898B05 /* ToggleSubSettingsTableViewController.swift in Sources */,

diff --git a/Client/Application/AppDelegate.swift b/Client/Application/AppDelegate.swift
@@ -548,6 +548,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
         AboutHomeHandler.register(server)
         AboutLicenseHandler.register(server)
         SessionRestoreHandler.register(server)
+
+        //Cliqz: register the Eula handler
+        AboutEulaHandler.register(server)
 
         // Bug 1223009 was an issue whereby CGDWebserver crashed when moving to a background task
         // catching and handling the error seemed to fix things, but we're not sure why.

diff --git a/Client/Assets/About/Eula.html b/Client/Assets/About/Eula.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	<head>
+
+		<meta charset="UTF-8">
+		<meta name="viewport" content="initial-scale=1.0001, user-scalable=no" />
+			<title>Licenses</title>
+			<style>
+				body {font-size: 1.0em; font-family: sans-serif; padding: 1em;}
+    </style>
+			</head>
+	<body>
+  <h1>
+	  EULA
+  </h1>
+  <p>
+  The CLIQZ Browser for iOS is built upon the <a href="http://www.mozilla.org">Mozilla open source project</a> and is made available to you under the terms of the <a href="https://www.mozilla.org/en-US/MPL/2.0/">Public License 2.0</a>, a free software license, which gives you the right to run the program for any purpose, to study how it works, to give copies to your friends and to modify it to meet your needs better. There is no separate End User License Agreement (EULA).
+  </p>
+
+	</body>
+</html>