not needed any more sync
authorVolker Birk <vb@pep-project.org>
Thu, 14 Nov 2019 12:51:57 +0100
branchsync
changeset 416788b578fec7a5
parent 4166 2d3e34596b64
child 4168 40db89ff0fcb
not needed any more
src/sync_api.h
sync/cond_act_sync.yml2
sync/sync.fsm
     1.1 --- a/src/sync_api.h	Thu Nov 14 12:13:26 2019 +0100
     1.2 +++ b/src/sync_api.h	Thu Nov 14 12:51:57 2019 +0100
     1.3 @@ -27,13 +27,13 @@
     1.4      // handshake accepted by user
     1.5      SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED = 6,
     1.6      SYNC_NOTIFY_ACCEPTED_GROUP_CREATED = 7,
     1.7 -    // SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED = 8,
     1.8 +    SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED = 8,
     1.9  
    1.10      // handshake dialog must be closed
    1.11 -    SYNC_NOTIFY_OVERTAKEN = 9,
    1.12 +    // SYNC_NOTIFY_OVERTAKEN = 9,
    1.13  
    1.14      // forming group
    1.15 -    SYNC_NOTIFY_FORMING_GROUP = 10,
    1.16 +    // SYNC_NOTIFY_FORMING_GROUP = 10,
    1.17  
    1.18      // notification of actual group status
    1.19      SYNC_NOTIFY_SOLE = 254,
     2.1 --- a/sync/cond_act_sync.yml2	Thu Nov 14 12:13:26 2019 +0100
     2.2 +++ b/sync/cond_act_sync.yml2	Thu Nov 14 12:51:57 2019 +0100
     2.3 @@ -318,15 +318,12 @@
     2.4  action showGroupedHandshake
     2.5      call "show_handshake" with "type" > SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE
     2.6  
     2.7 -action hideHandshakeDialog
     2.8 -    call "show_handshake" with "type" > SYNC_NOTIFY_OVERTAKEN
     2.9 -
    2.10  action showDeviceAdded
    2.11      call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED
    2.12  
    2.13 -action showFormingGroup
    2.14 -    call "show_handshake" with "type" > SYNC_NOTIFY_FORMING_GROUP
    2.15 -    
    2.16 +action showDeviceAccepted
    2.17 +    call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED
    2.18 +
    2.19  action showGroupCreated
    2.20      call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_GROUP_CREATED
    2.21  
     3.1 --- a/sync/sync.fsm	Thu Nov 14 12:13:26 2019 +0100
     3.2 +++ b/sync/sync.fsm	Thu Nov 14 12:51:57 2019 +0100
     3.3 @@ -239,7 +239,6 @@
     3.4              on Init {
     3.5                  do prepareOwnKeys;
     3.6                  send OwnKeysOfferer; // we're not grouped yet, this is our own keys
     3.7 -                do showFormingGroup;
     3.8              }
     3.9  
    3.10              on Cancel {
    3.11 @@ -259,9 +258,6 @@
    3.12          }
    3.13  
    3.14          state FormingGroupRequester {
    3.15 -            on Init
    3.16 -                do showFormingGroup;
    3.17 -
    3.18              on Cancel {
    3.19                  send Rollback;
    3.20                  go Sole;
    3.21 @@ -431,7 +427,6 @@
    3.22                  go HandshakingGroupedPhase2;
    3.23  
    3.24              on GroupTrustThisKey {
    3.25 -                do hideHandshakeDialog;
    3.26                  do trustThisKey;
    3.27                  if sameNegotiation
    3.28                      go Grouped;
    3.29 @@ -451,6 +446,7 @@
    3.30              on CommitAccept if sameNegotiationAndPartner {
    3.31                  do prepareOwnKeys;
    3.32                  send GroupKeys;
    3.33 +                do showDeviceAccepted;
    3.34                  go Grouped;
    3.35              }
    3.36  
    3.37 @@ -480,6 +476,7 @@
    3.38                  send GroupTrustThisKey;
    3.39                  do prepareOwnKeys;
    3.40                  send GroupKeys;
    3.41 +                do showDeviceAccepted;
    3.42                  go Grouped;
    3.43              }
    3.44