Skip to content
Snippets Groups Projects
Unverified Commit 562af910 authored by meskio's avatar meskio :tent:
Browse files

[feat] pass the raw byte json to the backend

The C++ library does interpret anything as strings, we want to keep the
orignal json types.
parent 89b148d1
No related branches found
No related tags found
No related merge requests found
......@@ -62,7 +62,8 @@ int main(int argc, char **argv) {
QFile providerJson (":/providers.json");
providerJson.open(QIODevice::ReadOnly | QIODevice::Text);
QJsonModel *providers = new QJsonModel;
providers->loadJson(providerJson.readAll());
QByteArray providerJsonBytes = providerJson.readAll();
providers->loadJson(providerJsonBytes);
QJsonValue defaultProvider = providers->json().object().value("default");
QJsonValue providersInfo = providers->json().object().value("providers");
QString appName = getAppName(providersInfo, defaultProvider.toString());
......@@ -199,7 +200,7 @@ int main(int argc, char **argv) {
/* let the Go side initialize its internal state */
InitializeBitmaskContext(
toGoStr(defaultProvider.toString()),
(char*)QProvidersJSON.toUtf8().data(), strlen(QProvidersJSON.toUtf8().data()),
(char*)providerJsonBytes.data(), providerJsonBytes.length(),
obfs4, disAutostart, toGoStr(startVPN));
/* if requested, enable web api for controlling the VPN */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment