From 327ea680acce3337ced859f4f64aa3cd5855b316 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Fri, 25 Feb 2022 09:49:36 -0600
Subject: [PATCH] Clear sensitive dispute data based on dispute opening date.

Change recommended setting for sensitive data clearing to 60 days.
---
 .../src/main/java/bisq/core/support/dispute/DisputeManager.java | 2 +-
 core/src/main/java/bisq/core/user/Preferences.java              | 2 +-
 core/src/main/resources/i18n/displayStrings.properties          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java b/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
index f8f0824767b..88f6d3eea91 100644
--- a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
@@ -307,7 +307,7 @@ public void maybeClearSensitiveData() {
         Instant safeDate = closedTradableManager.getSafeDateForSensitiveDataClearing();
         getDisputeList().getList().stream()
                 .filter(e -> e.isClosed())
-                .filter(e -> e.getTradeDate().toInstant().isBefore(safeDate))
+                .filter(e -> e.getOpeningDate().toInstant().isBefore(safeDate))
                 .forEach(Dispute::maybeClearSensitiveData);
         requestPersistence();
     }
diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
index 1cff31f2e22..60ca565b695 100644
--- a/core/src/main/java/bisq/core/user/Preferences.java
+++ b/core/src/main/java/bisq/core/user/Preferences.java
@@ -146,7 +146,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
 
     public static final boolean USE_SYMMETRIC_SECURITY_DEPOSIT = true;
     public static final int CLEAR_DATA_AFTER_DAYS_INITIAL = 99999; // feature effectively disabled until user agrees to settings notification
-    public static final int CLEAR_DATA_AFTER_DAYS_DEFAULT = 20; // used when user has agreed to settings notification
+    public static final int CLEAR_DATA_AFTER_DAYS_DEFAULT = 60; // used when user has agreed to settings notification
 
     // payload is initialized so the default values are available for Property initialization.
     @Setter
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 35ccc6d7f38..df159717b34 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -1392,7 +1392,7 @@ settings.preferences.sensitiveDataRemoval.msg=To protect the privacy of yourself
   remove payment account details from old trades.  This is particularly important for fiat trades which may include bank \
   account details.  Read more about this at [HYPERLINK:https://bisq.wiki/Data_Privacy].\n\n\
   The threshold for data removal can be configured on this screen via the field "Clear sensitive data after (days)".  \
-  It is recommended to set it as low as possible, for example 20 days.  That means trades from more than 20 \
+  It is recommended to set it as low as possible, for example 60 days.  That means trades from more than 60 \
   days ago will have payment account details cleared, as long as they are finished.  Finished trades are ones which \
   are found in the Portfolio / History tab.