Change HashSet to ArrayList

This commit is contained in:
jafea7 2025-04-18 15:49:09 +10:00
parent a8936ed5c6
commit da8320b5c2
13 changed files with 55 additions and 27 deletions

View File

@ -150,11 +150,13 @@ public class BongaCamsConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.bongaTabs.add(tab);
if (!settings.bongaTabs.contains(tab)) {
settings.bongaTabs.add(tab);
}
} else {
settings.bongaTabs.remove(tab);
}
save();
save();
}
private List<String> getEnabledTabs() {

View File

@ -13,7 +13,9 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
// import java.net.URL;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collections;
import java.util.Objects;
import java.util.function.Consumer;
@ -110,13 +112,17 @@ public class BongaCamsElectronLoginDialog {
}
try {
if (Objects.equals(new URL(url).getPath(), "/")) {
URI uri = new URI(url);
if (Objects.equals(uri.getPath(), "/")) {
browser.close();
}
} catch (MalformedURLException e) {
LOG.error("Couldn't parse new url {}", url, e);
} catch (IOException e) {
LOG.error("Couldn't send shutdown request to external browser", e);
} catch (URISyntaxException e) {
LOG.error("Invalid URL: " + url);
}
}
}

View File

@ -142,7 +142,9 @@ public class Cam4ConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.cam4Tabs.add(tab);
if (!settings.cam4Tabs.contains(tab)) {
settings.cam4Tabs.add(tab);
}
} else {
settings.cam4Tabs.remove(tab);
}

View File

@ -143,7 +143,9 @@ public class CamsodaConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.camsodaTabs.add(tab);
if (!settings.camsodaTabs.contains(tab)) {
settings.camsodaTabs.add(tab);
}
} else {
settings.camsodaTabs.remove(tab);
}

View File

@ -215,12 +215,14 @@ public class ChaturbateConfigUi extends AbstractConfigUI {
return layout;
}
private void toggleTab(String region, boolean selected) {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.chaturbateTabs.add(region);
if (!settings.chaturbateTabs.contains(tab)) {
settings.chaturbateTabs.add(tab);
}
} else {
settings.chaturbateTabs.remove(region);
settings.chaturbateTabs.remove(tab);
}
save();
}

View File

@ -99,7 +99,9 @@ public class DreamcamConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.dreamcamTabs.add(tab);
if (!settings.dreamcamTabs.contains(tab)) {
settings.dreamcamTabs.add(tab);
}
} else {
settings.dreamcamTabs.remove(tab);
}

View File

@ -132,7 +132,9 @@ public class Flirt4FreeConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.flirt4freeTabs.add(tab);
if (!settings.flirt4freeTabs.contains(tab)) {
settings.flirt4freeTabs.add(tab);
}
} else {
settings.flirt4freeTabs.remove(tab);
}

View File

@ -121,7 +121,9 @@ public class ShowupConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.showupTabs.add(tab);
if (!settings.showupTabs.contains(tab)) {
settings.showupTabs.add(tab);
}
} else {
settings.showupTabs.remove(tab);
}

View File

@ -138,7 +138,9 @@ public class StreamateConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.streamateTabs.add(tab);
if (!settings.streamateTabs.contains(tab)) {
settings.streamateTabs.add(tab);
}
} else {
settings.streamateTabs.remove(tab);
}

View File

@ -96,7 +96,9 @@ public class StreamrayConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.streamrayTabs.add(tab);
if (!settings.streamrayTabs.contains(tab)) {
settings.streamrayTabs.add(tab);
}
} else {
settings.streamrayTabs.remove(tab);
}

View File

@ -211,7 +211,9 @@ public class StripchatConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.stripchatTabs.add(tab);
if (!settings.stripchatTabs.contains(tab)) {
settings.stripchatTabs.add(tab);
}
} else {
settings.stripchatTabs.remove(tab);
}

View File

@ -147,7 +147,9 @@ public class XloveCamConfigUI extends AbstractConfigUI {
private void toggleTab(String tab, boolean selected) {
var settings = Config.getInstance().getSettings();
if (selected) {
settings.xlovecamTabs.add(tab);
if (!settings.xlovecamTabs.contains(tab)) {
settings.xlovecamTabs.add(tab);
}
} else {
settings.xlovecamTabs.remove(tab);
}

View File

@ -53,20 +53,20 @@ public class Settings {
public String bongacamsBaseUrl = "https://bongacams.com";
public String bongaPassword = "";
public String bongaUsername = "";
public Set<String> bongaTabs = new HashSet<>(Arrays.asList("female"));
public List<String> bongaTabs = new ArrayList<>(Arrays.asList("female"));
public String cam4Password = "";
public String cam4Username = "";
public Set<String> cam4Tabs = new HashSet<>(Arrays.asList("female"));
public List<String> cam4Tabs = new ArrayList<>(Arrays.asList("female"));
public String camsodaPassword = "";
public String camsodaUsername = "";
public Set<String> camsodaTabs = new HashSet<>(Arrays.asList("f"));
public List<String> camsodaTabs = new ArrayList<>(Arrays.asList("f"));
public String chaturbatePassword = "";
public String chaturbateUsername = "";
public String chaturbateBaseUrl = "https://chaturbate.com";
@Deprecated
public boolean chaturbateUseFlaresolverr = false;
public int chaturbateMsBetweenRequests = 3000;
public Set<String> chaturbateTabs = new HashSet<>(Arrays.asList("f"));
public List<String> chaturbateTabs = new ArrayList<>(Arrays.asList("f"));
public boolean chooseStreamQuality = false;
public String colorAccent = "#FFFFFF";
public String colorBase = "#FFFFFF";
@ -79,7 +79,7 @@ public class Settings {
public boolean determineResolution = false;
public List<String> disabledSites = new ArrayList<>(Arrays.asList("Streamray", "WinkTv"));
public String downloadFilename = "$sanitize(${modelName})_$format(${localDateTime})";
public Set<String> dreamcamTabs = new HashSet<>(Arrays.asList("girls"));
public List<String> dreamcamTabs = new ArrayList<>(Arrays.asList("girls"));
public List<EventHandlerConfiguration> eventHandlers = new ArrayList<>();
public boolean eventsSuspended = false;
public boolean fastScrollSpeed = true;
@ -89,7 +89,7 @@ public class Settings {
public String ffmpegFileSuffix = "ts";
public String flirt4freePassword;
public String flirt4freeUsername;
public Set<String> flirt4freeTabs = new HashSet<>(Arrays.asList("female"));
public List<String> flirt4freeTabs = new ArrayList<>(Arrays.asList("female"));
public String fontFamily = "Sans-Serif";
public int fontSize = 14;
public String hlsdlExecutable = "hlsdl";
@ -186,7 +186,7 @@ public class Settings {
public boolean showPlayerStarting = false;
public String showupUsername = "";
public String showupPassword = "";
public Set<String> showupTabs = new HashSet<>(Arrays.asList("female"));
public List<String> showupTabs = new ArrayList<>(Arrays.asList("female"));
public boolean singlePlayer = true;
@Deprecated
public int splitRecordings = 0;
@ -197,11 +197,11 @@ public class Settings {
public boolean startMinimized = false;
public String streamatePassword = "";
public String streamateUsername = "";
public Set<String> streamateTabs = new HashSet<>(Arrays.asList("f,ff"));
public Set<String> streamrayTabs = new HashSet<>(Arrays.asList("F"));
public List<String> streamateTabs = new ArrayList<>(Arrays.asList("f,ff"));
public List<String> streamrayTabs = new ArrayList<>(Arrays.asList("F"));
public String stripchatUsername = "";
public String stripchatPassword = "";
public Set<String> stripchatTabs = new HashSet<>(Arrays.asList("girls"));
public List<String> stripchatTabs = new ArrayList<>(Arrays.asList("girls"));
public boolean stripchatUseXhamster = false;
public boolean stripchatUseSuperchat = false;
public List<String> tabOrder = new ArrayList<>();
@ -225,7 +225,7 @@ public class Settings {
public String webinterfacePassword = "sucks";
public String xlovecamUsername = "";
public String xlovecamPassword = "";
public Set<String> xlovecamTabs = new HashSet<>(Arrays.asList("1"));
public List<String> xlovecamTabs = new ArrayList<>(Arrays.asList("1"));
public boolean stripchatVR = true;
public boolean streamrayRecordGoalShows = false;
public int thumbCacheSize = 16;