IPS-107 cleans import mess and cyclic import issues when using all our transports in one project (Supervisor)

PublicHeaders/PEPBlockBasedTransportProtocol.h

@@ -9,10 +9,10 @@
 
 #import "PEPTransportProtocol.h"
 #import "PEPTransportStatusCode.h"
-#import "PEPObjCTypes.h"
 
 @class PEPTransportConfig;
 @class PEPSession;
+@class PEPMessage;
 
 NS_ASSUME_NONNULL_BEGIN
 

PublicHeaders/PEPTransportProtocol.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#import "PEPObjCTypes.h"
+#import <PEPEngineTypes.h>
 #import "PEPTransportStatusCode.h"
 
 @class PEPTransportConfig;

PublicHeaders/PEPTransportStatusCode.h

@@ -0,0 +1,71 @@
+///
+/// This file was automatically generated. Don't edit it manually.
+///
+/// For details, see here:
+/// https://gitea.pep.foundation/pEp.foundation/libpEpTransport
+///
+
+#ifndef __PEPTransportStatusCode_H__
+#define __PEPTransportStatusCode_H__
+
+#import <Foundation/Foundation.h>
+
+typedef NS_CLOSED_ENUM(NSUInteger, PEPTransportStatusCode) {
+    PEPTransportStatusCodeReady = 0x00000000,
+    
+    // non error states
+    
+    PEPTransportStatusCodeConnectionUp = 0x00000001,
+    PEPTransportStatusCodeMessageDelivered = 0x00000002,
+    PEPTransportStatusCodeMessageOnTheWay = 0x00000003,
+    PEPTransportStatusCodeCouldNotDeliverResending = 0x00000004,
+    
+    // error states
+    
+    PEPTransportStatusCodeConnectionDown = 0x00800001, // sent by connection based transports
+    PEPTransportStatusCodeSomeRecipientsUnreachable = 0x00800002,
+    PEPTransportStatusCodeNoRecipientsReachable = 0x00800003,
+    PEPTransportStatusCodeNoConfig = 0x00800004,
+    PEPTransportStatusCodeConfigIncompleteOrWrong = 0x00800005,
+    PEPTransportStatusCodeNoSendConfig = 0x00800006,
+    PEPTransportStatusCodeNoRecvConfig = 0x00800007,
+    PEPTransportStatusCodeSendConfigIncompleteOrWrong = 0x00800008,
+    PEPTransportStatusCodeRecvConfigIncompleteOrWrong = 0x00800009,
+    PEPTransportStatusCodeNetworkTimeout = 0x0080000a,
+    PEPTransportStatusCodeCouldNotDeliverGivingUp = 0x0080000b,
+    PEPTransportStatusCodeRxQueueUnderrun = 0x0080000c, // no message left to be received
+    PEPTransportStatusCodeTxQueueOverflow = 0x0080000d, // transmit queue is full
+    
+    // transport is shut down
+    
+    PEPTransportStatusCodeShutDown = 0x00ffffff,
+    
+    // transport status codes for email (0x01)
+    
+    PEPTransportStatusCodeCannotReachSmtpServer = 0x01801001,
+    PEPTransportStatusCodeUnknownSmtpError = 0x01801fff,
+    PEPTransportStatusCodeCannotReachImapServer = 0x01802001,
+    PEPTransportStatusCodeUnknownImapError = 0x01802fff,
+    
+    // transport status codes for RCE (0x02)
+    
+    PEPTransportStatusCodeRceCannotCreateUser = 0x02800001,
+    PEPTransportStatusCodeRceCannotLoginUser = 0x02800002,
+    PEPTransportStatusCodeRceCannotFindUser = 0x02800003,
+    PEPTransportStatusCodeTorrentHasNoSeeders = 0x02ff0001,
+    PEPTransportStatusCodeUnknownTorrentError = 0x02ffffff,
+    
+    // transport status codes for PDL (0x03)
+    
+    PEPTransportStatusCodeCannotReachEthNetwork = 0x03800001,
+    PEPTransportStatusCodeCannotDecodePdlMessage = 0x03800002,
+    PEPTransportStatusCodeUnknownEthError = 0x03ffffff,
+    
+    // transport status codes for pEp over SCTP (0x04)
+    
+    PEPTransportStatusCodeSctpCouldNotDecodeAsn1 = 0x04080001,
+    PEPTransportStatusCodeSctpErrorReceivingMessage = 0x04080002,
+    PEPTransportStatusCodeSctpUnkownError = 0x04ffffff
+};
+
+#endif // __PEPTransportStatusCode_H__

build-mac/pEpTransport.xcodeproj/project.pbxproj

@@ -116,7 +116,7 @@
 		433A53D127ABC64E004069D7 /* PEPBlockBasedTransport+IncomingMessageDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "PEPBlockBasedTransport+IncomingMessageDelegate.m"; sourceTree = "<group>"; };
 		43B26350272AA95000EE82BC /* libpEpTransport_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpTransport_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43B263CF272AC13400EE82BC /* libpEpTransport_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpTransport_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		43C24CF427A14978000E90FF /* PEPTransportStatusCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PEPTransportStatusCode.h; path = "../build-mac/Build/include/pEp/PEPTransportStatusCode.h"; sourceTree = "<group>"; };
+		43C24CF427A14978000E90FF /* PEPTransportStatusCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPTransportStatusCode.h; sourceTree = "<group>"; };
 		43C24CF727A14978000E90FF /* PEPTransportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPTransportProtocol.h; sourceTree = "<group>"; };
 		43C24D0A27A14A55000E90FF /* PEPBlockBasedTransportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPBlockBasedTransportProtocol.h; sourceTree = "<group>"; };
 		43C24D0C27A14B1B000E90FF /* PEPBlockBasedTransport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPBlockBasedTransport.h; sourceTree = "<group>"; };
@@ -194,8 +194,6 @@
 			children = (
 				43C24F9827A40135000E90FF /* Util */,
 				43C24F1927A3F5EA000E90FF /* TransportDelegates */,
-				43C24CF427A14978000E90FF /* PEPTransportStatusCode.h */,
-				43C24CF727A14978000E90FF /* PEPTransportProtocol.h */,
 				43C2508427A7F330000E90FF /* PEPBlockBasedTransport+Internal.h */,
 				433A534027AA8256004069D7 /* PEPBlockBasedTransport+Error.h */,
 				433A534127AA8256004069D7 /* PEPBlockBasedTransport+Error.m */,
@@ -208,8 +206,10 @@
 		43C24D0927A14A55000E90FF /* PublicHeaders */ = {
 			isa = PBXGroup;
 			children = (
+				43C24CF727A14978000E90FF /* PEPTransportProtocol.h */,
 				43C24D0A27A14A55000E90FF /* PEPBlockBasedTransportProtocol.h */,
 				43C24D0C27A14B1B000E90FF /* PEPBlockBasedTransport.h */,
+				43C24CF427A14978000E90FF /* PEPTransportStatusCode.h */,
 			);
 			name = PublicHeaders;
 			path = ../PublicHeaders;

build-mac/pEpTransportTests/TestUtils/Transport/TransportMock.m

@@ -8,6 +8,8 @@
 #import "TransportMock.h"
 #import "TransportMock+Error.h"
 
+#import <PEPObjCTypes.h>
+
 static const PEPTransportID s_transportID = PEPTransportIDTransportAuto;
 
 @interface TransportMock ()

src/PEPBlockBasedTransport.m

@@ -7,6 +7,8 @@
 
 #import "PEPBlockBasedTransport.h"
 
+#import <PEPObjCTypes.h>
+
 #import "PEPBlockBasedTransport+StatusChangeDelegate.h"
 #import "PEPBlockBasedTransport+SendToResultDelegate.h"
 #import "PEPBlockBasedTransport+IncomingMessageDelegate.h"