no longer track optional data which simplifies apples privacy guidelines

matomo-org · Nov 23, 2021 · dc090bf · dc090bf
1 parent b6112e9
commit dc090bf
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 553 deletions.
diff --git a/app/config.json b/app/config.json
@@ -31,11 +31,11 @@
             "enabled": true
         },
         "tracking": {
-            "enabled": true,
+            "enabled": false,
             "siteId": 34,
             "apiVersion": 1,
-            "baseUrl": "http://mobileapp.matomo.org",
-            "piwikServerUrl": "https://demo.matomo.org/piwik.php",
+            "baseUrl": "",
+            "piwikServerUrl": "",
             "maxTracksPerDay": 200
         },
         "faqUrl": "https://matomo.org/faq/mobile-app/",

diff --git a/app/controllers/index.js b/app/controllers/index.js
@@ -67,13 +67,6 @@ if (accounts.hasAccount()) {
     rating.countLaunch();
 })();
 
-(function () {
-    if (!Ti.App.Properties.hasProperty('asked_for_tracking_permission')) {
-        require('Piwik/Tracker').askForPermission();
-
-        Ti.App.Properties.setInt('asked_for_tracking_permission', 1);
-    }
-})();
 
 function onCreatedAccount(account) 
 {

diff --git a/app/controllers/settings.js b/app/controllers/settings.js
@@ -12,7 +12,6 @@ function L(key)
 
 var callbacks = {changeLanguage: changeLanguage,
                  toggleValidateSsl: toggleValidateSsl,
-                 toggleTrackingEnabled: toggleTrackingEnabled,
                  toggleGraphsEnabled: toggleGraphsEnabled,
                  changeHttpTimeout: changeHttpTimeout,
                  changeReportDate: changeReportDate};
@@ -84,11 +83,6 @@ function toggleValidateSsl()
     require('settings/validateSsl').toggle();
 }
 
-function toggleTrackingEnabled()
-{
-    require('settings/trackingEnabled').toggle();
-}
-
 function toggleGraphsEnabled()
 {
     require('settings/graphsEnabled').toggle();
@@ -156,18 +150,11 @@ function updateDisplayedValidateSslValue()
     setHasCheck($.validateSsl, 2, settings.shouldValidateSsl());
 }
 
-function updateDisplayedTrackingValue()
-{
-    var settings = Alloy.createCollection('AppSettings').settings();
-
-    setHasCheck($.tracking, 3, settings.isTrackingEnabled());
-}
-
 function updateDisplayedGraphsValue()
 {
     var settings = Alloy.createCollection('AppSettings').settings();
 
-    setHasCheck($.graphs, 4, settings.areGraphsEnabled());
+    setHasCheck($.graphs, 3, settings.areGraphsEnabled());
 }
 
 function setTitle(section, itemIndex, title)
@@ -263,16 +250,14 @@ function updateAllDisplayedSettingsValues()
         setTitle($.basic, 0, L('General_Language'));
         setTitle($.basic, 1, L('Mobile_DefaultReportDate'));
         setTitle($.basic, 2, L('Mobile_ValidateSslCertificate'));
-        setTitle($.basic, 3, L('Mobile_AnonymousTracking'));
-        setTitle($.basic, 4, L('Mobile_EnableGraphsLabel'));
+        setTitle($.basic, 3, L('Mobile_EnableGraphsLabel'));
         setTitle($.advanced, 0, L('Mobile_HttpTimeout'));
 
         updateDisplayedLanguageValue();
     }
 
     updateDisplayedHttpTimeoutValue();
     updateDisplayedValidateSslValue();
-    updateDisplayedTrackingValue();
     updateDisplayedGraphsValue();
     updateDisplayedReportDateValue();
 }

diff --git a/app/lib/Piwik/Network/TrackerRequest.js b/app/lib/Piwik/Network/TrackerRequest.js
@@ -41,7 +41,6 @@ TrackerRequest.prototype.send = function () {
         this.parameter = {};
     }
 
-    this.handle();
 };
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,6 @@ TrackerRequest.prototype.send = function () { @@
             this.parameter = {};
         }
-        this.handle();
     };
     /**
@@ Expand Down @@