shunf4/squawk
2
0
Fork 0
forked from blue/squawk
Code Issues Pull requests Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
shunf4 2021-07-07 21:45:08 +08:00
parent ef1a9846bf
commit 5d1f4cc36f
19 changed files with 217 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/CMakeLists.txt
View file

@ -8,6 +8,12 @@ find_package(Qt5Gui CONFIG REQUIRED)
find_package(Qt5Network CONFIG REQUIRED)
find_package(Qt5Xml CONFIG REQUIRED)
find_path(LMDB_INCLUDE_DIR NAMES lmdb.h PATHS "${LMDB_DIR}/include")
set(LMDB_LIBRARIES "${LMDB_DIR}/lib/liblmdb.a" )
message(${LMDB_INCLUDE_DIR})
message(${LMDB_LIBRARIES})
set(squawkCORE_SRC
squawk.cpp
account.cpp
@ -27,6 +33,7 @@ add_subdirectory(passwordStorageEngines)
# Tell CMake to create the helloworld executable
add_library(squawkCORE ${squawkCORE_SRC})
target_include_directories(squawkCORE PUBLIC ${LMDB_INCLUDE_DIR})
if(SYSTEM_QXMPP)
get_target_property(QXMPP_INTERFACE_INCLUDE_DIRECTORIES QXmpp::QXmpp INTERFACE_INCLUDE_DIRECTORIES)
@ -39,7 +46,8 @@ target_link_libraries(squawkCORE Qt5::Network)
target_link_libraries(squawkCORE Qt5::Gui)
target_link_libraries(squawkCORE Qt5::Xml)
target_link_libraries(squawkCORE qxmpp)
target_link_libraries(squawkCORE lmdb)
# target_link_libraries(squawkCORE lmdb)
target_link_libraries(squawkCORE ${LMDB_LIBRARIES})
target_link_libraries(squawkCORE simpleCrypt)
if (WITH_KWALLET)
target_link_libraries(squawkCORE kwalletPSE)

3
core/squawk.cpp
View file

@ -119,8 +119,9 @@ void Core::Squawk::newAccountRequest(const QMap<QString, QVariant>& map)
QString server = map.value("server").toString();
QString password = map.value("password").toString();
QString resource = map.value("resource").toString();
int passwordType = map.value("passwordType").toInt();
addAccount(login, server, password, name, resource, Shared::AccountPassword::plain);
addAccount(login, server, password, name, resource, Shared::Global::fromInt<Shared::AccountPassword>(passwordType));
}
void Core::Squawk::addAccount(

2
core/squawk.h
View file

@ -171,7 +171,7 @@ private:
Shared::AccountPassword passwordType
);
static const quint64 passwordHash = 0x08d054225ac4871d;
static const quint64 passwordHash = 0x3c5bb27570f50e11;
};
}