Fixes for Qt 5

kutegram · Apr 21, 2022 · 5338b4e · 5338b4e
1 parent 3dd8a19
commit 5338b4e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/crypto.cpp b/crypto.cpp
@@ -10,8 +10,8 @@
 #include <openssl/rsa.h>
 
 DHKey::DHKey(QString publicKey, qint64 fingerprint, QString exponent) :
-    publicKey(QByteArray::fromHex(publicKey.toAscii())),
-    exponent(QByteArray::fromHex(exponent.toAscii())),
+    publicKey(QByteArray::fromHex(publicKey.toUtf8())),
+    exponent(QByteArray::fromHex(exponent.toUtf8())),
     fingerprint(fingerprint)
 {
 

diff --git a/library.pri b/library.pri
@@ -13,21 +13,18 @@ contains(MOBILITY_CONFIG, systeminfo) {
 include(qt-json/qt-json.pri)
 include(thirdparty/thirdparty.pri)
 
-win32:include(zlib/zlib.pri)
-!symbian:unix:LIBS += -lz
-
 symbian:LIBS += -llibcrypto
-!symbian:unix:LIBS += -lcrypto
-
-win32 {
-    exists(C:/OpenSSL-Win32) {
-        LIBS += -LC:/OpenSSL-Win32/lib
-        LIBS += -llibcrypto
-        INCLUDEPATH += C:/OpenSSL-Win32/include
-    } else {
-        message(OpenSSL-Win32 1.1.1 not found. Install it from https://slproweb.com/ to C:/OpenSSL-Win32)
-    }
-}
+
+!symbian:!android:unix:LIBS += -lz
+!symbian:!android:unix:LIBS += -lcrypto
+
+android:LIBS += -lz
+android:LIBS += -LC:/QtAndroid/openssl -lcrypto
+android:INCLUDEPATH += C:/QtAndroid/openssl/include
+
+win32:include(zlib/zlib.pri)
+win32:LIBS += -LC:/OpenSSL-Win32/lib -llibcrypto
+win32:INCLUDEPATH += C:/OpenSSL-Win32/include
 
 HEADERS += \
     $$PWD/telegramclient.h \

diff --git a/telegramapi.cpp b/telegramapi.cpp
@@ -19,7 +19,7 @@ void TelegramClient::handleLoginToken(QByteArray data, qint64 mtm)
     readTLAuthLoginToken(packet, var);
     TelegramObject loginToken = var.toMap();
 
-    emit gotLoginToken(mtm, loginToken["expires"].toInt(), "tg://login?token=" + QString::fromAscii(loginToken["token"].toByteArray().toBase64()).replace("+", "-").replace("/", "_"));
+    emit gotLoginToken(mtm, loginToken["expires"].toInt(), "tg://login?token=" + QString::fromUtf8(loginToken["token"].toByteArray().toBase64()).replace("+", "-").replace("/", "_"));
 }
 
 void TelegramClient::handleLoginTokenSuccess(QByteArray data, qint64 mtm)