Merge lp:~osomon/webbrowser-app/saveSessionPeriodically into lp:webbrowser-app

[Olivier Tilloy]

Save the session periodically to mitigate the situation where multiple new tabs had been created when the browser crashes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1705/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2511/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/462
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/462
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2174/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19998

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/saveSessionPeriodically]

988. By Olivier Tilloy on 2015-04-29

Also save the current session when tabs are open/closed, and when the current tab changes.

989. By Olivier Tilloy on 2015-04-29

Delay session saving by 500 msecs to avoid writing the session file twice in a row when e.g. creating a new tab.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1708/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2527/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/465
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/465
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2189/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2525
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2525/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20024

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-04-22 10:25:50 +0000
+++ src/app/webbrowser/Browser.qml	2015-04-29 14:09:26 +0000
@@ -915,6 +915,18 @@
             return tabComponent.createObject(tabContainer, properties)
         }
     }
+    Timer {
+        id: delayedSessionSaver
+        interval: 500
+        onTriggered: session.save()
+    }
+    Timer {
+        // Save session periodically to mitigate state loss when the application crashes
+        interval: 60000 // every minute
+        repeat: true
+        running: true
+        onTriggered: delayedSessionSaver.restart()
+    }
     Connections {
         target: Qt.application
         onStateChanged: {
@@ -927,6 +939,11 @@
         }
         onAboutToQuit: session.save()
     }
+    Connections {
+        target: tabsModel
+        onCurrentTabChanged: delayedSessionSaver.restart()
+        onCountChanged: delayedSessionSaver.restart()
+    }
 
     // Delay instantiation of the first webview by 1 msec to allow initial
     // rendering to happen. Clumsy workaround for http://pad.lv/1359911.