easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed context from logging.

Browse Source 
Fixed homedir detection.
Fixed config file creation.
Send smartphone device model on broadcast.
This commit is contained in:
codestation
2015-03-22 22:27:44 -04:30
parent 023d46cf0f
commit 3899cd6715
3 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
android/main_android.cpp
View File

@@ -21,20 +21,57 @@
#include <QDebug>
#include <QLibraryInfo>
#include <QLocale>
#include <QFile>
#include <QStringList>
#include <QTextCodec>
#include <QThread>
#include <QTranslator>
#include <QStandardPaths>
#include <inttypes.h>
#include <unistd.h>
#include <vitamtp.h>
#include <android/log.h>
#include "servicemanager.h"
static QString getAppName()
{
pid_t pid = getpid();
QString cmdline = QString("/proc/%1/cmdline").arg(pid);
QFile file(cmdline);
return file.open(QIODevice::ReadOnly) ? file.readLine() : "";
}
static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QString & msg)
{
QByteArray localMsg = msg.toLocal8Bit();
const char *message = localMsg.constData();
switch (type) {
case QtDebugMsg:
__android_log_print(ANDROID_LOG_INFO, "qcma", "%s", message);
break;
case QtWarningMsg:
__android_log_print(ANDROID_LOG_WARN, "qcma", "%s", message);
break;
case QtCriticalMsg:
__android_log_print(ANDROID_LOG_ERROR, "qcma", "%s", message);
break;
case QtFatalMsg:
__android_log_print(ANDROID_LOG_FATAL, "qcma", "%s", message);
abort();
}
}
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
app.setApplicationName("Qcma");
app.setApplicationName("qcma");
// FIXME: libmtp sends SIGPIPE if a socket write fails crashing the whole app
// the proper fix is to libmtp to handle the cancel properly or ignoring
@@ -44,8 +81,18 @@ int main(int argc, char *argv[])
// stdout goes to /dev/null on android
VitaMTP_Set_Logging(VitaMTP_NONE);
qInstallMessageHandler(cleanOutput);
qDebug("Starting Qcma %s", QCMA_VER);
QString appname = getAppName();
qDebug("Class name: %s", qPrintable(appname));
// set $HOME, Qt/Android doesn't currently do this
qputenv("HOME", QString("/data/data/%1").arg(appname).toLocal8Bit());
app.addLibraryPath(appname + "/lib");
QTranslator translator;
QString locale = "en"; //QLocale().system().name();
qDebug() << "Current locale:" << locale;
@@ -71,7 +118,7 @@ int main(int argc, char *argv[])
qDebug("Starting main thread: 0x%016" PRIxPTR, (uintptr_t)QThread::currentThreadId());
// set the organization/application for QSettings to work properly
app.setOrganizationName("codestation");
app.setOrganizationName("qcma");
app.setApplicationName("qcma");
ServiceManager manager;