IOSAD-103 rename IOSAD-103
authorDirk Zimmermann <dirk@pep-project.org>
Tue, 30 Oct 2018 14:50:53 +0100
branchIOSAD-103
changeset 732defc14d75ec9
parent 731 bee8f0cf6e27
child 733 41104554955f
IOSAD-103 rename
pEpObjCAdapter.xcodeproj/project.pbxproj
pEpObjCAdapter/PEPSendMessageDelegate.h
pEpObjCAdapter/PEPSync.h
pEpObjCAdapter/PEPSync.m
pEpObjCAdapter/PEPSyncSendMessageDelegate.h
pEpObjCTests/PEPSessionTest.m
pEpObjCTests/TestUtils/PEPSessionTestSendMessageDelegate.h
     1.1 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj	Tue Oct 30 14:50:53 2018 +0100
     1.2 +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj	Tue Oct 30 14:50:53 2018 +0100
     1.3 @@ -171,7 +171,7 @@
     1.4  		435796E21FB5E51A00395A9E /* PEPMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPMessage.m; sourceTree = "<group>"; };
     1.5  		43676B631C57EA1A00233933 /* 0xB623F674.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 0xB623F674.asc; sourceTree = "<group>"; };
     1.6  		43676B641C57EA1A00233933 /* B623F674_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = B623F674_sec.asc; sourceTree = "<group>"; };
     1.7 -		438C4393216744DA00C7425B /* PEPSyncSendMessageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSyncSendMessageDelegate.h; sourceTree = "<group>"; };
     1.8 +		438C4393216744DA00C7425B /* PEPSendMessageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSendMessageDelegate.h; sourceTree = "<group>"; };
     1.9  		438C439C21676C9300C7425B /* PEPNotifyHandshakeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPNotifyHandshakeDelegate.h; sourceTree = "<group>"; };
    1.10  		439393E4208F375800EB1DBD /* NSObject+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Extension.h"; sourceTree = "<group>"; };
    1.11  		439393E5208F375800EB1DBD /* NSObject+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Extension.m"; sourceTree = "<group>"; };
    1.12 @@ -347,7 +347,7 @@
    1.13  				43F73BD32165F6EC00AB4524 /* PEPLock.m */,
    1.14  				43F73BE82166248E00AB4524 /* PEPSync.h */,
    1.15  				43F73BE92166248E00AB4524 /* PEPSync.m */,
    1.16 -				438C4393216744DA00C7425B /* PEPSyncSendMessageDelegate.h */,
    1.17 +				438C4393216744DA00C7425B /* PEPSendMessageDelegate.h */,
    1.18  				438C439C21676C9300C7425B /* PEPNotifyHandshakeDelegate.h */,
    1.19  			);
    1.20  			path = pEpObjCAdapter;
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/pEpObjCAdapter/PEPSendMessageDelegate.h	Tue Oct 30 14:50:53 2018 +0100
     2.3 @@ -0,0 +1,19 @@
     2.4 +//
     2.5 +//  PEPSendMessageDelegate.h
     2.6 +//  pEpObjCAdapter
     2.7 +//
     2.8 +//  Created by Dirk Zimmermann on 05.10.18.
     2.9 +//  Copyright © 2018 p≡p. All rights reserved.
    2.10 +//
    2.11 +
    2.12 +#import <Foundation/Foundation.h>
    2.13 +
    2.14 +#import "pEpEngine.h"
    2.15 +
    2.16 +@class PEPMessage;
    2.17 +
    2.18 +@protocol PEPSendMessageDelegate <NSObject>
    2.19 +
    2.20 +- (PEP_STATUS)sendMessage:(PEPMessage * _Nonnull)message;
    2.21 +
    2.22 +@end
     3.1 --- a/pEpObjCAdapter/PEPSync.h	Tue Oct 30 14:50:53 2018 +0100
     3.2 +++ b/pEpObjCAdapter/PEPSync.h	Tue Oct 30 14:50:53 2018 +0100
     3.3 @@ -10,7 +10,7 @@
     3.4  
     3.5  #import "pEpEngine.h"
     3.6  
     3.7 -#import "PEPSyncSendMessageDelegate.h"
     3.8 +#import "PEPSendMessageDelegate.h"
     3.9  #import "PEPNotifyHandshakeDelegate.h"
    3.10  
    3.11  @class PEPSyncSendMessageDelegate;
    3.12 @@ -31,10 +31,10 @@
    3.13   */
    3.14  + (void)releaseSession:(PEP_SESSION)session;
    3.15  
    3.16 -- (instancetype)initWithSyncSendMessageDelegate:(id<PEPSyncSendMessageDelegate>
    3.17 -                                                 _Nonnull)syncSendMessageDelegate
    3.18 -                        notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
    3.19 -                                                 _Nonnull)notifyHandshakeDelegate;
    3.20 +- (instancetype)initWithSendMessageDelegate:(id<PEPSendMessageDelegate>
    3.21 +                                             _Nonnull)sendMessageDelegate
    3.22 +                    notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
    3.23 +                                             _Nonnull)notifyHandshakeDelegate;
    3.24  
    3.25  - (void)startup;
    3.26  
     4.1 --- a/pEpObjCAdapter/PEPSync.m	Tue Oct 30 14:50:53 2018 +0100
     4.2 +++ b/pEpObjCAdapter/PEPSync.m	Tue Oct 30 14:50:53 2018 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  
     4.5  #import "PEPSync.h"
     4.6  
     4.7 -#import "PEPSyncSendMessageDelegate.h"
     4.8 +#import "PEPSendMessageDelegate.h"
     4.9  #import "PEPNotifyHandshakeDelegate.h"
    4.10  #import "PEPMessageUtil.h"
    4.11  #import "PEPMessage.h"
    4.12 @@ -26,7 +26,7 @@
    4.13  
    4.14  + (PEPSync * _Nullable)instance;
    4.15  
    4.16 -@property (nonatomic, nullable, weak) id<PEPSyncSendMessageDelegate> syncSendMessageDelegate;
    4.17 +@property (nonatomic, nullable, weak) id<PEPSendMessageDelegate> sendMessageDelegate;
    4.18  @property (nonatomic, nullable, weak) id<PEPNotifyHandshakeDelegate> notifyHandshakeDelegate;
    4.19  @property (nonatomic, nonnull) PEPQueue *queue;
    4.20  @property (nonatomic, nullable) NSThread *syncThread;
    4.21 @@ -55,7 +55,7 @@
    4.22  
    4.23  static PEP_STATUS messageToSendObjc(struct _message *msg)
    4.24  {
    4.25 -    id<PEPSyncSendMessageDelegate> delegate = [[PEPSync instance] syncSendMessageDelegate];
    4.26 +    id<PEPSendMessageDelegate> delegate = [[PEPSync instance] sendMessageDelegate];
    4.27      if (delegate) {
    4.28          PEPMessage *theMessage = pEpMessageFromStruct(msg);
    4.29          return [delegate sendMessage:theMessage];
    4.30 @@ -142,13 +142,13 @@
    4.31      [PEPLock unlockWrite];
    4.32  }
    4.33  
    4.34 -- (instancetype)initWithSyncSendMessageDelegate:(id<PEPSyncSendMessageDelegate>
    4.35 -                                                 _Nonnull)syncSendMessageDelegate
    4.36 -                        notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
    4.37 -                                                 _Nonnull)notifyHandshakeDelegate
    4.38 +- (instancetype)initWithSendMessageDelegate:(id<PEPSendMessageDelegate>
    4.39 +                                             _Nonnull)sendMessageDelegate
    4.40 +                    notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
    4.41 +                                             _Nonnull)notifyHandshakeDelegate
    4.42  {
    4.43      if (self = [super init]) {
    4.44 -        _syncSendMessageDelegate = syncSendMessageDelegate;
    4.45 +        _sendMessageDelegate = sendMessageDelegate;
    4.46          _notifyHandshakeDelegate = notifyHandshakeDelegate;
    4.47          _queue = [PEPQueue new];
    4.48          s_pEpSync = self;
    4.49 @@ -207,7 +207,7 @@
    4.50      if (self.notifyHandshakeDelegate) {
    4.51          PEPIdentity *meIdentity = PEP_identityFromStruct(me);
    4.52          PEPIdentity *partnerIdentity = PEP_identityFromStruct(partner);
    4.53 -        return [self.notifyHandshakeDelegate nofifyHandshake:NULL
    4.54 +        return [self.notifyHandshakeDelegate notifyHandshake:NULL
    4.55                                                            me:meIdentity
    4.56                                                       partner:partnerIdentity
    4.57                                                        signal:signal];
     5.1 --- a/pEpObjCAdapter/PEPSyncSendMessageDelegate.h	Tue Oct 30 14:50:53 2018 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,19 +0,0 @@
     5.4 -//
     5.5 -//  PEPSyncSendMessageDelegate.h
     5.6 -//  pEpObjCAdapter
     5.7 -//
     5.8 -//  Created by Dirk Zimmermann on 05.10.18.
     5.9 -//  Copyright © 2018 p≡p. All rights reserved.
    5.10 -//
    5.11 -
    5.12 -#import <Foundation/Foundation.h>
    5.13 -
    5.14 -#import "pEpEngine.h"
    5.15 -
    5.16 -@class PEPMessage;
    5.17 -
    5.18 -@protocol PEPSyncSendMessageDelegate <NSObject>
    5.19 -
    5.20 -- (PEP_STATUS)sendMessage:(PEPMessage * _Nonnull)message;
    5.21 -
    5.22 -@end
     6.1 --- a/pEpObjCTests/PEPSessionTest.m	Tue Oct 30 14:50:53 2018 +0100
     6.2 +++ b/pEpObjCTests/PEPSessionTest.m	Tue Oct 30 14:50:53 2018 +0100
     6.3 @@ -15,7 +15,7 @@
     6.4  #import "PEPAttachment.h"
     6.5  #import "PEPTestUtils.h"
     6.6  #import "PEPSync.h"
     6.7 -#import "PEPSyncSendMessageDelegate.h"
     6.8 +#import "PEPSendMessageDelegate.h"
     6.9  
    6.10  #import "PEPSessionTestNotifyHandshakeDelegate.h"
    6.11  #import "PEPSessionTestSendMessageDelegate.h"
    6.12 @@ -37,7 +37,7 @@
    6.13      self.sendMessageDelegate = [PEPSessionTestSendMessageDelegate new];
    6.14      self.notifyHandshakeDelegate = [PEPSessionTestNotifyHandshakeDelegate new];
    6.15      self.sync = [[PEPSync alloc]
    6.16 -                 initWithSyncSendMessageDelegate:self.sendMessageDelegate
    6.17 +                 initWithSendMessageDelegate:self.sendMessageDelegate
    6.18                   notifyHandshakeDelegate:self.notifyHandshakeDelegate];
    6.19  
    6.20      [PEPObjCAdapter setUnEncryptedSubjectEnabled:NO];
     7.1 --- a/pEpObjCTests/TestUtils/PEPSessionTestSendMessageDelegate.h	Tue Oct 30 14:50:53 2018 +0100
     7.2 +++ b/pEpObjCTests/TestUtils/PEPSessionTestSendMessageDelegate.h	Tue Oct 30 14:50:53 2018 +0100
     7.3 @@ -8,11 +8,11 @@
     7.4  
     7.5  #import <Foundation/Foundation.h>
     7.6  
     7.7 -#import "PEPSyncSendMessageDelegate.h"
     7.8 +#import "PEPSendMessageDelegate.h"
     7.9  
    7.10  @class PEPMessage;
    7.11  
    7.12 -@interface PEPSessionTestSendMessageDelegate : NSObject<PEPSyncSendMessageDelegate>
    7.13 +@interface PEPSessionTestSendMessageDelegate : NSObject<PEPSendMessageDelegate>
    7.14  
    7.15  @property (nonatomic, nullable) NSMutableArray<PEPMessage *> *messages;
    7.16