Add Socket::Plain variant

Constant values are the same as desktop uses.

Invalid flags are converted to STARTTLS.

Author: Alexander Krotov

src/configure/mod.rs

@@ -395,6 +395,7 @@ pub fn loginparam_new_to_old(context: &Context, servers: &LoginParamNew) -> Opti
             p.mail_port = imap.port as i32;
             p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
             p.server_flags |= match imap.socket {
+                provider::Socket::Plain => DC_LP_SMTP_SOCKET_PLAIN,
                 provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS,
                 provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL,
             };
@@ -404,8 +405,9 @@ pub fn loginparam_new_to_old(context: &Context, servers: &LoginParamNew) -> Opti
             p.send_port = smtp.port as i32;
             p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
             p.server_flags |= match smtp.socket {
-                provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32,
-                provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32,
+                provider::Socket::Plain => DC_LP_SMTP_SOCKET_PLAIN,
+                provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS,
+                provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL,
             };
 
             info!(context, "offline autoconfig found: {}", p);
@@ -421,11 +423,12 @@ pub fn loginparam_old_to_new(p: LoginParam) -> LoginParamNew {
         addr: p.addr.clone(),
         imap: vec![ServerParams {
             protocol: Protocol::IMAP,
-            socket: if 0 != p.server_flags & DC_LP_IMAP_SOCKET_STARTTLS {
-                provider::Socket::STARTTLS
-            } else {
-                provider::Socket::SSL
-            }, // TODO what about plain? And if no socket was specified in the LoginParam?
+            socket: match p.server_flags & DC_LP_IMAP_SOCKET_FLAGS as i32 {
+                DC_LP_IMAP_SOCKET_PLAIN => provider::Socket::Plain,
+                DC_LP_IMAP_SOCKET_STARTTLS => provider::Socket::STARTTLS,
+                DC_LP_IMAP_SOCKET_SSL => provider::Socket::SSL,
+                _ => Default::default(),
+            },
             port: p.mail_port as u16,
             hostname: p.mail_server,
             username_pattern: if p.mail_user.contains('@') {
@@ -436,11 +439,12 @@ pub fn loginparam_old_to_new(p: LoginParam) -> LoginParamNew {
         }],
         smtp: vec![ServerParams {
             protocol: Protocol::SMTP,
-            socket: if 0 != p.server_flags as usize & DC_LP_SMTP_SOCKET_STARTTLS {
-                provider::Socket::STARTTLS
-            } else {
-                provider::Socket::SSL
-            }, // TODO what about plain? And if no socket was specified in the LoginParam?
+            socket: match p.server_flags & DC_LP_SMTP_SOCKET_FLAGS as i32 {
+                DC_LP_SMTP_SOCKET_PLAIN => provider::Socket::Plain,
+                DC_LP_SMTP_SOCKET_STARTTLS => provider::Socket::STARTTLS,
+                DC_LP_SMTP_SOCKET_SSL => provider::Socket::SSL,
+                _ => Default::default(),
+            },
             port: p.send_port as u16,
             hostname: p.send_server,
             username_pattern: if p.send_user.contains('@') {

src/constants.rs

@@ -213,23 +213,23 @@ pub const DC_LP_IMAP_SOCKET_PLAIN: i32 = 0x400;
 
 /// Connect to SMTP via STARTTLS.
 /// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_SMTP_SOCKET_STARTTLS: usize = 0x10000;
+pub const DC_LP_SMTP_SOCKET_STARTTLS: i32 = 0x10000;
 
 /// Connect to SMTP via SSL.
 /// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_SMTP_SOCKET_SSL: usize = 0x20000;
+pub const DC_LP_SMTP_SOCKET_SSL: i32 = 0x20000;
 
 /// Connect to SMTP unencrypted, this should not be used.
 /// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_SMTP_SOCKET_PLAIN: usize = 0x40000;
+pub const DC_LP_SMTP_SOCKET_PLAIN: i32 = 0x40000;
 
 /// if none of these flags are set, the default is chosen
 pub const DC_LP_AUTH_FLAGS: i32 = DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL;
 /// if none of these flags are set, the default is chosen
 pub const DC_LP_IMAP_SOCKET_FLAGS: i32 =
     DC_LP_IMAP_SOCKET_STARTTLS | DC_LP_IMAP_SOCKET_SSL | DC_LP_IMAP_SOCKET_PLAIN;
 /// if none of these flags are set, the default is chosen
-pub const DC_LP_SMTP_SOCKET_FLAGS: usize =
+pub const DC_LP_SMTP_SOCKET_FLAGS: i32 =
     DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_SSL | DC_LP_SMTP_SOCKET_PLAIN;
 
 // QR code scanning (view from Bob, the joiner)

src/provider/mod.rs

@@ -27,8 +27,15 @@ pub enum Protocol {
 #[derive(Debug, PartialEq, Clone)]
 #[repr(u8)]
 pub enum Socket {
-    STARTTLS = 1,
-    SSL = 2,
+    SSL = 1,
+    STARTTLS = 2,
+    Plain = 3,
+}
+
+impl Default for Socket {
+    fn default() -> Self {
+        Socket::STARTTLS
+    }
 }
 
 #[derive(Debug, PartialEq, Clone)]