Merge branch 'stable'

src/accounts.rs

@@ -299,13 +299,13 @@ impl Accounts {
 }
 
 /// Configuration file name.
-pub const CONFIG_NAME: &str = "accounts.toml";
+const CONFIG_NAME: &str = "accounts.toml";
 
 /// Lockfile name.
-pub const LOCKFILE_NAME: &str = "accounts.lock";
+const LOCKFILE_NAME: &str = "accounts.lock";
 
 /// Database file name.
-pub const DB_NAME: &str = "dc.db";
+const DB_NAME: &str = "dc.db";
 
 /// Account manager configuration file.
 #[derive(Debug)]

src/key.rs

@@ -239,7 +239,7 @@ pub(crate) async fn load_keypair(
     })
 }
 
-/// Use of a [KeyPair] for encryption or decryption.
+/// Use of a key pair for encryption or decryption.
 ///
 /// This is used by [store_self_keypair] to know what kind of key is
 /// being saved.

src/lib.rs

@@ -78,7 +78,7 @@ pub mod mimeparser;
 pub mod oauth2;
 mod param;
 pub mod peerstate;
-pub mod pgp;
+mod pgp;
 pub mod provider;
 pub mod qr;
 pub mod qr_code_generator;

src/pgp.rs

@@ -23,7 +23,8 @@ use crate::key::{DcKey, Fingerprint};
 use crate::tools::EmailAddress;
 
 #[allow(missing_docs)]
-pub const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";
+#[cfg(test)]
+pub(crate) const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";
 
 #[allow(missing_docs)]
 pub const HEADER_SETUPCODE: &str = "passphrase-begin";