void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-17 22:57:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ShowXDPOpenWithDialog -> UnsafeShowOpenWith

Browse source
This commit is contained in:
Ilya Fedin 2024-04-21 01:20:59 +04:00 • committed by John Preston
parent 4310c4978e
commit 3d994b58a0
5 changed files with 119 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/CMakeLists.txt
View file

@ -1202,8 +1202,6 @@ PRIVATE
platform/linux/linux_wayland_integration_dummy.cpp
platform/linux/linux_wayland_integration.cpp
platform/linux/linux_wayland_integration.h
platform/linux/linux_xdp_open_with_dialog.cpp
platform/linux/linux_xdp_open_with_dialog.h
platform/linux/file_utilities_linux.cpp
platform/linux/file_utilities_linux.h
platform/linux/launcher_linux.cpp

119
Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
View file

@ -6,3 +6,122 @@ For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/linux/file_utilities_linux.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/linux/base_linux_xdp_utilities.h"
#include "base/platform/linux/base_linux_xdg_activation_token.h"
#include "base/random.h"
#include <fcntl.h>
#include <xdpopenuri/xdpopenuri.hpp>
#include <xdprequest/xdprequest.hpp>
namespace Platform {
namespace File {
namespace {
using namespace gi::repository;
using base::Platform::XdgActivationToken;
} // namespace
bool UnsafeShowOpenWith(const QString &filepath) {
auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
Gio::BusType::SESSION_,
Gio::DBusProxyFlags::NONE_,
base::Platform::XDP::kService,
base::Platform::XDP::kObjectPath,
nullptr);
if (!proxy) {
return false;
}
auto interface = XdpOpenURI::OpenURI(proxy);
if (interface.get_version() < 3) {
return false;
}
const auto fd = open(
QFile::encodeName(filepath).constData(),
O_RDONLY);
if (fd == -1) {
return false;
}
const auto fdGuard = gsl::finally([&] { close(fd); });
const auto handleToken = "tdesktop"
+ std::to_string(base::RandomValue<uint>());
std::string uniqueName = proxy.get_connection().get_unique_name();
uniqueName.erase(0, 1);
uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
auto request = XdpRequest::Request(
XdpRequest::RequestProxy::new_sync(
proxy.get_connection(),
Gio::DBusProxyFlags::NONE_,
base::Platform::XDP::kService,
base::Platform::XDP::kObjectPath
+ std::string("/request/")
+ uniqueName
+ '/'
+ handleToken,
nullptr,
nullptr));
if (!request) {
return false;
}
auto loop = GLib::MainLoop::new_();
const auto signalId = request.signal_response().connect([=](
XdpRequest::Request,
guint,
GLib::Variant) mutable {
loop.quit();
});
const auto signalGuard = gsl::finally([&] {
request.disconnect(signalId);
});
auto result = interface.call_open_file_sync(
base::Platform::XDP::ParentWindowID(),
GLib::Variant::new_handle(0),
GLib::Variant::new_array({
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(handleToken))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("activation_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(
XdgActivationToken().toStdString()))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("ask"),
GLib::Variant::new_variant(
GLib::Variant::new_boolean(true))),
}),
Gio::UnixFDList::new_from_array((std::array{ fd }).data(), 1),
nullptr);
if (!result) {
return false;
}
QWidget window;
window.setAttribute(Qt::WA_DontShowOnScreen);
window.setWindowModality(Qt::ApplicationModal);
window.show();
loop.run();
return true;
}
} // namespace File
} // namespace Platform

6
Telegram/SourceFiles/platform/linux/file_utilities_linux.h
View file

@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_file_utilities.h"
#include "platform/linux/linux_xdp_open_with_dialog.h"
namespace Platform {
namespace File {
@ -30,10 +28,6 @@ inline bool UnsafeShowOpenWithDropdown(const QString &filepath) {
return false;
}
inline bool UnsafeShowOpenWith(const QString &filepath) {
return internal::ShowXDPOpenWithDialog(filepath);
}
inline void UnsafeLaunch(const QString &filepath) {
return ::File::internal::UnsafeLaunchDefault(filepath);
}

129
Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
View file

@ -1,129 +0,0 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/linux/linux_xdp_open_with_dialog.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/linux/base_linux_xdp_utilities.h"
#include "base/platform/linux/base_linux_xdg_activation_token.h"
#include "base/random.h"
#include <fcntl.h>
#include <xdpopenuri/xdpopenuri.hpp>
#include <xdprequest/xdprequest.hpp>
namespace Platform {
namespace File {
namespace internal {
namespace {
using namespace gi::repository;
using base::Platform::XdgActivationToken;
} // namespace
bool ShowXDPOpenWithDialog(const QString &filepath) {
auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
Gio::BusType::SESSION_,
Gio::DBusProxyFlags::NONE_,
base::Platform::XDP::kService,
base::Platform::XDP::kObjectPath,
nullptr);
if (!proxy) {
return false;
}
auto interface = XdpOpenURI::OpenURI(proxy);
if (interface.get_version() < 3) {
return false;
}
const auto fd = open(
QFile::encodeName(filepath).constData(),
O_RDONLY);
if (fd == -1) {
return false;
}
const auto fdGuard = gsl::finally([&] { close(fd); });
const auto handleToken = "tdesktop"
+ std::to_string(base::RandomValue<uint>());
std::string uniqueName = proxy.get_connection().get_unique_name();
uniqueName.erase(0, 1);
uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
auto request = XdpRequest::Request(
XdpRequest::RequestProxy::new_sync(
proxy.get_connection(),
Gio::DBusProxyFlags::NONE_,
base::Platform::XDP::kService,
base::Platform::XDP::kObjectPath
+ std::string("/request/")
+ uniqueName
+ '/'
+ handleToken,
nullptr,
nullptr));
if (!request) {
return false;
}
auto loop = GLib::MainLoop::new_();
const auto signalId = request.signal_response().connect([=](
XdpRequest::Request,
guint,
GLib::Variant) mutable {
loop.quit();
});
const auto signalGuard = gsl::finally([&] {
request.disconnect(signalId);
});
auto result = interface.call_open_file_sync(
base::Platform::XDP::ParentWindowID(),
GLib::Variant::new_handle(0),
GLib::Variant::new_array({
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(handleToken))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("activation_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(
XdgActivationToken().toStdString()))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("ask"),
GLib::Variant::new_variant(
GLib::Variant::new_boolean(true))),
}),
Gio::UnixFDList::new_from_array((std::array{ fd }).data(), 1),
nullptr);
if (!result) {
return false;
}
QWidget window;
window.setAttribute(Qt::WA_DontShowOnScreen);
window.setWindowModality(Qt::ApplicationModal);
window.show();
loop.run();
return true;
}
} // namespace internal
} // namespace File
} // namespace Platform

18
Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.h
View file

@ -1,18 +0,0 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
namespace Platform {
namespace File {
namespace internal {
bool ShowXDPOpenWithDialog(const QString &filepath);
} // namespace internal
} // namespace File
} // namespace Platform