too dangerous sync
authorVolker Birk <vb@pep-project.org>
Sat, 08 Jun 2019 12:43:29 +0200
branchsync
changeset 382146cc98d0f16b
parent 3820 3763eb3c915b
child 3822 f5b4744f11a6
too dangerous
sync/sync.fsm
     1.1 --- a/sync/sync.fsm	Fri Jun 07 18:33:00 2019 +0200
     1.2 +++ b/sync/sync.fsm	Sat Jun 08 12:43:29 2019 +0200
     1.3 @@ -307,7 +307,7 @@
     1.4                  go End;
     1.5              }
     1.6  
     1.7 -            on CommitAcceptForGroup
     1.8 +            on CommitAcceptForGroup if sameNegotiationAndPartner
     1.9                  go HandshakingJoinPhase2;
    1.10  
    1.11              on CommitReject if sameNegotiationAndPartner {
    1.12 @@ -332,9 +332,8 @@
    1.13                  go End;
    1.14              }
    1.15  
    1.16 -            on CommitAcceptForGroup {
    1.17 +            on CommitAcceptForGroup if sameNegotiationAndPartner
    1.18                  go JoinGroup;
    1.19 -            }
    1.20          }
    1.21  
    1.22          state HandshakingJoinPhase2 {
    1.23 @@ -407,14 +406,6 @@
    1.24                  do trustThisKey;
    1.25              }
    1.26  
    1.27 -            on CommitAcceptForGroup {
    1.28 -                do showDeviceAdded;
    1.29 -                if sameNegotiationAndPartner {
    1.30 -                    do hideHandshakeDialog;
    1.31 -                    go Grouped;
    1.32 -                }
    1.33 -            }
    1.34 -
    1.35              on GroupKeys
    1.36                  do saveGroupKeys;
    1.37          }