From eb21d3d11cf6ddc046c2192d1c315d79f9efce42 Mon Sep 17 00:00:00 2001 From: Vologhat <47892605+Vologhat@users.noreply.github.com> Date: Sun, 17 Jul 2022 21:59:42 +0300 Subject: [PATCH] fix external player crash in vkplayer --- .../java/ru/vtosters/lite/utils/ExternalLinkHandler.java | 5 +++++ .../attachments/comments/VideoThumbnailHolder.smali | 2 +- .../vtosters/lite/ui/holder/video/VideoSimpleHolder.smali | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) 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 c817ca919..8cbf5b8fd 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java @@ -4,6 +4,7 @@ import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.isEmpty; import static ru.vtosters.lite.utils.Preferences.isEnableExternalOpening; +import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.Intent; @@ -33,6 +34,10 @@ public class ExternalLinkHandler{ return parseVideoFile(file, getContext(), isEnableExternalOpening()); } + public static boolean parseVideoFile(VideoFile file, Activity activity) { + return parseVideoFile(file, activity, isEnableExternalOpening()); + } + public static boolean parseVideoFile(VideoFile file, Context context, Boolean isEnabled) { if (checkYoutubeLink(file)) { try { diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali index 273722a92..3c47b63fb 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali @@ -377,7 +377,7 @@ move-result-object v1 - invoke-static/range {v1 .. v1}, Lru/vtosters/lite/utils/ExternalLinkHandler;->parseVideoFile(Lcom/vk/dto/common/VideoFile;)Z + invoke-static {v1, v0}, Lru/vtosters/lite/utils/ExternalLinkHandler;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z move-result v4 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali b/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali index 7af727b7e..4c9475533 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali @@ -1320,7 +1320,13 @@ return-void :cond_1 - invoke-static/range {v2 .. v2}, Lru/vtosters/lite/utils/ExternalLinkHandler;->parseVideoFile(Lcom/vk/dto/common/VideoFile;)Z + invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context; + + move-result-object v0 + + check-cast v0, Landroid/app/Activity; + + invoke-static {v2, v0}, Lru/vtosters/lite/utils/ExternalLinkHandler;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z move-result v3