Browse Source

IOSAD-15 PEPiOSAdapter -> PEPObjCAdapter

IOSAD-21
Dirk Zimmermann 5 years ago
parent
commit
5b38255dd8
8 changed files with 44 additions and 44 deletions
  1. +2
    -2
      iOSTests/PepTests.m
  2. +7
    -7
      iOSTests/iOSTests.m
  3. +8
    -8
      pEpiOSAdapter.xcodeproj/project.pbxproj
  4. +1
    -1
      pEpiOSAdapter/PEPIOSAdapter+Internal.h
  5. +1
    -1
      pEpiOSAdapter/PEPObjCAdapter.h
  6. +20
    -20
      pEpiOSAdapter/PEPObjCAdapter.m
  7. +1
    -1
      pEpiOSAdapter/PEPSession.h
  8. +4
    -4
      pEpiOSAdapter/PEPSession.m

+ 2
- 2
iOSTests/PepTests.m View File

@ -8,7 +8,7 @@
#import <XCTest/XCTest.h>
#import "pEpiOSAdapter/PEPiOSAdapter.h"
#import "pEpiOSAdapter/PEPObjCAdapter.h"
#import "pEpiOSAdapter/PEPSession.h"
#import "pEpiOSAdapter/PEPLanguage.h"
@ -20,7 +20,7 @@
- (void)setUp {
[super setUp];
[PEPiOSAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
[PEPObjCAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
}
- (void)tearDown {


+ 7
- 7
iOSTests/iOSTests.m View File

@ -8,7 +8,7 @@
#import <XCTest/XCTest.h>
#import "pEpiOSAdapter/PEPiOSAdapter.h"
#import "pEpiOSAdapter/PEPObjCAdapter.h"
#import "pEpiOSAdapter/PEPSession.h"
@interface iOSTests : XCTestCase
@ -86,7 +86,7 @@ PEPSession *session;
- (void)pEpSetUp : (NSString*)restore{
// Must be the first thing you do before using anything pEp-related
// ... but this is now done in session, with a "dispatch_once"
// [PEPiOSAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
// [PEPObjCAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
for(id path in [self pEpWorkFiles])
[self delFile:path:NULL];
@ -162,18 +162,18 @@ PEPSession *session;
- (void)testShortKeyServerLookup {
[self pEpSetUp];
[PEPiOSAdapter startKeyserverLookup];
[PEPObjCAdapter startKeyserverLookup];
// Do nothing.
[PEPiOSAdapter stopKeyserverLookup];
[PEPObjCAdapter stopKeyserverLookup];
[self pEpCleanUp];
}
- (void)testLongKeyServerLookup {
[self pEpSetUp];
[PEPiOSAdapter startKeyserverLookup];
[PEPObjCAdapter startKeyserverLookup];
NSMutableDictionary *ident = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@"pEpDontAssert", @"username",
@ -190,7 +190,7 @@ PEPSession *session;
XCTAssert(ident[@"fpr"]);
[PEPiOSAdapter stopKeyserverLookup];
[PEPObjCAdapter stopKeyserverLookup];
[self pEpCleanUp];
}
@ -1139,7 +1139,7 @@ encmsg[@"outgoing"] = @NO;
- (void)testParallelSessions
{
//[PEPiOSAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
//[PEPObjCAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
// Currently, the first session use MUST be on the main thread
[self pEpSetUp];


+ 8
- 8
pEpiOSAdapter.xcodeproj/project.pbxproj View File

@ -9,8 +9,8 @@
/* Begin PBXBuildFile section */
350F0ED31B4D642200D9964F /* PEPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 350F0ED21B4D642200D9964F /* PEPSession.m */; };
350F0ED91B4E997300D9964F /* PEPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 350F0ED81B4E997300D9964F /* PEPMessage.m */; };
352988AE1AEF964100FA7E2E /* PEPiOSAdapter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 352988AD1AEF964100FA7E2E /* PEPiOSAdapter.h */; };
352988B01AEF964100FA7E2E /* PEPiOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 352988AF1AEF964100FA7E2E /* PEPiOSAdapter.m */; };
352988AE1AEF964100FA7E2E /* PEPObjCAdapter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 352988AD1AEF964100FA7E2E /* PEPObjCAdapter.h */; };
352988B01AEF964100FA7E2E /* PEPObjCAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 352988AF1AEF964100FA7E2E /* PEPObjCAdapter.m */; };
35EA58151B565643000B4CC5 /* PEPQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EA58141B565643000B4CC5 /* PEPQueue.m */; };
43293F011EBA067600EEE010 /* PEPLanguage.m in Sources */ = {isa = PBXBuildFile; fileRef = 43293F001EBA067600EEE010 /* PEPLanguage.m */; };
43293F021EBA0FDC00EEE010 /* PEPLanguage.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43293EFF1EBA067600EEE010 /* PEPLanguage.h */; };
@ -105,7 +105,7 @@
43293F021EBA0FDC00EEE010 /* PEPLanguage.h in CopyFiles */,
640037FA1BE1A7EF00F0014E /* PEPQueue.h in CopyFiles */,
640037F91BE1A7DE00F0014E /* PEPSession.h in CopyFiles */,
352988AE1AEF964100FA7E2E /* PEPiOSAdapter.h in CopyFiles */,
352988AE1AEF964100FA7E2E /* PEPObjCAdapter.h in CopyFiles */,
64415E4E1BEB8ECD00F6CBB2 /* PEPMessage.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -118,8 +118,8 @@
350F0ED71B4E997300D9964F /* PEPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPMessage.h; sourceTree = "<group>"; };
350F0ED81B4E997300D9964F /* PEPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPMessage.m; sourceTree = "<group>"; };
352988AA1AEF964100FA7E2E /* libpEpiOSAdapter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpiOSAdapter.a; sourceTree = BUILT_PRODUCTS_DIR; };
352988AD1AEF964100FA7E2E /* PEPiOSAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPiOSAdapter.h; sourceTree = "<group>"; };
352988AF1AEF964100FA7E2E /* PEPiOSAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPiOSAdapter.m; sourceTree = "<group>"; };
352988AD1AEF964100FA7E2E /* PEPObjCAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter.h; sourceTree = "<group>"; };
352988AF1AEF964100FA7E2E /* PEPObjCAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter.m; sourceTree = "<group>"; };
35EA58131B565643000B4CC5 /* PEPQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPQueue.h; sourceTree = "<group>"; };
35EA58141B565643000B4CC5 /* PEPQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPQueue.m; sourceTree = "<group>"; };
35FB0ABB1B57F97E00377032 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
@ -211,9 +211,9 @@
352988AC1AEF964100FA7E2E /* pEpiOSAdapter */ = {
isa = PBXGroup;
children = (
352988AD1AEF964100FA7E2E /* PEPiOSAdapter.h */,
352988AD1AEF964100FA7E2E /* PEPObjCAdapter.h */,
64415E5A1BF3840500F6CBB2 /* PEPIOSAdapter+Internal.h */,
352988AF1AEF964100FA7E2E /* PEPiOSAdapter.m */,
352988AF1AEF964100FA7E2E /* PEPObjCAdapter.m */,
350F0ED11B4D642200D9964F /* PEPSession.h */,
642FB6551ECB4B89008D3DF3 /* PEPSession+Internal.h */,
350F0ED21B4D642200D9964F /* PEPSession.m */,
@ -414,7 +414,7 @@
43293F051EBA246700EEE010 /* PEPCSVScanner.m in Sources */,
350F0ED31B4D642200D9964F /* PEPSession.m in Sources */,
350F0ED91B4E997300D9964F /* PEPMessage.m in Sources */,
352988B01AEF964100FA7E2E /* PEPiOSAdapter.m in Sources */,
352988B01AEF964100FA7E2E /* PEPObjCAdapter.m in Sources */,
43293F011EBA067600EEE010 /* PEPLanguage.m in Sources */,
43293F081EBA364700EEE010 /* NSArray+Extension.m in Sources */,
);


+ 1
- 1
pEpiOSAdapter/PEPIOSAdapter+Internal.h View File

@ -15,7 +15,7 @@
#import "PEPSession.h"
#import "PEPSession+Internal.h"
@interface PEPiOSAdapter ()
@interface PEPObjCAdapter ()
// this messages are for internal use only; do not call


pEpiOSAdapter/PEPiOSAdapter.h → pEpiOSAdapter/PEPObjCAdapter.h View File


pEpiOSAdapter/PEPiOSAdapter.m → pEpiOSAdapter/PEPObjCAdapter.m View File


+ 1
- 1
pEpiOSAdapter/PEPSession.h View File

@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import "PEPiOSAdapter.h"
#import "PEPObjCAdapter.h"
#import "PEPMessage.h"
@class PEPSession;


+ 4
- 4
pEpiOSAdapter/PEPSession.m View File

@ -8,7 +8,7 @@
#import "PEPSession.h"
#import "PEPSession+Internal.h"
#import "PEPiOSAdapter.h"
#import "PEPObjCAdapter.h"
#import "PEPIOSAdapter+Internal.h"
#import "PEPMessage.h"
#import "PEPLanguage.h"
@ -52,7 +52,7 @@
{
static dispatch_once_t once;
dispatch_once(&once, ^{
[PEPiOSAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
[PEPObjCAdapter setupTrustWordsDB:[NSBundle bundleForClass:[self class]]];
});
}
@ -66,14 +66,14 @@
return nil;
}
[PEPiOSAdapter bindSession:self];
[PEPObjCAdapter bindSession:self];
return self;
}
- (void)dealloc
{
[PEPiOSAdapter unbindSession:self];
[PEPObjCAdapter unbindSession:self];
release(_session);
}


Loading…
Cancel
Save