enable html5 notifications

CMakeLists.txt

@@ -57,6 +57,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 set(DESKTOP_FILE morph-browser.desktop)
+set(PUSH_HELPER_DIR "lib/ubuntu-push-client/legacy-helpers")
 
 # uninstall target
 configure_file(
@@ -94,4 +95,6 @@ add_subdirectory(doc)
 
 install(FILES morph-browser.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/morph-browser)
 install(FILES morph-browser-splash.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/morph-browser)
+install(PROGRAMS push-helper/morph-browser-helper.sh DESTINATION ${PUSH_HELPER_DIR} RENAME morph-browser)
+
 add_subdirectory(click-hooks)

debian/morph-browser-apparmor.manifest

@@ -26,7 +26,7 @@
       ],
       "template_variables": {
         "APP_ID_DBUS": "morph_2dbrowser",
-        "APP_PKGNAME_DBUS": "morph_2dbrowser",
+        "APP_PKGNAME_DBUS": "_",
         "APP_PKGNAME": "morph-browser",
         "CLICK_DIR": "/usr/share/morph-browser"
       },

debian/morph-browser.install

@@ -1,4 +1,5 @@
 usr/bin/morph-browser
+usr/lib/ubuntu-push-client/legacy-helpers
 usr/share/morph-browser/*.qml
 usr/share/morph-browser/qmldir
 usr/share/morph-browser/*.js

push-helper/morph-browser-helper.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp $1 $2

src/app/CMakeLists.txt

@@ -30,6 +30,8 @@ set(COMMONLIB_SRC
     input-method-handler.cpp
     meminfo.cpp
     mime-database.cpp
+    notifications-proxy.cpp
+    pushclient/pushclient.cpp
     session-storage.cpp
     single-instance-manager.cpp
 )
@@ -44,6 +46,7 @@ target_link_libraries(${COMMONLIB}
     Qt5::Qml
     Qt5::Quick
     Qt5::Widgets
+    Qt5DBus
     Qt5WebEngine
     Qt5WebEngineCore
     ${LIBAPPARMOR_LDFLAGS}

src/app/DomainSettingsPage.qml

@@ -171,6 +171,7 @@ FocusScope {
                 readonly property string domain: model.domain
                 readonly property int userAgentId: model.userAgentId
                 readonly property int locationPreference: model.allowLocation
+                readonly property int notificationsPreference: model.allowNotifications
                 height: isCurrentItem ? layout.height : units.gu(5)
                 color: isCurrentItem ? ((theme.palette.selected.background.hslLightness > 0.5) ? Qt.darker(theme.palette.selected.background, 1.05) : Qt.lighter(theme.palette.selected.background, 1.5)) : theme.palette.normal.background
 
@@ -210,12 +211,11 @@ FocusScope {
 
                             CheckBox {
                                 checked: model.allowCustomUrlSchemes
-                                onTriggered: DomainSettingsModel.allowCustomUrlSchemes(model.domain, checked)
+                                onTriggered: DomainSettingsModel.allowCustomUrlSchemes(model.domain, checked, false)
                                 anchors.verticalCenter: parent.verticalCenter
                             }
                         }
 
-
                         Row {
                             spacing: units.gu(1.5)
                             height: units.gu(1)
@@ -234,6 +234,25 @@ FocusScope {
                                anchors.verticalCenter: parent.verticalCenter
                             }
                         }
+
+                        Row {
+                            spacing: units.gu(1.5)
+                            height: units.gu(1)
+                            visible: item.ListView.isCurrentItem
+
+                            Label  {
+                                width: parent.width * 0.5
+                                text: i18n.tr("send notifications")
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            ComboBox {
+                               model: [ i18n.tr("Ask each time"), i18n.tr("Allowed"), i18n.tr("Denied") ]
+                               currentIndex: item.notificationsPreference
+                               onCurrentIndexChanged: DomainSettingsModel.setNotificationsPreference(item.domain, currentIndex, false)
+                               anchors.verticalCenter: parent.verticalCenter
+                            }
+                        }
 
                         Row {
                             spacing: units.gu(1.5)

src/app/NotificationsAccessDialog.qml

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 UBports Foundation
+ *
+ * This file is part of morph-browser.
+ *
+ * morph-browser 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.
+ *
+ * morph-browser 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 Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Dialog {
+    id: dialog
+
+    property string securityOrigin
+    property bool showRememberDecisionCheckBox
+    modal: true
+
+    title: i18n.tr("Permission Request")
+    text: securityOrigin + "<br>" + i18n.tr("This page wants to create notifications.")
+
+    signal allow()
+    signal allowPermanently()
+    signal reject()
+    signal rejectPermanently()
+
+    onAllow: { PopupUtils.close(dialog); }
+    onAllowPermanently: { PopupUtils.close(dialog); }
+    onReject: { PopupUtils.close(dialog); }
+    onRejectPermanently: { PopupUtils.close(dialog); }
+
+    ListItemLayout {
+        visible: showRememberDecisionCheckBox
+        title.text: i18n.tr("Remember decision")
+        CheckBox {
+            id: rememberDecisionCheckBox
+         }
+    }
+    Button {
+        objectName: "allow"
+        text: i18n.tr("Allow")
+        color: theme.palette.normal.positive
+        onClicked: rememberDecisionCheckBox.checked ? allowPermanently() : allow()
+    }
+    Button {
+        objectName: "deny"
+        text: i18n.tr("Deny")
+        onClicked: rememberDecisionCheckBox.checked ? rejectPermanently() : reject()
+    }
+}

src/app/WebViewImpl.qml

@@ -231,6 +231,44 @@ WebView {
              mediaAccessDialog.origin = securityOrigin;
              mediaAccessDialog.feature = feature;
              break;
+
+             case WebEngineView.Notifications:
+
+             var domain = UrlUtils.extractHost(securityOrigin);
+             var notificationsPreference = DomainSettingsModel.getNotificationsPreference(domain);
+
+             if (notificationsPreference === DomainSettingsModel.AllowNotificationsAccess)
+             {
+                 grantFeaturePermission(securityOrigin, feature, true);
+                 return;
+             }
+
+             if (notificationsPreference === DomainSettingsModel.DenyNotificationsAccess)
+             {
+                 grantFeaturePermission(securityOrigin, feature, false);
+                 return;
+             }
+
+             var notificationsAccessDialog = PopupUtils.open(Qt.resolvedUrl("NotificationsAccessDialog.qml"), this);
+             notificationsAccessDialog.securityOrigin = securityOrigin;
+             notificationsAccessDialog.showRememberDecisionCheckBox = (domain !== "") && ! incognito
+             notificationsAccessDialog.allow.connect(function() {
+                 grantFeaturePermission(securityOrigin, feature, true);
+                 DomainSettingsModel.setNotificationsPreference(domain, DomainSettingsModel.AllowNotificationsAccess, true);
+             });
+             notificationsAccessDialog.allowPermanently.connect(function() {
+                 grantFeaturePermission(securityOrigin, feature, true);
+                 DomainSettingsModel.setNotificationsPreference(domain, DomainSettingsModel.AllowNotificationsAccess, false);
+             });
+             notificationsAccessDialog.reject.connect(function() {
+                 grantFeaturePermission(securityOrigin, feature, false);
+                 DomainSettingsModel.setNotificationsPreference(domain, DomainSettingsModel.DenyNotificationsAccess, true);
+             });
+             notificationsAccessDialog.rejectPermanently.connect(function() {
+                 grantFeaturePermission(securityOrigin, feature, false);
+                 DomainSettingsModel.setNotificationsPreference(domain, DomainSettingsModel.DenyNotificationsAccess, false);
+             });
+             break;
          }
     }
 

src/app/browserapplication.cpp

@@ -45,6 +45,7 @@
 #include "input-method-handler.h"
 #include "meminfo.h"
 #include "mime-database.h"
+#include "notifications-proxy.h"
 #include "session-storage.h"
 
 BrowserApplication::BrowserApplication(int& argc, char** argv)
@@ -107,6 +108,7 @@ MAKE_SINGLETON_FACTORY(DownloadsModel)
 MAKE_SINGLETON_FACTORY(FileOperations)
 MAKE_SINGLETON_FACTORY(MemInfo)
 MAKE_SINGLETON_FACTORY(MimeDatabase)
+MAKE_SINGLETON_FACTORY(NotificationsProxy)
 MAKE_SINGLETON_FACTORY(UserAgentsModel)
 
 bool BrowserApplication::initialize(const QString& qmlFileSubPath
@@ -202,6 +204,7 @@ bool BrowserApplication::initialize(const QString& qmlFileSubPath
     qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
     qmlRegisterSingletonType<MemInfo>(uri, 0, 1, "MemInfo", MemInfo_singleton_factory);
     qmlRegisterSingletonType<MimeDatabase>(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory);
+    qmlRegisterSingletonType<NotificationsProxy>(uri, 0, 1, "NotificationsProxy", NotificationsProxy_singleton_factory);
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
     qmlRegisterSingletonType<UserAgentsModel>(uri, 0, 1, "UserAgentsModel", UserAgentsModel_singleton_factory);