Merge lp:~joergberroth/unav/WebViewCrashHandling into lp:unav

[JkB]

* added WebProcessMonitor.qml from webbrowser-app to manage webview kills
  - notification that map crashed.
  - try to reload webview if it was killed.
  - if a route was active, it will be reloaded again.
* adjusted NotificationBar.qml and some code clean up (NotificationBarTimer handling)

* added WebProcessMonitor.qml from webbrowser-app to manage webview kills
  - notification that map crashed.
  - try to reload webview if it was killed.
  - if a route was active, it will be reloaded again.
* adjusted NotificationBar.qml and some code clean up (NotificationBarTimer handling)

[lp:~joergberroth/unav/WebViewCrashHandling]

70. By JkB on 2016-05-27

* small format fix

71. By JkB on 2016-05-29

*add another notification
*wait 500ms before recalculating route
*modified a notifiacation in WebProcessMonitor.qml

72. By JkB on 2016-05-29

*ensure that endLat/endLng will always be set in Main.qml if route_state changes to "yes"

[costales (costales)]

It didn't work for me.
I used uNav in the morning.
After ~10 hours, I opened and I saw the map and the red popup.
uNav was freezed ~5 seconds and then, the system killed it.

review: Needs Fixing

[lp:~joergberroth/unav/WebViewCrashHandling]

73. By JkB on 2016-06-01

*removed typo in id
*added close() signal

74. By JkB on 2016-06-03

*merge with trunk

75. By JkB on 2016-06-03

*removed timer and improved popup handling

76. By JkB on 2016-06-05

*changed error messages text

77. By JkB on 2016-06-14

*merge with costales branch

78. By JkB on 2016-06-14

* modified notification text

Unmerged revisions

78. By JkB on 2016-06-14

* modified notification text

77. By JkB on 2016-06-14

*merge with costales branch

76. By JkB on 2016-06-05

*changed error messages text

75. By JkB on 2016-06-03

*removed timer and improved popup handling

74. By JkB on 2016-06-03

*merge with trunk

73. By JkB on 2016-06-01

*removed typo in id
*added close() signal

72. By JkB on 2016-05-29

*ensure that endLat/endLng will always be set in Main.qml if route_state changes to "yes"

71. By JkB on 2016-05-29

*add another notification
*wait 500ms before recalculating route
*modified a notifiacation in WebProcessMonitor.qml

70. By JkB on 2016-05-27

* small format fix

69. By JkB on 2016-05-27

* added WebProcessMonitor.qml from webbrowser-app to manage webview kills
  - notification that map crashed.
  - try to reload webview if it was killed.
  - if a route was active, it will be reloaded again.
* adjusted NotificationBar.qml and some code clean up (NotificationBarTimer handling)

=== modified file 'nav/index.html'
--- nav/index.html	2016-05-20 17:23:21 +0000
+++ nav/index.html	2016-06-05 18:24:36 +0000
@@ -575,6 +575,7 @@
 			nav.set_route_status('yes');
 			ui.update();
 			qml_set_center_onpos(2);
+                        qml_set_route_status();
 		}
 	</script>
 

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-06-03 13:46:57 +0000
+++ qml/Main.qml	2016-06-05 18:24:36 +0000
@@ -149,6 +149,7 @@
             property int center_onpos: 0 // 0 GPS off, 1 GPS on + not center, 2 GPS on + center
             property bool favPopup: false
             property bool onLoadingExecuted: false
+            property bool forcedReload: false
 
             property string usContext: "messaging://"
             // Workaround: as long as map keeps a webcontainer this function handles js events to the webview.
@@ -367,19 +368,18 @@
                         
                         case "http://show_notification/":
                             if (params[1] === "speed_camera_error") {
-                                notifiactionBar.text =  i18n.tr("Error getting speed cameras!");
+                                notificationBar.text =  i18n.tr("Error getting speed cameras!");
                             }
-                        switch (params[0]) {
+                            switch (params[0]) {
                             case "info":
-                                notifiactionBar.info();
+                                notificationBar.info();
                                 break;
                             case "warning":
-                                notifiactionBar.warning();
+                                notificationBar.warning();
                                 break;
                             case "critical":
-                                notifiactionBar.critical();
+                                notificationBar.critical();
                             }
-                            notificationBarTimer.start();
                         }
                         request.action = Oxide.NavigationRequest.ActionReject;
                     }
@@ -422,12 +422,29 @@
                                     goThereActionPopover.show();
                                 }
                             }
+
+                            if (mainPageStack.forcedReload === true && mainPageStack.routeState === "yes") {
+                                mainPageStack.forcedReload = false
+                                notificationBar.close()
+
+                                if ( mainPageStack.endLat !== "null" && mainPageStack.endLng !== "null") {
+                                    mainPageStack.center_onpos = 2;
+                                    mainPageStack.executeJavaScript("calc2coord(" + mainPageStack.endLat + "," + mainPageStack.endLng + ");")
+                                } else {
+                                    notificationBar.text = i18n.tr("Sorry, route info could not be retrieved. Please, re-set the route.")
+                                    notificationBar.warning()
+                                }
+                            }
                         }
                     }
 
                     onGeolocationPermissionRequested: { request.allow() }
                 }
 
+                WebProcessMonitor{
+                    webview: webview
+                }
+
                 Connections {
                     target: UriHandler
                     onOpened: {
@@ -520,17 +537,8 @@
                     }
                 }
 
-                Timer {
-                    id: notificationBarTimer
-                    interval: 8000
-                    repeat: false
-                    onTriggered: {
-                        notifiactionBar.visible = false
-                    }
-                }
-
                 NotificationBar {
-                    id: notifiactionBar
+                    id: notificationBar
                 }
 
                 XmlListModel {

=== modified file 'qml/components/NotificationBar.qml'
--- qml/components/NotificationBar.qml	2016-05-22 17:20:29 +0000
+++ qml/components/NotificationBar.qml	2016-06-05 18:24:36 +0000
@@ -25,30 +25,41 @@
     signal info()
     signal warning()
     signal critical()
+    signal close()
+
+    onClose: {
+        notificationBar.visible = false
+    }
 
     onInfo: {
+        close()
         notificationLabel.color = UbuntuColors.slate
         notificationRectangle.color = "#FFFFFF"
         notificationRectangle.visible = true;
         notificationIcon.name = ""
         notificationLabel.fontSize = "medium"
         notificationRectangle.height = notificationLabel.height + units.gu(1)
+        notificationBarTimer.restart()
     }
     onWarning: {
+        close()
         notificationLabel.color = "#FFFFFF"
         notificationRectangle.color = UbuntuColors.orange;
         notificationRectangle.visible = true;
         notificationLabel.fontSize = "large"
         notificationIcon.name = "dialog-warning-symbolic"
         notificationRectangle.height = notificationLabel.height + units.gu(4)
+        notificationBarTimer.restart()
     }
     onCritical: {
+        close()
         notificationLabel.color = "#FFFFFF"
         notificationRectangle.color = UbuntuColors.red
         notificationRectangle.visible = true;
         notificationLabel.fontSize = "large"
         notificationIcon.name = "dialog-error-symbolic"
         notificationRectangle.height = notificationLabel.height + units.gu(4)
+        notificationBarTimer.restart()
     }
 
     width: parent.width
@@ -58,6 +69,14 @@
         top: goThereActionPopover.isShown ? goThereActionPopover.bottom : navigationPage.header.bottom
     }
 
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            notificationBarTimer.stop()
+            notificationBar.visible = false
+        }
+    }
+
     Icon {
         id: notificationIcon
         width: units.gu(3.5)
@@ -80,9 +99,18 @@
             right: parent.right
             verticalCenter: parent.verticalCenter
         }
-        horizontalAlignment: Text.AlignHCenter
-        maximumLineCount: 3
+        horizontalAlignment: notificationIcon.visible ? Text.AlignLeft : Text.AlignHCenter
+        maximumLineCount: 6
         wrapMode: Text.WordWrap
         elide: Text.ElideRight
     }
+
+    Timer {
+        id: notificationBarTimer
+        interval: 8000
+        repeat: false
+        onTriggered: {
+            notificationBar.close()
+        }
+    }
 }

=== modified file 'qml/components/POIQuickAccessGridView.qml'
--- qml/components/POIQuickAccessGridView.qml	2016-05-22 18:08:53 +0000
+++ qml/components/POIQuickAccessGridView.qml	2016-06-05 18:24:36 +0000
@@ -87,17 +87,15 @@
             if (status === XmlListModel.Error) {
                 console.log(errorString());
                 source = "";
-                notificationBarTimer.start();
-                notifiactionBar.text = i18n.tr("Error getting results. Please, check your data connection.");
-                notifiactionBar.critical();
+                notificationBar.text = i18n.tr("Error getting results. Please, check your data connection.");
+                notificationBar.critical();
             }
             if (status === XmlListModel.Ready && count === 0) {
-                notificationBarTimer.start();
-                notifiactionBar.text = i18n.tr("Sorry, no results found nearby.");
-                notifiactionBar.info();
+                notificationBar.text = i18n.tr("Sorry, no results found nearby.");
+                notificationBar.info();
             }
             if (status === XmlListModel.Ready && count >> 0) {
-                notifiactionBar.visible = false;
+                notificationBar.close()
                 mainPageStack.executeJavaScript("ui.markers_POI_set(" + JSON.stringify(poiXmlModel.allPOI()) + ")");
                 mainPageStack.center_onpos = 1;
                 goThereActionPopover.hide();
@@ -170,13 +168,13 @@
                     mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("../PoiQuickAccessPage.qml"))
                 } else {
                     if (mainPageStack.currentLat === 'null' || mainPageStack.currentLng === 'null') {
-                        notifiactionBar.text = i18n.tr("Current position unknown. Try again after a position update.");
-                        notifiactionBar.info();
+                        notificationBar.text = i18n.tr("Current position unknown. Try again after a position update.");
+                        notificationBar.info();
                     }
                     else {
                         poiXmlModel.clear();
-                        notifiactionBar.text = i18n.tr("Searching…");
-                        notifiactionBar.info();
+                        notificationBar.text = i18n.tr("Searching…");
+                        notificationBar.info();
                         poiXmlModel.distance = model.distance;
                         poiXmlModel.clause = model.clause;
                         poiXmlModel.search();

=== added file 'qml/components/WebProcessMonitor.qml'
--- qml/components/WebProcessMonitor.qml	1970-01-01 00:00:00 +0000
+++ qml/components/WebProcessMonitor.qml	2016-06-05 18:24:36 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import com.canonical.Oxide 1.9 as Oxide
+
+Item {
+    id: monitor
+
+    visible: false
+
+    property var webview: null
+
+    readonly property bool killed: webview &&
+                                   (webview.webProcessStatus === Oxide.WebView.WebProcessKilled)
+    readonly property bool crashed: webview &&
+                                    (webview.webProcessStatus === Oxide.WebView.WebProcessCrashed)
+
+    // When the renderer process is killed (most likely by the system’s
+    // OOM killer), try to reload the page once, and if this results in
+    // the process being killed again within one minute, then display
+    // the sad tab.
+
+    readonly property int killedRetries: internal.killedRetries
+
+    QtObject {
+        id: internal
+        property int killedRetries: 0
+    }
+
+    Connections {
+        target: webview
+        onWebProcessStatusChanged: {
+            if (webview.webProcessStatus === Oxide.WebView.WebProcessKilled) {
+                if (internal.killedRetries == 0) {
+                    // Do not attempt reloading right away, this would result in a crash
+                    delayedReload.restart()
+                    console.log("Webview was killed!")
+                    if (mainPageStack.routeState === "yes" ) {
+                        notificationBar.text = i18n.tr("Something went wrong.")
+                            + "\n" + i18n.tr("Reloading the map and the last active route…")
+                    } else {
+                        notificationBar.text = i18n.tr("Something went wrong.")
+                                + "\n" + i18n.tr("Reloading the map…")
+                    }
+                    notificationBar.critical()
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: delayedReload
+        interval: 100
+        onTriggered: {
+            monitorTimer.restart()
+            mainPageStack.onLoadingExecuted = false
+            mainPageStack.forcedReload = true
+            navigationPage.buttonsEnabled = false
+            monitor.webview.reload()
+            console.log("Trying to reload the webview…")
+            internal.killedRetries++
+        }
+    }
+
+    Timer {
+        id: monitorTimer
+        interval: 60000 // 1 minute
+        onTriggered: internal.killedRetries = 0
+    }
+
+    onWebviewChanged: {
+        internal.killedRetries = 0
+        delayedReload.stop()
+        monitorTimer.stop()
+    }
+}