AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround for bug https://bugreports.qt.io/browse/QTBUG-113461

Browse source
This commit is contained in:
Mazay B 2023-06-27 00:23:34 +01:00
parent 34a228adbe
commit 1ec50cf6ad
13 changed files with 21 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/platforms/android/android_controller.cpp
View file

@ -267,11 +267,6 @@ void AndroidController::startQrReaderActivity()
AndroidVPNActivity::instance()->startQrCodeReader();
}
void AndroidController::copyTextToClipboard(QString text)
{
AndroidVPNActivity::instance()->copyTextToClipboard(text);
}
void AndroidController::scheduleStatusCheckSlot()
{
QTimer::singleShot(1000, [this]() {

1
client/platforms/android/android_controller.h
View file

@ -43,7 +43,6 @@ public:
void setVpnConfig(const QJsonObject &newVpnConfig);
void startQrReaderActivity();
void copyTextToClipboard(QString text);
signals:
void connectionStateChanged(VpnProtocol::VpnConnectionState state);

8
client/platforms/android/androidvpnactivity.cpp
View file

@ -65,14 +65,6 @@ void AndroidVPNActivity::saveFileAs(QString fileContent, QString suggestedFilena
QJniObject::fromString(suggestedFilename).object<jstring>());
}
void AndroidVPNActivity::copyTextToClipboard(QString text)
{
QJniObject::callStaticMethod<void>(
CLASSNAME,
"putTextToClipboard", "(Ljava/lang/String;)V",
QJniObject::fromString(text).object<jstring>());
}
// static
AndroidVPNActivity* AndroidVPNActivity::instance() {
if (s_instance == nullptr) {

1
client/platforms/android/androidvpnactivity.h
View file

@ -76,7 +76,6 @@ public:
static void connectService();
static void startQrCodeReader();
static void saveFileAs(QString fileContent, QString suggestedFilename);
static void copyTextToClipboard(QString text);
signals:
void serviceConnected();