Allow deleting previously broadcast alerts

zathras-crypto · zathras-crypto · commit 49be32d05db0 · 2015-10-08T20:42:31.000+11:00
diff --git a/src/omnicore/notifications.cpp b/src/omnicore/notifications.cpp
@@ -23,6 +23,26 @@ namespace mastercore
 //! Vector of currently active Omni alerts
 std::vector<AlertData> currentOmniAlerts;
 
+/**
+ * Deletes previously broadcast alerts from sender from the alerts vector
+ *
+ * Note cannot be used to delete alerts from other addresses, nor to delete system generated feature alerts
+ */
+void DeleteAlerts(const std::string& sender)
+{
+    for (std::vector<AlertData>::iterator it = currentOmniAlerts.begin(); it != currentOmniAlerts.end(); ) {
+        AlertData alert = *it;
+        if (sender == alert.alert_sender) {
+            PrintToLog("Removing deleted alert (from:%s type:%d expiry:%d message:%s)\n", alert.alert_sender,
+                alert.alert_type, alert.alert_expiry, alert.alert_message);
+            it = currentOmniAlerts.erase(it);
+            uiInterface.OmniStateChanged();
+        } else {
+            it++;
+        }
+    }
+}
+
 /**
  * Adds a new alert to the alerts vector
  *
diff --git a/src/omnicore/notifications.h b/src/omnicore/notifications.h
@@ -24,6 +24,9 @@ struct AlertData
 /** Determines whether the sender is an authorized source for Omni Core alerts. */
 bool CheckAlertAuthorization(const std::string& sender);
 
+/** Deletes previously broadcast alerts from the sender. */
+void DeleteAlerts(const std::string& sender);
+
 /** Adds a new alert to the alerts vector. */
 void AddAlert(const std::string& sender, uint16_t alertType, uint32_t alertExpiry, const std::string& alertMessage);
 
diff --git a/src/omnicore/tx.cpp b/src/omnicore/tx.cpp
@@ -1933,8 +1933,11 @@ int CMPTransaction::logicMath_Alert()
         return (PKT_ERROR -51);
     }
 
-    // add the alert
-    AddAlert(sender, alert_type, alert_expiry, alert_text);
+    if (alert_type == 65535) { // set alert type to FFFF to clear previously sent alerts
+        DeleteAlerts(sender);
+    } else {
+        AddAlert(sender, alert_type, alert_expiry, alert_text);
+    }
 
     // we have a new alert, fire a notify event if needed
     CAlert::Notify(alert_text, true);
