diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-24 18:02:32 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-24 18:02:32 +0700 |
| commit | a570ecafaa7e1481778a35015776b6de6102da83 (patch) | |
| tree | 455c0a530c4302cdd759e95c8ce8a14ea65ebd0a | |
| parent | 91640a2222eeca5e424ac27bc93514e56a2d5c56 (diff) | |
| parent | b48fd101e2c74c34f78b9f2212efe117f9e87931 (diff) | |
Merge branch 'master' of ssh://darapsa.co.id/usr/local/git/kelakon into development
* 'master' of ssh://darapsa.co.id/usr/local/git/kelakon:
Common CA certificates is bundled in APK
| -rw-r--r-- | controller.cxx | 15 | ||||
| -rw-r--r-- | kelakon.pro | 3 | ||||
| m--------- | qrtclient | 0 |
3 files changed, 18 insertions, 0 deletions
diff --git a/controller.cxx b/controller.cxx index d69a6d6..d007855 100644 --- a/controller.cxx +++ b/controller.cxx @@ -1,3 +1,6 @@ +#ifdef ANDROID +#include <QStringBuilder> +#endif #include <QQmlApplicationEngine> #include <QtQml> #include <qrtclient/client.hxx> @@ -6,7 +9,19 @@ Controller::Controller(QObject* parent) : QObject{parent} { +#ifdef ANDROID + QFile file{"assets:/certs/ca-certificates.crt"}; + file.copy(QDir{QStandardPaths::writableLocation + (QStandardPaths::AppDataLocation)}.absolutePath() + % "/ca-certificates.crt"); + auto path = QDir{QStandardPaths::writableLocation + (QStandardPaths::AppDataLocation)}.absolutePath() + % "/ca-certificates.crt"; + auto client = new RTClient::Client{"https://darapsa.co.id/rt" + , path.toLatin1().constData()}; +#else auto client = new RTClient::Client{"https://darapsa.co.id/rt"}; +#endif client->moveToThread(&thread); connect(&thread, &QThread::finished, client, &QObject::deleteLater); diff --git a/kelakon.pro b/kelakon.pro index ba344b5..97b543a 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -39,6 +39,9 @@ android { QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + certs.path = /assets/certs + certs.files = /etc/ssl/certs/ca-certificates.crt + INSTALLS += certs } debug: DEFINES += DEBUG diff --git a/qrtclient b/qrtclient -Subproject a018a703dade256a26f1e3f13591734c0ad171e +Subproject 18977911a7645333c1887bfbbee96520226b398 |