Merge branch 'release/v1.3.X' into devel

internal/frontend/qml/Gui.qml

@@ -237,6 +237,14 @@ Item {
             winMain.tlsBarState="notOK"
         }
 
+        onShowIMAPCertTroubleshoot : {
+            go.notifyBubble(1, qsTr(
+                "Bridge was unable to establish a connection with your Email client. <br> <a href=\"https://protonmail.com/support/knowledge-base/bridge-ssl-connection-issue\">Learn more</a> <br>",
+                "notification message"
+            ))
+        }
+
+
     }
 
     Timer {

internal/frontend/qml/tst_Gui.qml

@@ -110,7 +110,7 @@ Window {
         ListElement { title: "Internet off"   }
         ListElement { title: "NeedUpdate"     }
         ListElement { title: "UpToDate"       }
-        ListElement { title: "ForceUpdate"   }
+        ListElement { title: "ForceUpdate"    }
         ListElement { title: "Linux"          }
         ListElement { title: "Windows"        }
         ListElement { title: "Macos"          }
@@ -122,6 +122,7 @@ Window {
         ListElement { title: "Minimize this"  }
         ListElement { title: "SendAlertPopup" }
         ListElement { title: "TLSCertError"   }
+        ListElement { title: "IMAPCertError"  }
     }
 
     ListView {
@@ -208,6 +209,9 @@ Window {
                     case "TLSCertError" :
                     go.showCertIssue()
                     break;
+                    case "IMAPCertError" :
+                    go.showIMAPCertTroubleshoot()
+                    break;
                     default :
                     console.log("Not implemented " + data)
                 }
@@ -310,6 +314,7 @@ Window {
         signal failedAutostartCode(string code)
 
         signal showCertIssue()
+        signal showIMAPCertTroubleshoot()
 
         signal updateFinished(bool hasError)
 

internal/frontend/qt/frontend.go

@@ -188,6 +188,7 @@ func (s *FrontendQt) watchEvents() {
 	updateApplicationCh := s.getEventChannel(events.UpgradeApplicationEvent)
 	newUserCh := s.getEventChannel(events.UserRefreshEvent)
 	certIssue := s.getEventChannel(events.TLSCertIssue)
+	imapCertIssue := s.getEventChannel(events.IMAPTLSBadCert)
 	for {
 		select {
 		case errorDetails := <-errorCh:
@@ -227,6 +228,8 @@ func (s *FrontendQt) watchEvents() {
 			s.Qml.LoadAccounts()
 		case <-certIssue:
 			s.Qml.ShowCertIssue()
+		case <-imapCertIssue:
+			s.Qml.ShowIMAPCertTroubleshoot()
 		}
 	}
 }

internal/frontend/qt/ui.go

@@ -135,6 +135,7 @@ type GoQMLInterface struct {
 	_ func(x, y float32)                      `slot:"saveOutgoingNoEncPopupCoord"`
 	_ func(recipient string)                  `signal:"showNoActiveKeyForRecipient"`
 	_ func()                                  `signal:"showCertIssue"`
+	_ func()                                  `signal:"ShowIMAPCertTroubleshoot"`
 
 	_ func()              `slot:"startUpdate"`
 	_ func(hasError bool) `signal:"updateFinished"`