Merge pull request #659 from TeamPiped/reqwest-init

Initialize Reqwest in Constants to prevent circular dependency
TeamPiped · Jul 28, 2023 · d380f61 · d380f61
2 parents 82aa66e + ca6e7ce
commit d380f61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/me/kavin/piped/Main.java b/src/main/java/me/kavin/piped/Main.java
@@ -38,8 +38,6 @@ public static void main(String[] args) throws Exception {
  YoutubeStreamExtractor.forceFetchAndroidClient(true);
  YoutubeStreamExtractor.forceFetchIosClient(true);
 
- ReqwestUtils.init(Constants.REQWEST_PROXY);
-
  Sentry.init(options -> {
  options.setDsn(Constants.SENTRY_DSN);
  options.setRelease(Constants.VERSION);

diff --git a/src/main/java/me/kavin/piped/consts/Constants.java b/src/main/java/me/kavin/piped/consts/Constants.java
@@ -19,6 +19,7 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
+import rocks.kavin.reqwest4j.ReqwestUtils;
 
 import java.io.File;
 import java.io.FileReader;
@@ -130,6 +131,7 @@ public class Constants {
  PUBSUB_URL = getProperty(prop, "PUBSUB_URL", PUBLIC_URL);
  PUBSUB_HUB_URL = getProperty(prop, "PUBSUB_HUB_URL", "https://pubsubhubbub.appspot.com/subscribe");
  REQWEST_PROXY = getProperty(prop, "REQWEST_PROXY");
+ ReqwestUtils.init(REQWEST_PROXY);
  FRONTEND_URL = getProperty(prop, "FRONTEND_URL", "https://piped.video");
  COMPROMISED_PASSWORD_CHECK = Boolean.parseBoolean(getProperty(prop, "COMPROMISED_PASSWORD_CHECK", "true"));
  DISABLE_REGISTRATION = Boolean.parseBoolean(getProperty(prop, "DISABLE_REGISTRATION", "false"));