diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt index 0e9b29ab..da10e2ec 100644 --- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt +++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt @@ -38,7 +38,7 @@ class JSHttpClient : ManagedHttpClient { constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super( //Temporary ugly solution for DevPortal proxy support - (if(jsClient?.config?.id == StateDeveloper.DEV_ID && StateDeveloper.instance.devProxy != null) + (if((jsClient?.config?.id == StateDeveloper.DEV_ID || jsClient == null) && StateDeveloper.instance.devProxy != null) OkHttpClient.Builder().proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(StateDeveloper.instance.devProxy!!.url, StateDeveloper.instance.devProxy!!.port) )) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index ee835a3e..0789b904 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -2688,7 +2688,7 @@ class VideoDetailView : ConstraintLayout { } if(!didLogin) UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, "Failed to login"); - })); + }, UIDialogs.ActionStyle.PRIMARY)); } .exception { Logger.w(TAG, "exception", it) diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 35b56d38..dda3c6c7 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 35b56d380a9ae6ef85ba8ec16cecb0a86d4efa1d +Subproject commit dda3c6c71948be5e40b1704895eacf796753e953