IOSAD-103 rename

IOSAD-103
Dirk Zimmermann 4 years ago
parent 8d0ee25af3
commit ac47b10dc0
  1. 4
      pEpObjCAdapter.xcodeproj/project.pbxproj
  2. 4
      pEpObjCAdapter/PEPSendMessageDelegate.h
  3. 10
      pEpObjCAdapter/PEPSync.h
  4. 18
      pEpObjCAdapter/PEPSync.m
  5. 4
      pEpObjCTests/PEPSessionTest.m
  6. 4
      pEpObjCTests/TestUtils/PEPSessionTestSendMessageDelegate.h

@ -171,7 +171,7 @@
435796E21FB5E51A00395A9E /* PEPMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPMessage.m; sourceTree = "<group>"; };
43676B631C57EA1A00233933 /* 0xB623F674.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 0xB623F674.asc; sourceTree = "<group>"; };
43676B641C57EA1A00233933 /* B623F674_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = B623F674_sec.asc; sourceTree = "<group>"; };
438C4393216744DA00C7425B /* PEPSyncSendMessageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSyncSendMessageDelegate.h; sourceTree = "<group>"; };
438C4393216744DA00C7425B /* PEPSendMessageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSendMessageDelegate.h; sourceTree = "<group>"; };
438C439C21676C9300C7425B /* PEPNotifyHandshakeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPNotifyHandshakeDelegate.h; sourceTree = "<group>"; };
439393E4208F375800EB1DBD /* NSObject+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Extension.h"; sourceTree = "<group>"; };
439393E5208F375800EB1DBD /* NSObject+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Extension.m"; sourceTree = "<group>"; };
@ -347,7 +347,7 @@
43F73BD32165F6EC00AB4524 /* PEPLock.m */,
43F73BE82166248E00AB4524 /* PEPSync.h */,
43F73BE92166248E00AB4524 /* PEPSync.m */,
438C4393216744DA00C7425B /* PEPSyncSendMessageDelegate.h */,
438C4393216744DA00C7425B /* PEPSendMessageDelegate.h */,
438C439C21676C9300C7425B /* PEPNotifyHandshakeDelegate.h */,
);
path = pEpObjCAdapter;

@ -1,5 +1,5 @@
//
// PEPSyncSendMessageDelegate.h
// PEPSendMessageDelegate.h
// pEpObjCAdapter
//
// Created by Dirk Zimmermann on 05.10.18.
@ -12,7 +12,7 @@
@class PEPMessage;
@protocol PEPSyncSendMessageDelegate <NSObject>
@protocol PEPSendMessageDelegate <NSObject>
- (PEP_STATUS)sendMessage:(PEPMessage * _Nonnull)message;

@ -10,7 +10,7 @@
#import "pEpEngine.h"
#import "PEPSyncSendMessageDelegate.h"
#import "PEPSendMessageDelegate.h"
#import "PEPNotifyHandshakeDelegate.h"
@class PEPSyncSendMessageDelegate;
@ -31,10 +31,10 @@
*/
+ (void)releaseSession:(PEP_SESSION)session;
- (instancetype)initWithSyncSendMessageDelegate:(id<PEPSyncSendMessageDelegate>
_Nonnull)syncSendMessageDelegate
notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
_Nonnull)notifyHandshakeDelegate;
- (instancetype)initWithSendMessageDelegate:(id<PEPSendMessageDelegate>
_Nonnull)sendMessageDelegate
notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
_Nonnull)notifyHandshakeDelegate;
- (void)startup;

@ -8,7 +8,7 @@
#import "PEPSync.h"
#import "PEPSyncSendMessageDelegate.h"
#import "PEPSendMessageDelegate.h"
#import "PEPNotifyHandshakeDelegate.h"
#import "PEPMessageUtil.h"
#import "PEPMessage.h"
@ -26,7 +26,7 @@ typedef int (* t_injectSyncCallback)(SYNC_EVENT ev, void *management);
+ (PEPSync * _Nullable)instance;
@property (nonatomic, nullable, weak) id<PEPSyncSendMessageDelegate> syncSendMessageDelegate;
@property (nonatomic, nullable, weak) id<PEPSendMessageDelegate> sendMessageDelegate;
@property (nonatomic, nullable, weak) id<PEPNotifyHandshakeDelegate> notifyHandshakeDelegate;
@property (nonatomic, nonnull) PEPQueue *queue;
@property (nonatomic, nullable) NSThread *syncThread;
@ -55,7 +55,7 @@ typedef int (* t_injectSyncCallback)(SYNC_EVENT ev, void *management);
static PEP_STATUS messageToSendObjc(struct _message *msg)
{
id<PEPSyncSendMessageDelegate> delegate = [[PEPSync instance] syncSendMessageDelegate];
id<PEPSendMessageDelegate> delegate = [[PEPSync instance] sendMessageDelegate];
if (delegate) {
PEPMessage *theMessage = pEpMessageFromStruct(msg);
return [delegate sendMessage:theMessage];
@ -142,13 +142,13 @@ static __weak PEPSync *s_pEpSync;
[PEPLock unlockWrite];
}
- (instancetype)initWithSyncSendMessageDelegate:(id<PEPSyncSendMessageDelegate>
_Nonnull)syncSendMessageDelegate
notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
_Nonnull)notifyHandshakeDelegate
- (instancetype)initWithSendMessageDelegate:(id<PEPSendMessageDelegate>
_Nonnull)sendMessageDelegate
notifyHandshakeDelegate:(id<PEPNotifyHandshakeDelegate>
_Nonnull)notifyHandshakeDelegate
{
if (self = [super init]) {
_syncSendMessageDelegate = syncSendMessageDelegate;
_sendMessageDelegate = sendMessageDelegate;
_notifyHandshakeDelegate = notifyHandshakeDelegate;
_queue = [PEPQueue new];
s_pEpSync = self;
@ -207,7 +207,7 @@ static __weak PEPSync *s_pEpSync;
if (self.notifyHandshakeDelegate) {
PEPIdentity *meIdentity = PEP_identityFromStruct(me);
PEPIdentity *partnerIdentity = PEP_identityFromStruct(partner);
return [self.notifyHandshakeDelegate nofifyHandshake:NULL
return [self.notifyHandshakeDelegate notifyHandshake:NULL
me:meIdentity
partner:partnerIdentity
signal:signal];

@ -15,7 +15,7 @@
#import "PEPAttachment.h"
#import "PEPTestUtils.h"
#import "PEPSync.h"
#import "PEPSyncSendMessageDelegate.h"
#import "PEPSendMessageDelegate.h"
#import "PEPSessionTestNotifyHandshakeDelegate.h"
#import "PEPSessionTestSendMessageDelegate.h"
@ -37,7 +37,7 @@
self.sendMessageDelegate = [PEPSessionTestSendMessageDelegate new];
self.notifyHandshakeDelegate = [PEPSessionTestNotifyHandshakeDelegate new];
self.sync = [[PEPSync alloc]
initWithSyncSendMessageDelegate:self.sendMessageDelegate
initWithSendMessageDelegate:self.sendMessageDelegate
notifyHandshakeDelegate:self.notifyHandshakeDelegate];
[PEPObjCAdapter setUnEncryptedSubjectEnabled:NO];

@ -8,11 +8,11 @@
#import <Foundation/Foundation.h>
#import "PEPSyncSendMessageDelegate.h"
#import "PEPSendMessageDelegate.h"
@class PEPMessage;
@interface PEPSessionTestSendMessageDelegate : NSObject<PEPSyncSendMessageDelegate>
@interface PEPSessionTestSendMessageDelegate : NSObject<PEPSendMessageDelegate>
@property (nonatomic, nullable) NSMutableArray<PEPMessage *> *messages;

Loading…
Cancel
Save