void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-07-24 14:33:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added ability to share proxy with QR code.

Browse source
This commit is contained in:
23rd 2025-06-30 10:50:14 +03:00
parent b97c8b9a17
commit 3a8898dd24
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/Resources/langs/lang.strings
View file

@ -1162,6 +1162,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_proxy_menu_delete" = "Delete";
"lng_proxy_menu_restore" = "Restore";
"lng_proxy_edit_share" = "Share";
"lng_proxy_edit_share_qr_box_title" = "Share proxy with QR code";
"lng_proxy_address_label" = "Socket address";
"lng_proxy_credentials_optional" = "Credentials (optional)";
"lng_proxy_credentials" = "Credentials";

34
Telegram/SourceFiles/boxes/connection_box.cpp
View file

@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "ui/basic_click_handlers.h"
#include "ui/boxes/confirm_box.h"
#include "ui/boxes/peer_qr_box.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "ui/painter.h"
@ -177,6 +178,7 @@ public:
rpl::producer<> restoreClicks() const;
rpl::producer<> editClicks() const;
rpl::producer<> shareClicks() const;
rpl::producer<> showQrClicks() const;
protected:
int resizeGetHeight(int newWidth) override;
@ -198,6 +200,7 @@ private:
rpl::event_stream<> _restoreClicks;
rpl::event_stream<> _editClicks;
rpl::event_stream<> _shareClicks;
rpl::event_stream<> _showQrClicks;
base::unique_qptr<Ui::DropdownMenu> _menu;
bool _set = false;
@ -319,6 +322,10 @@ rpl::producer<> ProxyRow::shareClicks() const {
return _shareClicks.events();
}
rpl::producer<> ProxyRow::showQrClicks() const {
return _showQrClicks.events();
}
void ProxyRow::setupControls(View &&view) {
updateFields(std::move(view));
_toggled.stop();
@ -563,6 +570,9 @@ void ProxyRow::showMenu() {
addAction(tr::lng_proxy_edit_share(tr::now), [=] {
_shareClicks.fire({});
}, &st::menuIconShare);
addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
_showQrClicks.fire({});
}, &st::menuIconQrCode);
}
if (_view.deleted) {
addAction(tr::lng_proxy_menu_restore(tr::now), [=] {
@ -898,9 +908,11 @@ void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
getDelegate()->show(_controller->editItemBox(id));
}, button->lifetime());
button->shareClicks(
) | rpl::start_with_next([=] {
_controller->shareItem(id);
rpl::merge(
button->shareClicks() | rpl::map_to(false),
button->showQrClicks() | rpl::map_to(true)
) | rpl::start_with_next([=](bool qr) {
_controller->shareItem(id, qr);
}, button->lifetime());
button->clicks(
@ -1411,8 +1423,8 @@ void ProxiesBoxController::restoreItem(int id) {
setDeleted(id, false);
}
void ProxiesBoxController::shareItem(int id) {
share(findById(id)->data);
void ProxiesBoxController::shareItem(int id, bool qr) {
share(findById(id)->data, qr);
}
void ProxiesBoxController::applyItem(int id) {
@ -1653,10 +1665,11 @@ void ProxiesBoxController::updateView(const Item &item) {
deleted,
!deleted && supportsShare,
supportsCalls,
state });
state,
});
}
void ProxiesBoxController::share(const ProxyData &proxy) {
void ProxiesBoxController::share(const ProxyData &proxy, bool qr) {
if (proxy.type == Type::Http) {
return;
}
@ -1669,6 +1682,13 @@ void ProxiesBoxController::share(const ProxyData &proxy) {
? "&pass=" + qthelp::url_encode(proxy.password) : "")
+ ((proxy.type == Type::Mtproto && !proxy.password.isEmpty())
? "&secret=" + proxy.password : "");
if (qr) {
_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
Ui::FillPeerQrBox(box, nullptr, link, rpl::single(QString()));
box->setTitle(tr::lng_proxy_edit_share_qr_box_title());
}));
return;
}
QGuiApplication::clipboard()->setText(link);
_show->showToast(tr::lng_username_copied(tr::now));
}

4
Telegram/SourceFiles/boxes/connection_box.h
View file

@ -73,7 +73,7 @@ public:
void deleteItem(int id);
void restoreItem(int id);
void shareItem(int id);
void shareItem(int id, bool qr);
void applyItem(int id);
object_ptr<Ui::BoxContent> editItemBox(int id);
object_ptr<Ui::BoxContent> addNewItemBox();
@ -106,7 +106,7 @@ private:
std::vector<Item>::iterator findByProxy(const ProxyData &proxy);
void setDeleted(int id, bool deleted);
void updateView(const Item &item);
void share(const ProxyData &proxy);
void share(const ProxyData &proxy, bool qr = false);
void saveDelayed();
void refreshChecker(Item &item);
void setupChecker(int id, const Checker &checker);