Do not show feedback dialog if telemetry is disabled

QmlDesignerUsageEventSource is active even if telemetry is disabled.
Therefore we have to explcitly check this.
Removing some leftovers.

Task-number: QDS-8824
Change-Id: Ic623b83bbabf1e066f2f2eceb92a2c2466475677
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

3 files changed, 12 insertions, 17 deletions

diff --git a/src/datasources/qmldesignerusageeventsource.cpp b/src/datasources/qmldesignerusageeventsource.cpp
index e411111..fd24845 100644
--- a/src/datasources/qmldesignerusageeventsource.cpp
+++ b/src/datasources/qmldesignerusageeventsource.cpp
@@ -55,7 +55,7 @@ const char qmlDesignerFeedbackTextKey[] = "qmlDesignerFeedbackTextKey";
 const char qmlDesignerFeedbackRatingKey[] = "qmlDesignerFeedbackRatingKey";
 const char qmlDesignerFeedbackPoppedKey[] = "qmlDesignerFeedbackPoppedKey";
 
-QmlDesignerUsageEventSource::QmlDesignerUsageEventSource()
+QmlDesignerUsageEventSource::QmlDesignerUsageEventSource(bool enabled)
     : KUserFeedback::AbstractDataSource("qmlDesignerUsageEvents", Provider::DetailedUsageStatistics)
 {
     const auto plugins = ExtensionSystem::PluginManager::plugins();
@@ -82,6 +82,7 @@ QmlDesignerUsageEventSource::QmlDesignerUsageEventSource()
                 qmlDesignerPlugin,
                 SLOT(lauchFeedbackPopup(QString)));
     }
+    m_enabled = enabled;
 }
 
 QString QmlDesignerUsageEventSource::name() const
@@ -94,11 +95,6 @@ QString QmlDesignerUsageEventSource::description() const
     return tr("What views and actions are used in QML Design mode.");
 }
 
-void QmlDesignerUsageEventSource::closeFeedbackPopup()
-{
-    m_feedbackWidget->deleteLater();
-}
-
 void QmlDesignerUsageEventSource::insertFeedback(const QString &identifier,
                                                  const QString &feedback,
                                                  int rating)
@@ -121,14 +117,13 @@ void QmlDesignerUsageEventSource::handleUsageStatisticsNotifier(const QString &i
 
 void QmlDesignerUsageEventSource::handleUsageStatisticsUsageTimer(const QString &identifier, int elapsed)
 {
-
     auto it = m_timeData.find(identifier);
 
     if (it != m_timeData.end()) {
         it.value() = it.value().toInt() + elapsed;
 
         static const int timeLimit = 14400000; // 4 hours
-        if (!m_feedbackPoppedData[identifier].toBool()
+        if (m_enabled && !m_feedbackPoppedData[identifier].toBool()
             && m_timeData.value(identifier).toInt() >= timeLimit) {
             emit launchPopup(identifier);
             m_feedbackPoppedData[identifier] = QVariant(true);
diff --git a/src/datasources/qmldesignerusageeventsource.h b/src/datasources/qmldesignerusageeventsource.h
index 5003175..7e7376d 100644
--- a/src/datasources/qmldesignerusageeventsource.h
+++ b/src/datasources/qmldesignerusageeventsource.h
@@ -38,7 +38,7 @@ class QmlDesignerUsageEventSource : public QObject, public KUserFeedback::Abstra
     Q_OBJECT
 
 public:
-    QmlDesignerUsageEventSource();
+    QmlDesignerUsageEventSource(bool enabled);
 
 public:
     QString name() const override;
@@ -58,7 +58,6 @@ public slots:
     void handleUsageStatisticsNotifier(const QString &identifier);
     void handleUsageStatisticsUsageTimer(const QString &identifier, int elapsed);
     void insertFeedback(const QString &identifier, const QString &feedback, int rating);
-    void closeFeedbackPopup();
 
 private:
     QMap<QString, QVariant> m_eventData;
@@ -68,7 +67,8 @@ private:
     QHash<QString, QVariant> m_feedbackTextData;
     QHash<QString, QVariant> m_feedbackRatingData;
     QHash<QString, QVariant> m_feedbackPoppedData;
-    QPointer<QQuickWidget> m_feedbackWidget;
+
+    bool m_enabled = false;
 };
 
 } // namespace Internal
diff --git a/src/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp
index aa8ce90..31c8423 100644
--- a/src/usagestatisticplugin.cpp
+++ b/src/usagestatisticplugin.cpp
@@ -73,6 +73,11 @@ UsageStatisticPlugin::UsageStatisticPlugin() = default;
 
 UsageStatisticPlugin::~UsageStatisticPlugin() = default;
 
+static bool telemetryLevelNotSet(const KUserFeedback::Provider &provider)
+{
+    return provider.telemetryMode() == KUserFeedback::Provider::NoTelemetry;
+}
+
 bool UsageStatisticPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
     Q_UNUSED(arguments)
@@ -111,7 +116,7 @@ static void addQtCreatorDataSources(KUserFeedback::Provider &provider)
     provider.addDataSource(new ExamplesDataSource);
     provider.addDataSource(new KitSource);
     provider.addDataSource(new QmlDesignerUsageTimeSource);
-    provider.addDataSource(new QmlDesignerUsageEventSource);
+    provider.addDataSource(new QmlDesignerUsageEventSource(!telemetryLevelNotSet(provider)));
 }
 
 static void addServiceDataSource(const std::shared_ptr<KUserFeedback::Provider> &provider)
@@ -204,11 +209,6 @@ static bool runFirstTime(const KUserFeedback::Provider &provider)
     return false;
 }
 
-static bool telemetryLevelNotSet(const KUserFeedback::Provider &provider)
-{
-    return provider.telemetryMode() == KUserFeedback::Provider::NoTelemetry;
-}
-
 void UsageStatisticPlugin::showFirstTimeMessage()
 {
     if (m_provider && runFirstTime(*m_provider) && telemetryLevelNotSet(*m_provider)) {