Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 22:25:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid linking libretroshare in qml app and notify

Browse source 
Use QDir::homePath() instead of RsAccounts::ConfigDirectory() to
  determine libresapi socket path, this way statically linking to
  libretroshare is not needed and the android package size is reduced
  dramatically 20+MB -> 13MB

At same time this solves the socket path mismatch between retroshare
  android  service and the other android applications due to merge
This commit is contained in:
Gioacchino Mazzurco 2017-04-18 23:14:44 +02:00
parent 4455bfa92d
commit e83fec8d84
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-qml-app/src/main-app.cpp
View file

@ -22,6 +22,8 @@
#include <QQmlContext>
#include <QQmlComponent>
#include <QDebug>
#include <QDir>
#include <unistd.h> // for usleep
#ifdef Q_OS_ANDROID
# include <QtAndroid>
@ -30,7 +32,6 @@
#endif // Q_OS_ANDROID
#include "libresapilocalclient.h"
#include "retroshare/rsinit.h"
#include "rsqmlappengine.h"
int main(int argc, char *argv[])
@ -44,7 +45,7 @@ int main(int argc, char *argv[])
"org.retroshare.qml_components.LibresapiLocalClient", 1, 0,
"LibresapiLocalClient");
QString sockPath = QString::fromStdString(RsAccounts::ConfigDirectory());
QString sockPath = QDir::homePath() + "/.retroshare";
sockPath.append("/libresapi.sock");
LibresapiLocalClient rsApi;