Merge lp:~zsombi/ubuntu-ui-toolkit/statesaver_path into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Workaround for StateSaver to fall back to use qgetenv() when QStandardPaths fails to return XDG_RUNTIME_DIR path.

[Cris Dywan (kalikiana)]

Looking good!

review: Approve

[Bill Filler (bfiller)]

+1 from me, tested on device and working

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp'
--- modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp	2014-09-04 16:24:57 +0000
+++ modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp	2014-10-02 15:21:30 +0000
@@ -72,15 +72,28 @@
         delete m_archive.data();
         m_archive.clear();
     }
-    QString applicationName(qgetenv("APP_ID"));
+    QString applicationName(UCApplication::instance().applicationName());
     if (applicationName.isEmpty()) {
-        applicationName = UCApplication::instance().applicationName();
+        qCritical() << "[StateSaver] Cannot create appstate file, application name not defined.";
+        return;
     }
     // make sure the path is in sync with https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement
     // the file must be saved under XDG_RUNTIME_DIR/<APP_PKGNAME> path.
-    m_archive = new QSettings(QString("%1/%2/statesaver.appstate")
-                              .arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation))
-                              .arg(applicationName), QSettings::NativeFormat);
+    // NOTE!!: we cannot use QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation)
+    // as that is going to perform a chmod +w on the path, see bug #1359831. Therefore we must
+    // fetch the XDG_RUNTIME_DIR either from QStandardPaths::standardLocations() or from env var
+    // see bug https://bugreports.qt-project.org/browse/QTBUG-41735
+    QString runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
+    if (runtimeDir.isEmpty()) {
+        runtimeDir = qgetenv("XDG_RUNTIME_DIR");
+    }
+    if (runtimeDir.isEmpty()) {
+        qCritical() << "[StateSaver] No XDG_RUNTIME_DIR path set, cannot create appstate file.";
+        return;
+    }
+    m_archive = new QSettings(QString("%1/%2/statesaver.appstate").
+                              arg(runtimeDir).
+                              arg(applicationName), QSettings::NativeFormat);
     m_archive->setFallbacksEnabled(false);
 }
 
 
=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp'
--- modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-08-08 10:43:55 +0000
+++ modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-10-02 15:21:30 +0000
@@ -35,6 +35,9 @@
  */
 UCApplication::UCApplication(QObject* parent) : QObject(parent), m_context(0)
 {
+    // Make sure we receive application name changes from C++ modules
+    connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
+            this, &UCApplication::applicationNameChanged);
 }
 
 void UCApplication::setContext(QQmlContext* context) {
@@ -68,7 +71,5 @@
     engine->setOfflineStoragePath(dataFolder);
     // Get Qtlabs.settings to use a sane path
     QCoreApplication::setOrganizationDomain(applicationName);
-
-    Q_EMIT applicationNameChanged();
 }