... sync
authorVolker Birk <vb@pep-project.org>
Thu, 30 May 2019 23:47:52 +0200
branchsync
changeset 37907c13eebdb82c
parent 3789 ca5401f74cb6
child 3791 f32545eaeefc
...
sync/cond_act_sync.yml2
sync/sync.fsm
     1.1 --- a/sync/cond_act_sync.yml2	Thu May 30 14:12:15 2019 +0200
     1.2 +++ b/sync/cond_act_sync.yml2	Thu May 30 23:47:52 2019 +0200
     1.3 @@ -355,6 +355,11 @@
     1.4  
     1.5  action saveGroupKeys
     1.6  ||
     1.7 +    char *user_id = NULL;
     1.8 +    PEP_STATUS status = get_default_own_userid(session, &user_id);
     1.9 +    if (status)
    1.10 +        return status;
    1.11 +
    1.12      identity_list *il = IdentityList_to_identity_list(&session->sync_state.keysync.ownIdentities, NULL);
    1.13      if (!il)
    1.14          return PEP_OUT_OF_MEMORY;
    1.15 @@ -366,14 +371,7 @@
    1.16          pEp_identity *ident = _il->ident;
    1.17          bool is_own_already = false;
    1.18  
    1.19 -        PEP_STATUS status = is_own_address(session, ident->address, &is_own_already);
    1.20 -        if (status) {
    1.21 -            free_identity_list(il);
    1.22 -            return status;
    1.23 -        }
    1.24 -
    1.25 -        char *user_id = NULL;
    1.26 -        status = get_default_own_userid(session, &user_id);
    1.27 +        status = is_own_address(session, ident->address, &is_own_already);
    1.28          if (status) {
    1.29              free_identity_list(il);
    1.30              return status;
     2.1 --- a/sync/sync.fsm	Thu May 30 14:12:15 2019 +0200
     2.2 +++ b/sync/sync.fsm	Thu May 30 23:47:52 2019 +0200
     2.3 @@ -318,9 +318,6 @@
     2.4                  send CommitAccept;
     2.5                  go HandshakingJoinPhase1;
     2.6              }
     2.7 -
     2.8 -            on CommitAcceptForGroup if sameNegotiationAndPartner
     2.9 -                go HandshakingJoinPhase2;
    2.10          }
    2.11  
    2.12          state HandshakingJoinPhase1 {