From e5e09f3d67a85ecd83dcd889f69b3c6bb3081dc3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 20 Feb 2017 10:11:05 +0100
Subject: [PATCH] MOBILE-2019 config: Add privacy policy

---
 upgrade.txt                                       | 1 +
 www/config.json                                   | 3 ++-
 www/core/components/settings/controllers/about.js | 1 +
 www/core/components/settings/lang/en.json         | 1 +
 www/core/components/settings/templates/about.html | 8 +++++++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index c710ecbeb18..0c3e885f8dd 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -20,6 +20,7 @@ information provided here is intended especially for developers.
     ionic state restore
  * mm-rich-text-editor now admits a new parameter adjust-height (default: true). It admits an HTML DOM Id string or boolean. Specifying it will adjust height of the editor to the selected element. If true it will adjust to the whole page and false will use height parameter instead.
  * Generators on stores are deprecated. Using generators will make Android < 4.4 fail. Use keyPath instead. They will be automatically generated if needed. DB Functions query, update and where are not allowed using compoung indexes see JSdoc DB functions on db.js for more info.
+ * A new field has been added to config.json: privacypolicy.
 
 === 3.2 ===
 
diff --git a/www/config.json b/www/config.json
index 82ebf7d1316..1d0876d02c5 100644
--- a/www/config.json
+++ b/www/config.json
@@ -13,5 +13,6 @@
     "customurlscheme": "moodlemobile",
     "siteurl": "",
     "skipssoconfirmation": "false",
-    "forcedefaultlanguage": "false"
+    "forcedefaultlanguage": "false",
+    "privacypolicy": "https://moodle.org/mod/page/view.php?id=8148"
 }
diff --git a/www/core/components/settings/controllers/about.js b/www/core/components/settings/controllers/about.js
index 00d1cd15741..ec343459ea2 100644
--- a/www/core/components/settings/controllers/about.js
+++ b/www/core/components/settings/controllers/about.js
@@ -27,6 +27,7 @@ angular.module('mm.core.settings')
     $scope.versionname = mmCoreConfigConstants.versionname;
     $scope.appname = mmCoreConfigConstants.appname;
     $scope.versioncode = mmCoreConfigConstants.versioncode;
+    $scope.privacyPolicy = mmCoreConfigConstants.privacypolicy;
 
     $scope.navigator = $window.navigator;
     if ($window.location && $window.location.href) {
diff --git a/www/core/components/settings/lang/en.json b/www/core/components/settings/lang/en.json
index 5a6eb31b34b..eba2a83b4dc 100644
--- a/www/core/components/settings/lang/en.json
+++ b/www/core/components/settings/lang/en.json
@@ -40,6 +40,7 @@
     "navigatorlanguage": "Navigator language",
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Internet connection status",
+    "privacypolicy": "Privacy policy",
     "processorsettings": "Processor settings",
     "reportinbackground": "Report errors automatically",
     "settings": "Settings",
diff --git a/www/core/components/settings/templates/about.html b/www/core/components/settings/templates/about.html
index d788eddea8b..fca46dec26d 100644
--- a/www/core/components/settings/templates/about.html
+++ b/www/core/components/settings/templates/about.html
@@ -11,6 +11,12 @@ <h2>{{appname}} {{versionname}}</h2>
                 <h2>Apache 2.0</h2>
                 <p><a href="http://www.apache.org/licenses/LICENSE-2.0" mm-link auto-login="no">http://www.apache.org/licenses/LICENSE-2.0</a></p>
             </li>
+            <li class="item item-divider" ng-if="privacyPolicy">
+                <p>{{ 'mm.settings.privacypolicy' | translate }}</p>
+            </li>
+            <li class="item item-text-wrap" ng-if="privacyPolicy">
+                <p><a ng-href="{{ privacyPolicy }}" mm-link auto-login="no">{{ privacyPolicy }}</a></p>
+            </li>
             <li class="item item-divider">
                 <p>{{ 'mm.settings.deviceinfo' | translate }}</p>
             </li>
@@ -24,7 +30,7 @@ <h2>Apache 2.0</h2>
             </li>
             <li class="item item-text-wrap" ng-if="filesystemroot">
                 <p class="item-heading">{{ 'mm.settings.filesystemroot' | translate}}</p>
-                <a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a>
+                <p><a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a></p>
                 <p ng-if="!fsclickable">{{ filesystemroot }}</p>
             </li>
             <li class="item item-text-wrap" ng-if="navigator && navigator.userAgent">