explicitely use identity.main_key_id sync
authorVolker Birk <vb@pep-project.org>
Sun, 02 Feb 2020 15:13:56 +0100
branchsync
changeset 4397ccc61fca0f51
parent 4396 1c200fb58a44
child 4398 bb7f80e044ad
explicitely use identity.main_key_id
src/pEpEngine.c
     1.1 --- a/src/pEpEngine.c	Sat Feb 01 02:52:33 2020 +0100
     1.2 +++ b/src/pEpEngine.c	Sun Feb 02 15:13:56 2020 +0100
     1.3 @@ -138,7 +138,7 @@
     1.4      "   timestamp desc; ";
     1.5      
     1.6  static const char *sql_get_identities_by_userid =  
     1.7 -    "select address, fpr, username, comm_type, lang,"
     1.8 +    "select address, identity.main_key_id, username, comm_type, lang,"
     1.9      "   identity.flags | pgp_keypair.flags,"
    1.10      "   is_own, pEp_version_major, pEp_version_minor"
    1.11      "   from identity"
    1.12 @@ -422,7 +422,7 @@
    1.13      ");";
    1.14  
    1.15  static const char *sql_own_identities_retrieve =  
    1.16 -    "select address, fpr, identity.user_id, username,"
    1.17 +    "select address, identity.main_key_id, identity.user_id, username,"
    1.18      "   lang, identity.flags | pgp_keypair.flags, pEp_version_major, pEp_version_minor"
    1.19      "   from identity"
    1.20      "   join person on id = identity.user_id"
    1.21 @@ -2779,7 +2779,7 @@
    1.22  
    1.23      int result = -1;
    1.24      while ((result = sqlite3_step(session->get_identities_by_userid)) == SQLITE_ROW) {
    1.25 -            // "select address, fpr, username, comm_type, lang,"
    1.26 +            // "select address, identity.main_key_id, username, comm_type, lang,"
    1.27              // "   identity.flags | pgp_keypair.flags,"
    1.28              // "   is_own"
    1.29              // "   from identity"