Merge lp:~osomon/webbrowser-app/sessionstorage-race into lp:webbrowser-app

[Olivier Tilloy]

Tentative fix for a bug where the session state stored on disk is apparently corrupted, thus discarding the current browsing session.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1383
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2673/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1426
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1426
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6776
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6776/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28030

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2673/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/session-storage.cpp'
--- src/app/session-storage.cpp	2014-08-08 15:31:23 +0000
+++ src/app/session-storage.cpp	2016-03-14 18:36:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// system
+#include <cstdio>
+
 // Qt
+#include <QtCore/QDateTime>
 #include <QtCore/QFile>
 
 // local
@@ -73,10 +77,13 @@
 
 void SessionStorage::store(const QString& data) const
 {
-    QFile file(m_dataFile);
+    QString tempName = m_dataFile + "." + \
+        QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch());;
+    QFile file(tempName);
     if (file.open(QIODevice::WriteOnly)) {
         file.write(data.toUtf8());
         file.close();
+        rename(tempName.toUtf8().constData(), m_dataFile.toUtf8().constData());
     }
 }