diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java index 6f68d65a..a7e47996 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java @@ -35,6 +35,7 @@ public class BongaCamsElectronLoginDialog { config.put("url", site.getBaseUrl() + "/login"); config.put("w", 640); config.put("h", 480); + config.put("userAgent", site.getHttpClient().getEffectiveUserAgent()); var msg = new JSONObject(); msg.put("config", config); browser.run(msg, msgHandler); diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java index 746eefd3..cca27c07 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java @@ -20,6 +20,7 @@ import okhttp3.HttpUrl; public class Cam4ElectronLoginDialog { public static final String DOMAIN = "cam4.com"; public static final String URL = Cam4.BASE_URI; + private Cam4 site; private CookieJar cookieJar; private ExternalBrowser browser; @@ -27,7 +28,8 @@ public class Cam4ElectronLoginDialog { private boolean loginDialogOpened = false; private Thread loginChecker; - public Cam4ElectronLoginDialog(CookieJar cookieJar) throws IOException { + public Cam4ElectronLoginDialog(Cam4 site, CookieJar cookieJar) throws IOException { + this.site = site; this.cookieJar = cookieJar; browser = ExternalBrowser.getInstance(); try { @@ -35,6 +37,7 @@ public class Cam4ElectronLoginDialog { config.put("url", URL); config.put("w", 480); config.put("h", 640); + config.put("userAgent", site.getHttpClient().getEffectiveUserAgent()); var msg = new JSONObject(); msg.put("config", config); browser.run(msg, msgHandler); diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java index 1cc38389..fc97aa7b 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java @@ -44,7 +44,7 @@ public class Cam4SiteUi extends AbstractSiteUi { } else { // login with external browser try { - new Cam4ElectronLoginDialog(cam4.getHttpClient().getCookieJar()); + new Cam4ElectronLoginDialog(cam4, cam4.getHttpClient().getCookieJar()); } catch (Exception e1) { log.error("Error logging in with external browser", e1); Dialogs.showError("Login error", "Couldn't login to " + cam4.getName(), e1); diff --git a/client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java index 4cd3a12d..5f0c097e 100644 --- a/client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java @@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.util.Collections; import java.util.function.Consumer; - import org.json.JSONObject; import ctbrec.Config; import ctbrec.sites.showup.Showup; @@ -19,11 +18,13 @@ import okhttp3.HttpUrl; public class ShowupElectronLoginDialog { public static final String DOMAIN = "showup.tv"; public static final String URL = Showup.BASE_URL; + private Showup site; private CookieJar cookieJar; private ExternalBrowser browser; private boolean firstCall = true; - public ShowupElectronLoginDialog(CookieJar cookieJar) throws IOException { + public ShowupElectronLoginDialog(Showup site, CookieJar cookieJar) throws IOException { + this.site = site; this.cookieJar = cookieJar; browser = ExternalBrowser.getInstance(); try { @@ -31,7 +32,7 @@ public class ShowupElectronLoginDialog { config.put("url", URL); config.put("w", 640); config.put("h", 480); - config.put("userAgent", Config.getInstance().getSettings().httpUserAgent); + config.put("userAgent", site.getHttpClient().getEffectiveUserAgent()); var msg = new JSONObject(); msg.put("config", config); browser.run(msg, msgHandler); diff --git a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java index 58352024..3f08b2c6 100644 --- a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java @@ -44,7 +44,7 @@ public class ShowupSiteUi extends AbstractSiteUi { } else { // login with external browser window try { - new ShowupElectronLoginDialog(site.getHttpClient().getCookieJar()); + new ShowupElectronLoginDialog(site, site.getHttpClient().getCookieJar()); } catch (Exception e1) { log.error("Error logging in with external browser", e1); Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1); diff --git a/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java index 3d1a01c1..ef6e9674 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java @@ -18,17 +18,19 @@ import java.util.function.Consumer; public class StreamrayElectronLoginDialog { public static final String DOMAIN = "streamray.com"; + private Streamray site; private CookieJar cookieJar; - public StreamrayElectronLoginDialog(CookieJar cookieJar) throws IOException { + public StreamrayElectronLoginDialog(Streamray site, CookieJar cookieJar) throws IOException { + this.site = site; this.cookieJar = cookieJar; try (ExternalBrowser browser = ExternalBrowser.getInstance()) { var config = new JSONObject(); config.put("url", Streamray.BASE_URI); config.put("w", 800); config.put("h", 600); - config.put("userAgent", Config.getInstance().getSettings().httpUserAgent); + config.put("userAgent", site.getHttpClient().getEffectiveUserAgent()); var msg = new JSONObject(); msg.put("config", config); browser.run(msg, msgHandler); diff --git a/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java b/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java index 2265564a..8ad3410a 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java +++ b/client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java @@ -31,7 +31,7 @@ public class StreamrayFavoritesTab extends ThumbOverviewTab implements FollowedT loginButton.setPadding(new Insets(20)); loginButton.setOnAction(e -> { try { - new StreamrayElectronLoginDialog(site.getHttpClient().getCookieJar()); + new StreamrayElectronLoginDialog(site, site.getHttpClient().getCookieJar()); queue.clear(); updateService.restart(); } catch (Exception ex) { diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java index 1a896b15..774eb3ef 100644 --- a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java @@ -18,10 +18,12 @@ import java.util.function.Consumer; public class StripchatElectronLoginDialog { public static final String DOMAIN = Stripchat.getDomain(); public static final String URL = Stripchat.getBaseUri(); + private Stripchat site; private CookieJar cookieJar; private ExternalBrowser browser; - public StripchatElectronLoginDialog(CookieJar cookieJar) throws IOException { + public StripchatElectronLoginDialog(Stripchat site, CookieJar cookieJar) throws IOException { + this.site = site; this.cookieJar = cookieJar; browser = ExternalBrowser.getInstance(); try { @@ -29,6 +31,7 @@ public class StripchatElectronLoginDialog { config.put("url", URL); config.put("w", 640); config.put("h", 640); + config.put("userAgent", site.getHttpClient().getEffectiveUserAgent()); var msg = new JSONObject(); msg.put("config", config); browser.run(msg, msgHandler); diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java index 002692d8..8b1f108a 100644 --- a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java @@ -45,7 +45,7 @@ public class StripchatSiteUi extends AbstractSiteUi { } else { // login with external browser try { - new StripchatElectronLoginDialog(site.getHttpClient().getCookieJar()); + new StripchatElectronLoginDialog(site, site.getHttpClient().getCookieJar()); } catch (Exception e1) { log.error("Error logging in with external browser", e1); Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);