merge sync-fix-session
authorbuff <andreas@pep-project.org>
Fri, 15 Nov 2019 19:58:39 +0100
changeset 1331b19fa36ebc9e
parent 1321 5ac4a2debde6
parent 1330 533fbd95217d
child 1333 d6ca31b3bfce
child 1360 adbedc09b0fe
merge sync-fix-session
     1.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Tue Oct 15 19:41:24 2019 +0200
     1.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Fri Nov 15 19:58:39 2019 +0100
     1.3 @@ -1024,7 +1024,7 @@
     1.4      }
     1.5  }
     1.6  
     1.7 -- (BOOL)leaveDeviceGroupError:(NSError * _Nullable * _Nullable)error
     1.8 +- (BOOL)leaveDeviceGroup:(NSError * _Nullable * _Nullable)error
     1.9  {
    1.10      PEPStatus status = (PEPStatus) leave_device_group(self.session);
    1.11  
     2.1 --- a/pEpObjCAdapter/PEPSession.m	Tue Oct 15 19:41:24 2019 +0200
     2.2 +++ b/pEpObjCAdapter/PEPSession.m	Fri Nov 15 19:58:39 2019 +0100
     2.3 @@ -385,11 +385,11 @@
     2.4      return [session keyReset:identity fingerprint:fingerprint error:error];
     2.5  }
     2.6  
     2.7 -- (BOOL)leaveDeviceGroupError:(NSError * _Nullable * _Nullable)error
     2.8 +- (BOOL)leaveDeviceGroup:(NSError * _Nullable * _Nullable)error
     2.9  {
    2.10      PEPInternalSession *session = [PEPSessionProvider session];
    2.11      RETURN_ON_ERROR(session, error, NO);
    2.12 -    return [session leaveDeviceGroupError:error];
    2.13 +    return [session leaveDeviceGroup:error];
    2.14  }
    2.15  
    2.16  - (BOOL)keyResetAllOwnKeysError:(NSError * _Nullable * _Nullable)error
     3.1 --- a/pEpObjCAdapterFramework/PEPEngineTypes.h	Tue Oct 15 19:41:24 2019 +0200
     3.2 +++ b/pEpObjCAdapterFramework/PEPEngineTypes.h	Fri Nov 15 19:58:39 2019 +0100
     3.3 @@ -167,9 +167,7 @@
     3.4      PEPSyncHandshakeSignalAcceptedDeviceAdded = 6, // SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED
     3.5      PEPSyncHandshakeSignalAcceptedGroupCreated = 7, // SYNC_NOTIFY_ACCEPTED_GROUP_CREATED
     3.6  
     3.7 -    PEPSyncHandshakeSignalOvertaken = 9, // SYNC_NOTIFY_OVERTAKEN
     3.8 -
     3.9 -    PEPSyncHandshakeSignalFormingGroup = 10, // SYNC_NOTIFY_FORMING_GROUP
    3.10 +    PEPSyncHandshakeSignalAcceptedDeviceAccepted = 8, // SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED
    3.11  
    3.12      PEPSyncHandshakeSignalSole = 254, // SYNC_NOTIFY_SOLE
    3.13      PEPSyncHandshakeSignalInGroup = 255 // SYNC_NOTIFY_IN_GROUP
     4.1 --- a/pEpObjCAdapterFramework/PEPSessionProtocol.h	Tue Oct 15 19:41:24 2019 +0200
     4.2 +++ b/pEpObjCAdapterFramework/PEPSessionProtocol.h	Fri Nov 15 19:58:39 2019 +0100
     4.3 @@ -279,7 +279,7 @@
     4.4             error:(NSError * _Nullable * _Nullable)error;
     4.5  
     4.6  /** Wraps leave_device_group. */
     4.7 -- (BOOL)leaveDeviceGroupError:(NSError * _Nullable * _Nullable)error;
     4.8 +- (BOOL)leaveDeviceGroup:(NSError * _Nullable * _Nullable)error;
     4.9  
    4.10  /**
    4.11   Revoke and mistrust all own keys. See key_reset_all_own_keys for details.
     5.1 --- a/pEpObjCTests/PEPSessionTest.m	Tue Oct 15 19:41:24 2019 +0200
     5.2 +++ b/pEpObjCTests/PEPSessionTest.m	Fri Nov 15 19:58:39 2019 +0100
     5.3 @@ -1313,7 +1313,7 @@
     5.4      [self startSync];
     5.5  
     5.6      error = nil;
     5.7 -    XCTAssertTrue([session leaveDeviceGroupError:&error]);
     5.8 +    XCTAssertTrue([session leaveDeviceGroup:&error]);
     5.9      XCTAssertNil(error);
    5.10  
    5.11      [self shutdownSync];