Enable masking of cpid in privacy mode

gridcoin-community · Jan 1, 2022 · 0aeb54c · 0aeb54c
1 parent bd96a4e
commit 0aeb54c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
@@ -340,11 +340,12 @@ void OverviewPage::setPrivacy(bool privacy)
 
     ui->recentTransactionsNoResult->setVisible(m_privacy || !transaction_count);
     ui->listTransactions->setVisible(!m_privacy && transaction_count);
-    if (researcherModel) researcherModel->setMaskAccrualAndMagnitude(m_privacy);
+    if (researcherModel) researcherModel->setMaskCpidMagnitudeAccrual(m_privacy);
 
     LogPrint(BCLog::LogFlags::QT, "INFO: %s: m_privacy = %u", __func__, m_privacy);
 
     updateTransactions();
+    updateResearcherStatus();
     updatePendingAccrual();
 }
 

diff --git a/src/qt/researcher/researchermodel.cpp b/src/qt/researcher/researchermodel.cpp
@@ -207,7 +207,7 @@ void ResearcherModel::setTheme(const QString& theme_name)
     emit beaconChanged();
 }
 
-void ResearcherModel::setMaskAccrualAndMagnitude(bool privacy)
+void ResearcherModel::setMaskCpidMagnitudeAccrual(bool privacy)
 {
     m_privacy_enabled = privacy;
 
@@ -306,7 +306,13 @@ QString ResearcherModel::email() const
 
 QString ResearcherModel::formatCpid() const
 {
-    return QString::fromStdString(m_researcher->Id().ToString());
+    QString text = QString::fromStdString(m_researcher->Id().ToString());
+
+    if (m_privacy_enabled) {
+        text = text.replace(QRegExp("."), "#");
+    }
+
+    return text;
 }
 
 QString ResearcherModel::formatMagnitude() const
@@ -315,7 +321,7 @@ QString ResearcherModel::formatMagnitude() const
 
     if (outOfSync()) {
         text = "...";
-    } else if (m_privacy_enabled){
+    } else if (m_privacy_enabled) {
         text = "#";
     } else {
         text = QString::fromStdString(m_researcher->Magnitude().ToString());

diff --git a/src/qt/researcher/researchermodel.h b/src/qt/researcher/researchermodel.h
@@ -81,7 +81,7 @@ class ResearcherModel : public QObject
 
     void showWizard(WalletModel* wallet_model);
     void setTheme(const QString& theme_name);
-    void setMaskAccrualAndMagnitude(bool privacy);
+    void setMaskCpidMagnitudeAccrual(bool privacy);
 
     bool configuredForInvestorMode() const;
     bool outOfSync() const;