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)

[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

[costales (costales)]

Hi Joerg. I'm doing tests and this is working :))

Please, one question. Why this?

=== modified file 'nav/index.html'
--- nav/index.html 2016-06-08 17:14:51 +0000
+++ nav/index.html 2016-06-13 18:14:57 +0000
@@ -593,6 +593,7 @@
    nav.set_route_status('yes');
    ui.update();
    qml_set_center_onpos(2);
+ qml_set_route_status();
   }
  </script>

Thanks |o/

[JkB (joergberroth)]

Hey,
This line is needed to always set the current end coords on qml side.
This enables to set the last active route after an oxide crash again
automtically.

Am Montag, 13. Juni 2016 20:20:31 CEST schrieb costales
<email address hidden>:
> Hi Joerg. I'm doing tests and this is working :))
>
> Please, one question. Why this?
>
> === modified file 'nav/index.html'
> --- nav/index.html 2016-06-08 17:14:51 +0000
> +++ nav/index.html 2016-06-13 18:14:57 +0000
> @@ -593,6 +593,7 @@
> nav.set_route_status('yes');
> ui.update();
> qml_set_center_onpos(2);
> + qml_set_route_status();
> }
> </script>
>
> Thanks |o/

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[costales (costales)]

From my knowledge and tests more than 1 call between qml + html
created weird conflicts.

Could be that set in the initialization call on the new .qml?

Best regards!

[JkB (joergberroth)]

?
So far i have not experieced any issues with that.
It is important, that qml side is updated with the route details ad soon as
a route starts. Maybe you find a better place for the command....

Am Montag, 13. Juni 2016 21:57:23 CEST schrieb costales
<email address hidden>:
>>From my knowledge and tests more than 1 call between qml + html
> created weird conflicts.
>
> Could be that set in the initialization call on the new .qml?
>
> Best regards!
>

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[lp:~joergberroth/unav/WebViewCrashHandling]

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 'qml/Favorites.qml'
--- qml/Favorites.qml	2016-05-05 19:21:33 +0000
+++ qml/Favorites.qml	2016-06-14 19:54:18 +0000
@@ -114,6 +114,8 @@
                                 mainPageStack.removePages(mainPageStack.primaryPage)
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes';
+                            mainPageStack.endLat = model.lat;
+                            mainPageStack.endLng = model.lng;
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
                         }
                     },
 
=== modified file 'qml/Location.qml'
--- qml/Location.qml	2016-06-03 13:52:53 +0000
+++ qml/Location.qml	2016-06-14 19:54:18 +0000
@@ -256,6 +256,8 @@
                                 mainPageStack.removePages(mainPageStack.primaryPage)
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
+                            mainPageStack.endLat = model.lat;
+                            mainPageStack.endLng = model.lng;
                             mainPageStack.executeJavaScript("calc2coord(" + model.lat + "," + model.lng + ");")
                         }
                     },
@@ -341,6 +343,8 @@
                                 mainPageStack.removePages(mainPageStack.primaryPage)
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes';
+                            mainPageStack.endLat = model.lat;
+                            mainPageStack.endLng = model.lng;
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
                         }
                     },
 
=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-06-08 17:16:09 +0000
+++ qml/Main.qml	2016-06-14 19:54:18 +0000
@@ -150,6 +150,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.
@@ -368,19 +369,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;
                     }
@@ -424,12 +424,31 @@
                                     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 + ");");
+                                    notificationBar.text = i18n.tr("Active route lost. Recalculating it…");
+                                    notificationBar.warning();
+                                } 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: {
@@ -522,17 +541,8 @@
                     }
                 }
 
-                Timer {
-                    id: notificationBarTimer
-                    interval: 8000
-                    repeat: false
-                    onTriggered: {
-                        notifiactionBar.visible = false
-                    }
-                }
-
                 NotificationBar {
-                    id: notifiactionBar
+                    id: notificationBar
                 }
 
                 XmlListModel {
@@ -648,9 +658,8 @@
                         Column {
                             height: routePageGrid.height
                             spacing: 0
-                            Component.onCompleted: {
-                                mainPageStack.executeJavaScript("qml_set_route_status();")
-                            }
+                            
+                            Component.onCompleted: mainPageStack.executeJavaScript("qml_set_route_status()")
 
                             Row {
                                 id: gridRow
@@ -731,6 +740,8 @@
                                         goThereActionPopover.hide();
                                         mainPageStack.center_onpos = 2;
                                         mainPageStack.routeState = 'yes';
+                                        mainPageStack.endLat = mainPageStack.clickedLat;
+                                        mainPageStack.endLng = mainPageStack.clickedLng;
                                         mainPageStack.executeJavaScript("calc2coord(" + mainPageStack.clickedLat + ", " + mainPageStack.clickedLng + ");");
                                     }
                                 }
@@ -830,6 +841,8 @@
                                         goThereActionPopover.hide();
                                         mainPageStack.center_onpos = 2;
                                         mainPageStack.routeState = 'yes';
+                                        mainPageStack.endLat = mainPageStack.clickedLat;
+                                        mainPageStack.endLng = mainPageStack.clickedLng;
                                         mainPageStack.executeJavaScript("calc2coord(" + mainPageStack.clickedLat + ", " + mainPageStack.clickedLng + ");");
                                     }
                                 }
 
=== modified file 'qml/PoiDetailsPage.qml'
--- qml/PoiDetailsPage.qml	2016-06-03 13:50:14 +0000
+++ qml/PoiDetailsPage.qml	2016-06-14 19:54:18 +0000
@@ -199,6 +199,8 @@
                             }
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
+                            mainPageStack.endLat = mainPageStack.clickedLat;
+                            mainPageStack.endLng = mainPageStack.clickedLng;
                             mainPageStack.executeJavaScript("calc2coord("+ mainPageStack.clickedLat + "," + mainPageStack.clickedLng + ");");
                         } else if (model.mode === "SAVE") {
                             var incubator = mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("SearchPage.qml"), {favLat: mainPageStack.clickedLat, favLng: mainPageStack.clickedLng, favName: poiName});
 
=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-05-05 19:21:33 +0000
+++ qml/PoiListPage.qml	2016-06-14 19:54:18 +0000
@@ -273,6 +273,8 @@
                                 mainPageStack.removePages(mainPageStack.primaryPage)
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
+                            mainPageStack.endLat = model.lat;
+                            mainPageStack.endLng = model.lng;
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
                         }
                     },
 
=== modified file 'qml/SearchPage.qml'
--- qml/SearchPage.qml	2016-05-05 19:21:33 +0000
+++ qml/SearchPage.qml	2016-06-14 19:54:18 +0000
@@ -27,9 +27,7 @@
     property string favLng
     property string favName
 
-    Component.onCompleted: {
-        mainPageStack.executeJavaScript("qml_set_route_status();")
-    }
+    Component.onCompleted: mainPageStack.executeJavaScript("qml_set_route_status()")
 
     Component.onDestruction: {
         // Hide 2nd column when returning to the map to avoid an empty white column
 
=== modified file 'qml/components/NotificationBar.qml'
--- qml/components/NotificationBar.qml	2016-05-22 17:20:29 +0000
+++ qml/components/NotificationBar.qml	2016-06-14 19:54:18 +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-14 19:54:18 +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-14 19:54:18 +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()
+    }
+}