feat(ffi, jsonrpc): Ensure that own key exists before returning self-color (#7374)

Done in CFFI and JSON-RPC APIs to avoid breaking Core tests on key import.

Author: iequidoo

deltachat-ffi/src/lib.rs

@@ -28,7 +28,7 @@ use deltachat::contact::{Contact, ContactId, Origin};
 use deltachat::context::{Context, ContextBuilder};
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
-use deltachat::key::preconfigure_keypair;
+use deltachat::key::{load_self_public_key, preconfigure_keypair};
 use deltachat::message::MsgId;
 use deltachat::qr_code_generator::{create_qr_svg, generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::stock_str::StockMessage;
@@ -4240,6 +4240,19 @@ pub unsafe extern "C" fn dc_contact_get_color(contact: *mut dc_contact_t) -> u32
         return 0;
     }
     let ffi_contact = &*contact;
+    let ctx = &*ffi_contact.context;
+    if ffi_contact.contact.id == ContactId::SELF
+        && block_on(async move {
+            // We don't want any UI displaying gray self-color until own key is generated.
+            load_self_public_key(ctx)
+                .await
+                .context("load_self_public_key")
+                .log_err(ctx)
+                .is_ok() as libc::c_int
+        }) == 0
+    {
+        return 0;
+    }
     ffi_contact.contact.get_color()
 }
 

deltachat-jsonrpc/src/api/types/account.rs

@@ -1,6 +1,7 @@
 use anyhow::Result;
 use deltachat::config::Config;
 use deltachat::contact::{Contact, ContactId};
+use deltachat::key;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
@@ -28,6 +29,8 @@ pub enum Account {
 impl Account {
     pub async fn from_context(ctx: &deltachat::context::Context, id: u32) -> Result<Self> {
         if ctx.is_configured().await? {
+            // We don't want any UI displaying gray self-color until own key is generated.
+            key::load_self_public_key(ctx).await?;
             let display_name = ctx.get_config(Config::Displayname).await?;
             let addr = ctx.get_config(Config::Addr).await?;
             let profile_image = ctx.get_config(Config::Selfavatar).await?;

deltachat-rpc-client/tests/test_vcard.py

@@ -1,6 +1,9 @@
 def test_vcard(acfactory) -> None:
     alice, bob, fiona = acfactory.get_online_accounts(3)
 
+    fiona_color = fiona.color
+    assert fiona_color != 0x808080
+
     bob.create_chat(alice)
     alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_contact_charlie = alice.create_contact("[email protected]", "Charlie")
@@ -25,3 +28,4 @@ def test_vcard(acfactory) -> None:
     assert snapshot.vcard_contact
     assert snapshot.vcard_contact.key
     assert snapshot.vcard_contact.color == alice_contact_fiona_snapshot.color
+    assert alice_contact_fiona_snapshot.color == fiona_color

src/key.rs

@@ -145,7 +145,7 @@ pub(crate) async fn load_self_public_key_opt(context: &Context) -> Result<Option
 /// Loads own public key.
 ///
 /// If no key is generated yet, generates a new one.
-pub(crate) async fn load_self_public_key(context: &Context) -> Result<SignedPublicKey> {
+pub async fn load_self_public_key(context: &Context) -> Result<SignedPublicKey> {
     match load_self_public_key_opt(context).await? {
         Some(public_key) => Ok(public_key),
         None => {