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

34
android/sevicemanager.cpp
View File

@@ -28,6 +28,7 @@
#include <QSettings>
#include <QStandardPaths>
#include <QTextStream>
#include <QAndroidJniObject>
#include <vitamtp.h>
ServiceManager::ServiceManager(QObject *obj_parent) :
@@ -56,10 +57,7 @@ void ServiceManager::refreshDatabase()
void ServiceManager::start()
{
if(VitaMTP_Init() < 0) {
qCritical("Cannot initialize VitaMTP library");
return;
}
VitaMTP_Init();
loadDefaultSettings();
@@ -144,9 +142,19 @@ void ServiceManager::threadStopped()
void ServiceManager::loadDefaultSettings()
{
QString defaultdir;
QString defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
// save config to /sdcard, remove when the app works properly
qputenv("XDG_CONFIG_HOME", defaultdir.toLocal8Bit());
QSettings settings;
// skip initialization if some config is already present
if(!settings.value("appsPath").isNull())
return;
qDebug("saving to: %s", qPrintable(settings.fileName()));
defaultdir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
qDebug("photoPath: %s", qPrintable(defaultdir));
settings.setValue("photoPath", defaultdir);
@@ -159,23 +167,23 @@ void ServiceManager::loadDefaultSettings()
qDebug("photoPath: %s", qPrintable(defaultdir));
settings.setValue("videoPath", defaultdir);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
defaultdir.append(QDir::separator()).append("PS Vita");
qDebug("appsPath: %s", qPrintable(defaultdir));
settings.setValue("appsPath", defaultdir);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
defaultdir.append(QDir::separator()).append("PSV Updates");
qDebug("urlPath: %s", qPrintable(defaultdir));
settings.setValue("urlPath", defaultdir);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
defaultdir.append(QDir::separator()).append("PSV Packages");
qDebug("pkgPath: %s", qPrintable(defaultdir));
settings.setValue("pkgPath", defaultdir);
settings.setValue("offlineMode", true);
settings.setValue("skipMetadata", false);
settings.setValue("skipMetadata", true);
// disable USB for now
settings.setValue("disableUSB", true);
@@ -192,4 +200,12 @@ void ServiceManager::loadDefaultSettings()
settings.setValue("protocolIndex", 0);
settings.setValue("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION);
QString deviceName = QAndroidJniObject::getStaticObjectField(
"android/os/Build", "MODEL", "Ljava/lang/String;").toString();
qDebug("Detected device model: %s", qPrintable(deviceName));
settings.setValue("hostName", deviceName);
settings.sync();
}