The content of this page is under construction.
- `, "") - root.visible = true; + function loadHTML(html) { + webView.loadHtml(html) } Rectangle { @@ -46,16 +39,19 @@ Item { } Rectangle { anchors.fill: parent - anchors.margins: overlay ? ProtonStyle.web_view_overlay_margin : 0 + anchors.bottomMargin: overlay ? ProtonStyle.web_view_overlay_vertical_margin : 0 + anchors.leftMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_margin : 0 + anchors.rightMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_margin : 0 + anchors.topMargin: overlay ? ProtonStyle.web_view_overlay_vertical_margin : 0 color: root.colorScheme.background_norm radius: ProtonStyle.web_view_corner_radius ColumnLayout { anchors.bottomMargin: 0 anchors.fill: parent - anchors.leftMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_margin : 0 - anchors.rightMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_margin : 0 - anchors.topMargin: overlay ? ProtonStyle.web_view_overlay_vertical_margin : 0 + anchors.leftMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_padding : 0 + anchors.rightMargin: overlay ? ProtonStyle.web_view_overlay_horizontal_padding : 0 + anchors.topMargin: overlay ? ProtonStyle.web_view_overlay_vertical_padding : 0 spacing: 0 Rectangle { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/Template.html b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/Template.html new file mode 100644 index 00000000..b9fad96e --- /dev/null +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/Template.html @@ -0,0 +1,16 @@ + + + + ++ Proton does not have access to the content of your messages, so it cannot share your unencrypted messages with your email client from the + Proton servers. +
++ Email clients such as Microsoft Outlook, Mozilla Thunderbird and Apple Mail use standard protocols named IMAP and SMTP to receive and send emails. +
++ Even though the IMAP and SMTP protocols can use secure channels (using SSL/TLS), they do not offer support for encrypted messages. + Because Proton does not have access to the content of your messages, it is not possible to configure your email client to connect directly to + Proton servers. +
++ The key to solving this problem is Bridge. Once installed on your computer and connected to your Proton account, Bridge can access your + encrypted messages stored on the Proton servers. Bridge integrates an IMAP and a SMTP server that run on your computer and are accessible only + to applications executing on your machine. Your email client connects to these local servers and Bridge is responsible for seamlessly encrypting + and decrypting the messages that you send and receive. +
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyCertificate.html b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyCertificate.html new file mode 100644 index 00000000..045ab10b --- /dev/null +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyCertificate.html @@ -0,0 +1,19 @@ ++ Apple Mail requires a secure channel for communications with email servers, and the server needs to be acknowledged as trusted. +
++ In order to communicate with Bridge, Apple Mail requires secure connections using SSL/TLS. This cryptographic protocol includes an identity + verification system using certificates. For publicly available servers, certificates are normally issued and digitally signed by a certificate + authority, such as Let's Encrypt. This is not possible for Bridge, as the IMAP and SMTP servers are running on your own computer, and are not + accessible from any network (local or internet). +
++ The solution is to use a self-signed certificate. When setting up an email account where the server provides a self-signed certificate, most + email clients will issue a warning asking you whether you trust the server or not, because the certificate was not issued by a certificate + authority. +
++ Apple Mail requires an extra step. It will simply refuse to connect if the certificate is not set as trusted. Bridge solves this by storing this + certificate in the macOS keychain. This operation requires that you provide your macOS account password. +
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyProfileWarning.html b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyProfileWarning.html new file mode 100644 index 00000000..3b426460 --- /dev/null +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/Help/WhyProfileWarning.html @@ -0,0 +1,21 @@ ++ This warning indicates that the certificate used to secure the communication channel between Bridge and your email client is not signed by a + trusted third party. +
++ In order to communicate with Bridge, Apple Mail requires secure connections using SSL/TLS. This cryptographic protocol includes an identity + verification system using certificates. For publicly available servers, certificates are normally issued and digitally signed by a certificate + authority, such as Let's Encrypt. This is not possible for Bridge, as the IMAP and SMTP servers are running on your own computer, and are not + accessible from any network (local or internet). +
++ The solution is to use a self-signed certificate. When setting up an email account where the server provides a self-signed certificate, most + email clients will issue a warning asking you whether you trust the server or not, because the certificate was not issued by a certificate + authority. The client has no way of verifying that the server is who it pretends to be. +
++ You can safely ignore this warning. The check concerns only the communication between your email client and Bridge, which occurs within your + computer. On the other end, the communication between Bridge and the Proton servers uses the HTTPS protocol, and the identity of the remote + server is verified by Bridge. +
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml index d7516a3b..b537c44e 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml @@ -28,7 +28,6 @@ Item { signal appleMailAutoconfigProfileInstallPageShow function showAutoconfig() { - certificateInstall.waitingForCert = false; if (Backend.isTLSCertificateInstalled()) { showProfileInstall(); } else { @@ -41,6 +40,7 @@ Item { appleMailAutoconfigCertificateInstallPageShown(); } function showProfileInstall() { + profileInstall.reset(); stack.currentIndex = ClientConfigAppleMail.Screen.ProfileInstall; appleMailAutoconfigProfileInstallPageShow(); } @@ -193,6 +193,13 @@ Item { // stack index 1 Item { id: profileInstall + + property bool profilePaneLaunched: false + + function reset() { + profilePaneLaunched = false; + } + Layout.fillHeight: true Layout.fillWidth: true @@ -239,11 +246,15 @@ Item { Button { Layout.fillWidth: true colorScheme: wizard.colorScheme - text: qsTr("Install the profile") + text: profileInstall.profilePaneLaunched ? qsTr("I have installed the profile") : qsTr("Install the profile") onClicked: { - wizard.user.configureAppleMail(wizard.address); - wizard.showClientConfigEnd(); + if (profileInstall.profilePaneLaunched) { + wizard.showClientConfigEnd(); + } else { + wizard.user.configureAppleMail(wizard.address); + profileInstall.profilePaneLaunched = true; + } } } Button { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml index 88cf9e27..0def652c 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml @@ -26,7 +26,7 @@ Item { function showAppleMailAutoconfigCertificateInstall() { showAppleMailAutoconfigCommon(); descriptionLabel.text = qsTr("Apple Mail configuration is mostly automated, but in order to work, Bridge needs to install a certificate in your keychain."); - linkLabel1.setCallback(showUnderConstruction, qsTr("Why is this certificate needed?"), false); + linkLabel1.setCallback(function() { Backend.showHelpOverlay("WhyCertificate.html"); }, qsTr("Why is this certificate needed?"), false); } function showAppleMailAutoconfigCommon() { titleLabel.text = ""; @@ -39,7 +39,7 @@ Item { function showAppleMailAutoconfigProfileInstall() { showAppleMailAutoconfigCommon(); descriptionLabel.text = qsTr("The final step before you can start using Apple Mail is to install the Bridge server profile in the system preferences.\n\nAdding a server profile is necessary to ensure that your Mac can receive and send Proton Mails."); - linkLabel1.setCallback(showUnderConstruction, qsTr("Why is there a yellow warning sign?"), false); + linkLabel1.setCallback(function() { Backend.showHelpOverlay("WhyProfileWarning.html"); }, qsTr("Why is there a yellow warning sign?"), false); linkLabel2.setCallback(wizard.showClientParams, qsTr("Configure Apple Mail manually"), false); } function showClientSelector(newAccount = true) { @@ -63,15 +63,12 @@ Item { function showOnboarding() { titleLabel.text = (Backend.users.count === 0) ? qsTr("Welcome to\nProton Mail Bridge") : qsTr("Add a Proton Mail account"); descriptionLabel.text = qsTr("Bridge is the gateway between your Proton account and your email client. It runs in the background and encrypts and decrypts your messages seamlessly. "); - linkLabel1.setCallback(showUnderConstruction, qsTr("Why do I need Bridge?"), false); + linkLabel1.setCallback(function() { Backend.showHelpOverlay("WhyBridge.html"); }, qsTr("Why do I need Bridge?"), false); linkLabel2.clear(); root.iconSource = "/qml/icons/img-welcome.svg"; root.iconHeight = 148; root.iconWidth = 265; } - function showUnderConstruction() { - wizard.showUnderConstruction(); - } Connections { function onLogin2FARequested() { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml index 060d3b93..3248184a 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml @@ -43,7 +43,6 @@ Item { signal bugReportRequested signal wizardEnded - signal showUnderConstruction function _showClientConfig() { showClientConfig(root.user, root.address, false);