From 599ee3dfabaef86a6a12a8a988a0ad6e961bd6ce Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 13 Jul 2022 17:26:29 +0300 Subject: [PATCH] VideoDownloader fix --- .../java/ru/vtosters/lite/downloaders/VideoDownloader.java | 5 ++--- .../java/ru/vtosters/lite/utils/ExternalLinkHandler.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index 5c2c4e1ee..303037d27 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -40,7 +40,7 @@ public class VideoDownloader{ downloadVideo(video, ctx); return true; } else if (id == OPEN_EXTERNAL_LINK_ID) { - ExternalLinkHandler.parseVideoFile(video, ctx); + ExternalLinkHandler.parseVideoFile(video, ctx, true); } return false; } @@ -48,8 +48,7 @@ public class VideoDownloader{ public static void injectAction(ArrayList list, VideoFile video){ if (!video.U && !video.I1()) { addAction(list, DOWNLOAD_ID, R.drawable.ic_download_outline_24, R.string.download, 9); - if (Preferences.isEnableExternalOpening()) - addAction(list, OPEN_EXTERNAL_LINK_ID, R.drawable.ic_link_outline_28, getIdentifier("interfacevideoext", "string"), 9); + addAction(list, OPEN_EXTERNAL_LINK_ID, R.drawable.ic_link_outline_28, getIdentifier("interfacevideoext", "string"), 9); } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java index f786cc963..00530f8df 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java @@ -31,10 +31,10 @@ public class ExternalLinkHandler{ private static final Map qualities = new HashMap<>(); public static boolean parseVideoFile(VideoFile file) { - return parseVideoFile(file, getContext()); + return parseVideoFile(file, getContext(), isEnableExternalOpening()); } - public static boolean parseVideoFile(VideoFile file, Context context) { + public static boolean parseVideoFile(VideoFile file, Context context, Boolean isEnabled) { if (checkYoutubeLink(file)) { try { Intent intent = new Intent(Intent.ACTION_VIEW); @@ -47,7 +47,7 @@ public class ExternalLinkHandler{ } } - if (!isEnableExternalOpening()) return false; + if (!isEnabled) return false; if (checkVkVideo(file)) { if (qualities.size() == 1) {