Merge tag 'v7.0.4' into dev

Telegram/SourceFiles/data/data_document_resolver.cpp

@@ -11,15 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/abstract_box.h" // Ui::show().
 #include "chat_helpers/ttl_media_layer_widget.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
 #include "core/mime_type.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_session.h"
+#include "history/view/media/history_view_gif.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/view/media/history_view_gif.h"
+#include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "media/player/media_player_instance.h"
 #include "platform/platform_file_utilities.h"
@@ -29,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
+
 #include "styles/style_layers.h"
 
 #include <QtCore/QBuffer>
@@ -280,8 +283,21 @@ void ResolveDocument(
 	} else {
 		document->saveFromDataSilent();
 		if (!openPluginInfo() && !openImageInApp()) {
-			if (!document->filepath(true).isEmpty()) {
-				LaunchWithWarning(location.name(), item);
+			const auto path = document->filepath(true);
+			if (!path.isEmpty()) {
+				auto context = QVariant();
+				if (item) {
+					auto clickHandlerContext = ClickHandlerContext();
+					clickHandlerContext.itemId = item->fullId();
+					if (controller) {
+						clickHandlerContext.sessionWindow = controller;
+						clickHandlerContext.show = controller->uiShow();
+					}
+					context = QVariant::fromValue(clickHandlerContext);
+				}
+				if (!Core::App().iv().showMarkdown(path, context)) {
+					LaunchWithWarning(path, item);
+				}
 			} else if (document->status == FileReady
 				|| document->status == FileDownloadFailed) {
 				DocumentSaveClickHandler::Save(