From 1f3d400ad64bac1955fc88bd75274de312f4735d Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 13 Nov 2021 13:47:29 +0000
Subject: [PATCH] Small refactor of previous commit's code to improve
 consistency.

---
 src/main/java/org/qortal/list/ResourceList.java   | 15 +++++++--------
 .../java/org/qortal/list/ResourceListManager.java |  6 +-----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/qortal/list/ResourceList.java b/src/main/java/org/qortal/list/ResourceList.java
index 65375481..0550a2ff 100644
--- a/src/main/java/org/qortal/list/ResourceList.java
+++ b/src/main/java/org/qortal/list/ResourceList.java
@@ -103,7 +103,7 @@ public class ResourceList {
         if (resource == null || this.list == null) {
             return;
         }
-        if (!this.contains(resource)) {
+        if (!this.contains(resource, true)) {
             this.list.add(resource);
         }
     }
@@ -115,18 +115,17 @@ public class ResourceList {
         this.list.remove(resource);
     }
 
-    public boolean contains(String resource) {
+    public boolean contains(String resource, boolean caseSensitive) {
         if (resource == null || this.list == null) {
             return false;
         }
-        return this.list.contains(resource);
-    }
 
-    public boolean containsCaseInsensitive(String resource) {
-        if (resource == null || this.list == null) {
-            return false;
+        if (caseSensitive) {
+            return this.list.contains(resource);
+        }
+        else {
+            return this.list.stream().anyMatch(resource::equalsIgnoreCase);
         }
-        return this.list.stream().anyMatch(resource::equalsIgnoreCase);
     }
 
 
diff --git a/src/main/java/org/qortal/list/ResourceListManager.java b/src/main/java/org/qortal/list/ResourceListManager.java
index 5ab342fd..921105e9 100644
--- a/src/main/java/org/qortal/list/ResourceListManager.java
+++ b/src/main/java/org/qortal/list/ResourceListManager.java
@@ -92,11 +92,7 @@ public class ResourceListManager {
         if (list == null) {
             return false;
         }
-
-        if (caseSensitive) {
-            return list.contains(item);
-        }
-        return list.containsCaseInsensitive(item);
+        return list.contains(item, caseSensitive);
     }
 
     public void saveList(String category, String resourceName) {