Replaced DocumentOpenClickHandler.

Telegram/SourceFiles/core/local_url_handlers.cpp

@@ -437,9 +437,7 @@ bool OpenMediaTimestamp(
 			documentId,
 			time * crl::time(1000));
 		if (document->isVideoFile()) {
-			Core::App().showDocument(
+			controller->openDocument(document, itemId, true);
-				document,
-				session->data().message(itemId));
 		} else if (document->isSong() || document->isVoiceMessage()) {
 			Media::Player::instance()->play({ document, itemId });
 		}

Telegram/SourceFiles/data/data_document.cpp

@@ -329,13 +329,6 @@ void DocumentOpenClickHandler::onClickImpl() const {
 	}
 }
 
-void DocumentOpenClickHandler::Open(
-		Data::FileOrigin origin,
-		not_null<DocumentData*> data,
-		HistoryItem *context) {
-	Data::ResolveDocument(data, context);
-}
-
 void DocumentSaveClickHandler::Save(
 		Data::FileOrigin origin,
 		not_null<DocumentData*> data,

Telegram/SourceFiles/data/data_document.h

@@ -365,10 +365,6 @@ public:
 	DocumentOpenClickHandler(
 		not_null<DocumentData*> document,
 		Fn<void()> &&callback);
-	static void Open(
-		Data::FileOrigin origin,
-		not_null<DocumentData*> document,
-		HistoryItem *context);
 
 protected:
 	void onClickImpl() const override;

Telegram/SourceFiles/data/data_document_resolver.cpp

@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "platform/platform_file_utilities.h"
 #include "ui/text/text_utilities.h"
-#include "window/window_controller.h"
 #include "window/window_session_controller.h"
 
 #include <QtCore/QBuffer>
@@ -209,12 +208,13 @@ base::binary_guard ReadImageAsync(
 }
 
 void ResolveDocument(
-		// not_null<Window::Controller*> controller,
+		not_null<Window::SessionController*> controller,
 		not_null<DocumentData*> document,
 		HistoryItem *item) {
 	if (!document->date) {
 		return;
 	}
+	const auto msgId = item ? item->fullId() : FullMsgId();
 
 	const auto media = document->createMediaView();
 	const auto openImageInApp = [&] {
@@ -229,7 +229,7 @@ void ResolveDocument(
 			const auto path = location.name();
 			if (Core::MimeTypeForFile(path).name().startsWith("image/")
 				&& QImageReader(path).canRead()) {
-				Core::App().showDocument(document, item);
+				controller->openDocument(document, msgId, true);
 				return true;
 			}
 		} else if (document->mimeString().startsWith("image/")
@@ -237,7 +237,7 @@ void ResolveDocument(
 			auto bytes = media->bytes();
 			auto buffer = QBuffer(&bytes);
 			if (QImageReader(&buffer).canRead()) {
-				Core::App().showDocument(document, item);
+				controller->openDocument(document, msgId, true);
 				return true;
 			}
 		}
@@ -245,20 +245,19 @@ void ResolveDocument(
 	};
 	const auto &location = document->location(true);
 	if (document->isTheme() && media->loaded(true)) {
-		Core::App().showDocument(document, item);
+		controller->openDocument(document, msgId, true);
 		location.accessDisable();
 	} else if (media->canBePlayed()) {
 		if (document->isAudioFile()
 			|| document->isVoiceMessage()
 			|| document->isVideoMessage()) {
-			const auto msgId = item ? item->fullId() : FullMsgId();
 			::Media::Player::instance()->playPause({ document, msgId });
 		} else if (item
 			&& document->isAnimation()
 			&& HistoryView::Gif::CanPlayInline(document)) {
 			document->owner().requestAnimationPlayInline(item);
 		} else {
-			Core::App().showDocument(document, item);
+			controller->openDocument(document, msgId, true);
 		}
 	} else {
 		document->saveFromDataSilent();

Telegram/SourceFiles/data/data_document_resolver.h

@@ -13,7 +13,7 @@ class DocumentData;
 class HistoryItem;
 
 namespace Window {
-class Controller;
+class SessionController;
 } // namespace Window
 
 namespace Data {
@@ -30,7 +30,7 @@ base::binary_guard ReadImageAsync(
 	FnMut<void(QImage&&)> done);
 
 void ResolveDocument(
-	// not_null<Window::Controller*> controller,
+	not_null<Window::SessionController*> controller,
 	not_null<DocumentData*> document,
 	HistoryItem *item);
 

Telegram/SourceFiles/data/data_types.h

@@ -199,7 +199,6 @@ class PhotoSaveClickHandler;
 class PhotoCancelClickHandler;
 class DocumentClickHandler;
 class DocumentSaveClickHandler;
-class DocumentOpenClickHandler;
 class DocumentCancelClickHandler;
 class DocumentWrappedClickHandler;
 class VoiceSeekClickHandler;

Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp

@@ -1293,7 +1293,7 @@ void InnerWidget::openContextGif(FullMsgId itemId) {
 	if (const auto item = session().data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
-				Core::App().showDocument(document, item);
+				_controller->openDocument(document, itemId, true);
 			}
 		}
 	}

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -1957,7 +1957,7 @@ void HistoryInner::openContextGif(FullMsgId itemId) {
 	if (const auto item = session().data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
-				Core::App().showDocument(document, item);
+				_controller->openDocument(document, itemId, true);
 			}
 		}
 	}

Telegram/SourceFiles/history/view/history_view_context_menu.cpp

@@ -157,11 +157,13 @@ void AddPhotoActions(
 	}
 }
 
-void OpenGif(not_null<Main::Session*> session, FullMsgId itemId) {
+void OpenGif(
-	if (const auto item = session->data().message(itemId)) {
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId) {
+	if (const auto item = controller->session().data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
-				Core::App().showDocument(document, item);
+				controller->openDocument(document, itemId, true);
 			}
 		}
 	}
@@ -223,7 +225,7 @@ void AddDocumentActions(
 		}();
 		if (notAutoplayedGif) {
 			menu->addAction(tr::lng_context_open_gif(tr::now), [=] {
-				OpenGif(session, contextId);
+				OpenGif(list->controller(), contextId);
 			});
 		}
 	}

Telegram/SourceFiles/history/view/media/history_view_gif.cpp

@@ -1387,7 +1387,10 @@ void Gif::playAnimation(bool autoplay) {
 		return;
 	} else if ((_streamed && autoplayEnabled())
 		|| (!autoplay && _data->isVideoFile())) {
-		Core::App().showDocument(_data, _parent->data());
+		_parent->delegate()->elementOpenDocument(
+			_data,
+			_parent->data()->fullId(),
+			true);
 		return;
 	}
 	if (_streamed) {

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -49,6 +49,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_rotation.h"
 #include "data/data_photo_media.h"
 #include "data/data_document_media.h"
+#include "data/data_document_resolver.h"
 #include "window/themes/window_theme_preview.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
@@ -1554,8 +1555,11 @@ void OverlayWidget::handleDocumentClick() {
 	if (_document->loading()) {
 		saveCancel();
 	} else {
-		DocumentOpenClickHandler::Open(
+		if (!_controller) {
-			fileOrigin(),
+			return;
+		}
+		Data::ResolveDocument(
+			_controller,
 			_document,
 			_document->owner().message(_msgid));
 		if (_document->loading() && !_radial.animating()) {

Telegram/SourceFiles/window/window_session_controller.cpp

@@ -1238,7 +1238,6 @@ void SessionController::openDocument(
 		not_null<DocumentData*> document,
 		FullMsgId contextId,
 		bool showInMediaView) {
-	// TEMP.
 	if (showInMediaView) {
 		_window->openInMediaView(Media::View::OpenRequest(
 			this,
@@ -1246,7 +1245,10 @@ void SessionController::openDocument(
 			session().data().message(contextId)));
 		return;
 	}
-	Data::ResolveDocument(document, session().data().message(contextId));
+	Data::ResolveDocument(
+		this,
+		document,
+		session().data().message(contextId));
 }
 
 SessionController::~SessionController() = default;