From 5989473c8a9bd2c09134e46a262878ef8b286ad3 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 25 Sep 2022 12:06:14 +0100
Subject: [PATCH] Revert "Allow duplicate variations of each OnlineAccountData
 in the import queue, but don't allow two entries that match exactly."

This reverts commit 6d9e6e8d4c89582ffad23c1094b6a8e3aee91116.
---
 .../controller/OnlineAccountsManager.java     | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/qortal/controller/OnlineAccountsManager.java b/src/main/java/org/qortal/controller/OnlineAccountsManager.java
index 40192876..47d8cf1b 100644
--- a/src/main/java/org/qortal/controller/OnlineAccountsManager.java
+++ b/src/main/java/org/qortal/controller/OnlineAccountsManager.java
@@ -71,7 +71,7 @@ public class OnlineAccountsManager {
     private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(4, new NamedThreadFactory("OnlineAccounts"));
     private volatile boolean isStopping = false;
 
-    private final List<OnlineAccountData> onlineAccountsImportQueue = Collections.synchronizedList(new ArrayList<>());
+    private final Set<OnlineAccountData> onlineAccountsImportQueue = ConcurrentHashMap.newKeySet();
 
     /**
      * Cache of 'current' online accounts, keyed by timestamp
@@ -191,12 +191,9 @@ public class OnlineAccountsManager {
 
         LOGGER.debug("Processing online accounts import queue (size: {})", this.onlineAccountsImportQueue.size());
 
-        // Take a copy of onlineAccountsImportQueue so we can safely remove whilst iterating
-        List<OnlineAccountData> onlineAccountsImportQueueCopy = new ArrayList<>(this.onlineAccountsImportQueue);
-
         Set<OnlineAccountData> onlineAccountsToAdd = new HashSet<>();
         try (final Repository repository = RepositoryManager.getRepository()) {
-            for (OnlineAccountData onlineAccountData : onlineAccountsImportQueueCopy) {
+            for (OnlineAccountData onlineAccountData : this.onlineAccountsImportQueue) {
                 if (isStopping)
                     return;
 
@@ -220,19 +217,6 @@ public class OnlineAccountsManager {
         }
     }
 
-    private boolean importQueueContainsExactMatch(OnlineAccountData acc) {
-        // Check if an item exists where all properties match exactly
-        // This is needed because signature and nonce are not compared in OnlineAccountData.equals()
-        synchronized (onlineAccountsImportQueue) {
-            return onlineAccountsImportQueue.stream().anyMatch(otherAcc ->
-                    acc.getTimestamp() == otherAcc.getTimestamp() &&
-                            Arrays.equals(acc.getPublicKey(), otherAcc.getPublicKey()) &&
-                            acc.getNonce() == otherAcc.getNonce() &&
-                            Arrays.equals(acc.getSignature(), otherAcc.getSignature())
-            );
-        }
-    }
-
     /**
      * Check if supplied onlineAccountData is superior (i.e. has a nonce value) than existing record.
      * Two entries are considered equal even if the nonce differs, to prevent multiple variations
@@ -855,10 +839,6 @@ public class OnlineAccountsManager {
                 // We have already validated this online account
                 continue;
 
-            if (this.importQueueContainsExactMatch(onlineAccountData))
-                // Identical online account data already present in queue
-                continue;
-
             boolean isNewEntry = onlineAccountsImportQueue.add(onlineAccountData);
 
             if (isNewEntry)