feat: Report key creation times

Author: Hocuri

src/self_reporting.rs

@@ -12,7 +12,7 @@ use crate::config::Config;
 use crate::constants::{Chattype, DC_CHAT_ID_TRASH};
 use crate::contact::{ContactId, Origin, import_vcard, mark_contact_id_as_verified};
 use crate::context::{Context, get_version_str};
-use crate::key::load_self_public_key;
+use crate::key::load_self_public_keyring;
 use crate::log::LogExt;
 use crate::message::{Message, Viewtype};
 use crate::tools::{create_id, time};
@@ -23,7 +23,7 @@ const SELF_REPORTING_BOT_VCARD: &str = include_str!("../assets/self-reporting-bo
 #[derive(Serialize)]
 struct Statistics {
     core_version: String,
-    key_created: i64,
+    key_created: Vec<i64>,
     self_reporting_id: String,
     is_chatmail: bool,
     contact_stats: Vec<ContactStat>,
@@ -166,11 +166,11 @@ async fn get_self_report(context: &Context) -> Result<String> {
         .get_config_u64(Config::SelfReportingLastMsgId)
         .await?;
 
-    let key_created = load_self_public_key(context)
+    let key_created: Vec<i64> = load_self_public_keyring(context)
         .await?
-        .primary_key
-        .created_at()
-        .timestamp();
+        .iter()
+        .map(|k| k.created_at().timestamp())
+        .collect();
 
     let self_reporting_id = match context.get_config(Config::SelfReportingId).await? {
         Some(id) => id,

src/self_reporting/self_reporting_tests.rs

@@ -7,6 +7,7 @@ use crate::securejoin::{get_securejoin_qr, join_securejoin, join_securejoin_with
 use crate::test_utils::{TestContext, TestContextManager, get_chat_msg};
 use crate::tools::SystemTime;
 use pretty_assertions::assert_eq;
+use serde_json::{Number, Value};
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_send_self_report() -> Result<()> {
@@ -268,3 +269,24 @@ async fn test_self_report_is_chatmail() -> Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_self_report_key_creation_timestamp() -> Result<()> {
+    // Alice uses a pregenerated key. It was created at this timestamp:
+    const ALICE_KEY_CREATION_TIME: u128 = 1582855645;
+
+    let alice = &TestContext::new_alice().await;
+    alice.set_config_bool(Config::SelfReporting, true).await?;
+
+    let r = get_self_report(alice).await?;
+    let r: serde_json::Value = serde_json::from_str(&r)?;
+    let key_created = r.get("key_created").unwrap().as_array().unwrap();
+    assert_eq!(
+        key_created,
+        &vec![Value::Number(
+            Number::from_u128(ALICE_KEY_CREATION_TIME).unwrap()
+        )]
+    );
+
+    Ok(())
+}