From 869175bc065f7608ca18b193881b4c8b7e28819a Mon Sep 17 00:00:00 2001 From: Adam Treat Date: Sat, 29 Apr 2023 11:05:44 -0400 Subject: [PATCH] Send optout for real and only once. --- network.cpp | 6 +++--- network.h | 2 +- qml/StartupDialog.qml | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/network.cpp b/network.cpp index e613fa36..e3544890 100644 --- a/network.cpp +++ b/network.cpp @@ -178,7 +178,7 @@ void Network::sendOptOut() QJsonDocument doc; doc.setArray(array); - sendMixpanel(doc.toJson()); + sendMixpanel(doc.toJson(), true /*isOptOut*/); #if defined(DEBUG) printf("%s %s\n", qPrintable("opt_out"), qPrintable(doc.toJson(QJsonDocument::Indented))); @@ -272,9 +272,9 @@ void Network::sendIpify() connect(reply, &QNetworkReply::finished, this, &Network::handleIpifyFinished); } -void Network::sendMixpanel(const QByteArray &json) +void Network::sendMixpanel(const QByteArray &json, bool isOptOut) { - if (!m_usageStatsActive) + if (!m_usageStatsActive && !isOptOut) return; QUrl trackUrl("https://api.mixpanel.com/track"); diff --git a/network.h b/network.h index f57c0a3d..70728640 100644 --- a/network.h +++ b/network.h @@ -47,7 +47,7 @@ private: void sendHealth(); void sendIpify(); void sendMixpanelEvent(const QString &event); - void sendMixpanel(const QByteArray &json); + void sendMixpanel(const QByteArray &json, bool isOptOut = false); bool packageAndSendJson(const QString &ingestId, const QString &json); private: diff --git a/qml/StartupDialog.qml b/qml/StartupDialog.qml index 0b26487f..18b4ab2a 100644 --- a/qml/StartupDialog.qml +++ b/qml/StartupDialog.qml @@ -21,14 +21,6 @@ Dialog { id: theme } - Connections { - target: startupDialog - function onClosed() { - if (!Network.usageStatsActive) - Network.usageStatsActive = false // opt-out triggered - } - } - Column { id: column spacing: 20