Completely remove Google Analytics library
This commit is contained in:
		@@ -73,11 +73,6 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
 | 
			
		||||
    {
 | 
			
		||||
        ui->updateSettingsBox->setHidden(true);
 | 
			
		||||
    }
 | 
			
		||||
    // Analytics
 | 
			
		||||
    if(BuildConfig.ANALYTICS_ID.isEmpty())
 | 
			
		||||
    {
 | 
			
		||||
        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->analyticsTab));
 | 
			
		||||
    }
 | 
			
		||||
    connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
 | 
			
		||||
    connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 | 
			
		||||
 | 
			
		||||
@@ -321,12 +316,6 @@ void LauncherPage::applySettings()
 | 
			
		||||
        s->set("InstSortMode", "Name");
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Analytics
 | 
			
		||||
    if(!BuildConfig.ANALYTICS_ID.isEmpty())
 | 
			
		||||
    {
 | 
			
		||||
        s->set("Analytics", ui->analyticsCheck->isChecked());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
void LauncherPage::loadSettings()
 | 
			
		||||
{
 | 
			
		||||
@@ -422,12 +411,6 @@ void LauncherPage::loadSettings()
 | 
			
		||||
    {
 | 
			
		||||
        ui->sortByNameBtn->setChecked(true);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Analytics
 | 
			
		||||
    if(!BuildConfig.ANALYTICS_ID.isEmpty())
 | 
			
		||||
    {
 | 
			
		||||
        ui->analyticsCheck->setChecked(s->get("Analytics").toBool());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void LauncherPage::refreshFontPreview()
 | 
			
		||||
 
 | 
			
		||||
@@ -485,69 +485,6 @@
 | 
			
		||||
       </item>
 | 
			
		||||
      </layout>
 | 
			
		||||
     </widget>
 | 
			
		||||
     <widget class="QWidget" name="analyticsTab">
 | 
			
		||||
      <attribute name="title">
 | 
			
		||||
       <string>Analytics</string>
 | 
			
		||||
      </attribute>
 | 
			
		||||
      <layout class="QVBoxLayout" name="verticalLayout_8">
 | 
			
		||||
       <item>
 | 
			
		||||
        <widget class="QGroupBox" name="consoleSettingsBox_2">
 | 
			
		||||
         <property name="title">
 | 
			
		||||
          <string>Analytics Settings</string>
 | 
			
		||||
         </property>
 | 
			
		||||
         <layout class="QVBoxLayout" name="verticalLayout_4">
 | 
			
		||||
          <item>
 | 
			
		||||
           <widget class="QCheckBox" name="analyticsCheck">
 | 
			
		||||
            <property name="text">
 | 
			
		||||
             <string>Send anonymous usage statistics?</string>
 | 
			
		||||
            </property>
 | 
			
		||||
           </widget>
 | 
			
		||||
          </item>
 | 
			
		||||
          <item>
 | 
			
		||||
           <widget class="Line" name="line">
 | 
			
		||||
            <property name="orientation">
 | 
			
		||||
             <enum>Qt::Horizontal</enum>
 | 
			
		||||
            </property>
 | 
			
		||||
           </widget>
 | 
			
		||||
          </item>
 | 
			
		||||
          <item>
 | 
			
		||||
           <widget class="QLabel" name="label_5">
 | 
			
		||||
            <property name="text">
 | 
			
		||||
             <string><html><head/>
 | 
			
		||||
<body>
 | 
			
		||||
<p>The launcher sends anonymous usage statistics on every start of the application.</p><p>The following data is collected:</p>
 | 
			
		||||
<ul>
 | 
			
		||||
<li>Launcher version.</li>
 | 
			
		||||
<li>Operating system name, version and architecture.</li>
 | 
			
		||||
<li>CPU architecture (kernel architecture on linux).</li>
 | 
			
		||||
<li>Size of system memory.</li>
 | 
			
		||||
<li>Java version, architecture and memory settings.</li>
 | 
			
		||||
</ul>
 | 
			
		||||
</body></html></string>
 | 
			
		||||
            </property>
 | 
			
		||||
            <property name="wordWrap">
 | 
			
		||||
             <bool>true</bool>
 | 
			
		||||
            </property>
 | 
			
		||||
           </widget>
 | 
			
		||||
          </item>
 | 
			
		||||
         </layout>
 | 
			
		||||
        </widget>
 | 
			
		||||
       </item>
 | 
			
		||||
       <item>
 | 
			
		||||
        <spacer name="verticalSpacer">
 | 
			
		||||
         <property name="orientation">
 | 
			
		||||
          <enum>Qt::Vertical</enum>
 | 
			
		||||
         </property>
 | 
			
		||||
         <property name="sizeHint" stdset="0">
 | 
			
		||||
          <size>
 | 
			
		||||
           <width>20</width>
 | 
			
		||||
           <height>40</height>
 | 
			
		||||
          </size>
 | 
			
		||||
         </property>
 | 
			
		||||
        </spacer>
 | 
			
		||||
       </item>
 | 
			
		||||
      </layout>
 | 
			
		||||
     </widget>
 | 
			
		||||
    </widget>
 | 
			
		||||
   </item>
 | 
			
		||||
  </layout>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,63 +0,0 @@
 | 
			
		||||
#include "AnalyticsWizardPage.h"
 | 
			
		||||
#include <Application.h>
 | 
			
		||||
 | 
			
		||||
#include <QVBoxLayout>
 | 
			
		||||
#include <QTextBrowser>
 | 
			
		||||
#include <QCheckBox>
 | 
			
		||||
 | 
			
		||||
#include <ganalytics.h>
 | 
			
		||||
#include <BuildConfig.h>
 | 
			
		||||
 | 
			
		||||
AnalyticsWizardPage::AnalyticsWizardPage(QWidget *parent)
 | 
			
		||||
    : BaseWizardPage(parent)
 | 
			
		||||
{
 | 
			
		||||
    setObjectName(QStringLiteral("analyticsPage"));
 | 
			
		||||
    verticalLayout_3 = new QVBoxLayout(this);
 | 
			
		||||
    verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3"));
 | 
			
		||||
    textBrowser = new QTextBrowser(this);
 | 
			
		||||
    textBrowser->setObjectName(QStringLiteral("textBrowser"));
 | 
			
		||||
    textBrowser->setAcceptRichText(false);
 | 
			
		||||
    textBrowser->setOpenExternalLinks(true);
 | 
			
		||||
    verticalLayout_3->addWidget(textBrowser);
 | 
			
		||||
 | 
			
		||||
    checkBox = new QCheckBox(this);
 | 
			
		||||
    checkBox->setObjectName(QStringLiteral("checkBox"));
 | 
			
		||||
    checkBox->setChecked(true);
 | 
			
		||||
    verticalLayout_3->addWidget(checkBox);
 | 
			
		||||
    retranslate();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
AnalyticsWizardPage::~AnalyticsWizardPage()
 | 
			
		||||
{
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool AnalyticsWizardPage::validatePage()
 | 
			
		||||
{
 | 
			
		||||
    auto settings = APPLICATION->settings();
 | 
			
		||||
    auto analytics = APPLICATION->analytics();
 | 
			
		||||
    auto status = checkBox->isChecked();
 | 
			
		||||
    settings->set("AnalyticsSeen", analytics->version());
 | 
			
		||||
    settings->set("Analytics", status);
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void AnalyticsWizardPage::retranslate()
 | 
			
		||||
{
 | 
			
		||||
    setTitle(tr("Analytics"));
 | 
			
		||||
    setSubTitle(tr("We track some anonymous statistics about users."));
 | 
			
		||||
    textBrowser->setHtml(tr(
 | 
			
		||||
        "<html><body>"
 | 
			
		||||
        "<p>The launcher sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
 | 
			
		||||
        "<p>The data is processed by Google Analytics, see their <a href=\"https://support.google.com/analytics/answer/6004245?hl=en\">article on the "
 | 
			
		||||
        "matter</a>.</p>"
 | 
			
		||||
        "<p>The following data is collected:</p>"
 | 
			
		||||
        "<ul><li>A random unique ID of the installation.<br />It is stored in the application settings file.</li>"
 | 
			
		||||
        "<li>Anonymized (partial) IP address.</li>"
 | 
			
		||||
        "<li>Launcher version.</li>"
 | 
			
		||||
        "<li>Operating system name, version and architecture.</li>"
 | 
			
		||||
        "<li>CPU architecture (kernel architecture on linux).</li>"
 | 
			
		||||
        "<li>Size of system memory.</li>"
 | 
			
		||||
        "<li>Java version, architecture and memory settings.</li></ul>"
 | 
			
		||||
        "<p>If we change the tracked information, you will see this page again.</p></body></html>"));
 | 
			
		||||
    checkBox->setText(tr("Enable Analytics"));
 | 
			
		||||
}
 | 
			
		||||
@@ -1,25 +0,0 @@
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "BaseWizardPage.h"
 | 
			
		||||
 | 
			
		||||
class QVBoxLayout;
 | 
			
		||||
class QTextBrowser;
 | 
			
		||||
class QCheckBox;
 | 
			
		||||
 | 
			
		||||
class AnalyticsWizardPage : public BaseWizardPage
 | 
			
		||||
{
 | 
			
		||||
    Q_OBJECT
 | 
			
		||||
public:
 | 
			
		||||
    explicit AnalyticsWizardPage(QWidget *parent = Q_NULLPTR);
 | 
			
		||||
    virtual ~AnalyticsWizardPage();
 | 
			
		||||
 | 
			
		||||
    bool validatePage() override;
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
    void retranslate() override;
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    QVBoxLayout *verticalLayout_3 = nullptr;
 | 
			
		||||
    QTextBrowser *textBrowser = nullptr;
 | 
			
		||||
    QCheckBox *checkBox = nullptr;
 | 
			
		||||
};
 | 
			
		||||
@@ -2,12 +2,10 @@
 | 
			
		||||
 | 
			
		||||
#include "LanguageWizardPage.h"
 | 
			
		||||
#include "JavaWizardPage.h"
 | 
			
		||||
#include "AnalyticsWizardPage.h"
 | 
			
		||||
 | 
			
		||||
#include "translations/TranslationsModel.h"
 | 
			
		||||
#include <Application.h>
 | 
			
		||||
#include <FileSystem.h>
 | 
			
		||||
#include <ganalytics.h>
 | 
			
		||||
 | 
			
		||||
#include <QAbstractButton>
 | 
			
		||||
#include <BuildConfig.h>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user