diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -12,8 +12,6 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1F537ACC7B60DC049C0ECFA7 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769A87FB41BCE3FEF97FD59A /* ExpoModulesProvider.swift */; };
2DDA0AE067906E18B83A455C /* ClientGetReadReactor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DDA00CA889DFF0ECB7E338D /* ClientGetReadReactor.cpp */; };
- 71009A7726FDCA67002C8453 /* tunnelbroker.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7326FDCA67002C8453 /* tunnelbroker.pb.cc */; };
- 71009A7826FDCA67002C8453 /* tunnelbroker.grpc.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7526FDCA67002C8453 /* tunnelbroker.grpc.pb.cc */; };
71009A7B26FDCD72002C8453 /* Client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7926FDCD71002C8453 /* Client.cpp */; };
71142A7726C2650B0039DCBD /* CommSecureStoreIOSWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71142A7626C2650A0039DCBD /* CommSecureStoreIOSWrapper.mm */; };
711B408425DA97F9005F8F06 /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F26E81B24440D87004049C6 /* dummy.swift */; };
@@ -59,10 +57,8 @@
CB3C621227CE65030054F24C /* CommSecureStoreIOSWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71142A7626C2650A0039DCBD /* CommSecureStoreIOSWrapper.mm */; };
CB4821A527CF9F38001AB7E1 /* CommSecureStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71D4D7CB26C50B1000FCDBCD /* CommSecureStore.mm */; };
CB4821A627CFB153001AB7E1 /* Client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7926FDCD71002C8453 /* Client.cpp */; };
- CB4821A827CFB153001AB7E1 /* tunnelbroker.grpc.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7526FDCA67002C8453 /* tunnelbroker.grpc.pb.cc */; };
CB4821A927CFB153001AB7E1 /* WorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 718DE99C2653D41C00365824 /* WorkerThread.cpp */; };
CB4821AA27CFB153001AB7E1 /* Tools.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71CA4AEB262F236100835C89 /* Tools.mm */; };
- CB4821AB27CFB17C001AB7E1 /* tunnelbroker.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 71009A7326FDCA67002C8453 /* tunnelbroker.pb.cc */; };
CB4821AC27CFB17C001AB7E1 /* Session.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BF5B6F26B3FF0900EDE27D /* Session.cpp */; };
CB4821AD27CFB17C001AB7E1 /* NetworkModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726E5D732731A4790032361D /* NetworkModule.cpp */; };
CB4821AE27CFB187001AB7E1 /* Tools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BF5B7326B401D300EDE27D /* Tools.cpp */; };
@@ -72,6 +68,10 @@
CBFE58292885852B003B94C9 /* ThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBFE58282885852B003B94C9 /* ThreadOperations.cpp */; };
D7DB6E0F85B2DBE15B01EC21 /* libPods-Comm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 994BEBDD4E4959F69CEA0BC3 /* libPods-Comm.a */; };
F02C296C528B51ADAB5AA19D /* libPods-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EE4DCB430B05EC9DE7D7B01 /* libPods-NotificationService.a */; };
+ FC2DF95528BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = FC2DF95128BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc */; };
+ FC2DF95628BFCFE90017C4AF /* tunnelbroker.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = FC2DF95328BFCFE90017C4AF /* tunnelbroker.pb.cc */; };
+ FC2DF95728BFD02A0017C4AF /* tunnelbroker.grpc.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = FC2DF95128BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc */; };
+ FC2DF95828BFD0350017C4AF /* tunnelbroker.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = FC2DF95328BFCFE90017C4AF /* tunnelbroker.pb.cc */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -117,10 +117,6 @@
2DDA0A22FECC9DAA5C19C35D /* Metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Metadata.h; sourceTree = "<group>"; };
3EE4DCB430B05EC9DE7D7B01 /* libPods-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3EEB3E70587B0ADAD05237B0 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-Comm/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
- 71009A7326FDCA67002C8453 /* tunnelbroker.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tunnelbroker.pb.cc; sourceTree = "<group>"; };
- 71009A7426FDCA67002C8453 /* tunnelbroker.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tunnelbroker.pb.h; sourceTree = "<group>"; };
- 71009A7526FDCA67002C8453 /* tunnelbroker.grpc.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tunnelbroker.grpc.pb.cc; sourceTree = "<group>"; };
- 71009A7626FDCA67002C8453 /* tunnelbroker.grpc.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tunnelbroker.grpc.pb.h; sourceTree = "<group>"; };
71009A7926FDCD71002C8453 /* Client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Client.cpp; sourceTree = "<group>"; };
71009A7A26FDCD71002C8453 /* Client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Client.h; sourceTree = "<group>"; };
71142A7526C2650A0039DCBD /* CommSecureStoreIOSWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommSecureStoreIOSWrapper.h; path = Comm/CommSecureStoreIOSWrapper.h; sourceTree = "<group>"; };
@@ -223,6 +219,10 @@
CBFE58272885852B003B94C9 /* ThreadOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadOperations.h; path = PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h; sourceTree = "<group>"; };
CBFE58282885852B003B94C9 /* ThreadOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadOperations.cpp; path = PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp; sourceTree = "<group>"; };
F53DA7B3F26C2798DCE74A94 /* Pods-Comm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Comm.debug.xcconfig"; path = "Target Support Files/Pods-Comm/Pods-Comm.debug.xcconfig"; sourceTree = "<group>"; };
+ FC2DF95128BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tunnelbroker.grpc.pb.cc; sourceTree = "<group>"; };
+ FC2DF95228BFCFE90017C4AF /* tunnelbroker.grpc.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tunnelbroker.grpc.pb.h; sourceTree = "<group>"; };
+ FC2DF95328BFCFE90017C4AF /* tunnelbroker.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tunnelbroker.pb.cc; sourceTree = "<group>"; };
+ FC2DF95428BFCFE90017C4AF /* tunnelbroker.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tunnelbroker.pb.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -312,24 +312,12 @@
71009A7A26FDCD71002C8453 /* Client.h */,
B7BEE744279B3E20009CCA35 /* GRPCStreamHostObject.cpp */,
B7BEE748279B3F2E009CCA35 /* GRPCStreamHostObject.h */,
- 718A3C0626F22D0A00F04A8D /* _generated */,
B72879B827A865EF008A04CC /* ClientGetReadReactor.h */,
2DDA00CA889DFF0ECB7E338D /* ClientGetReadReactor.cpp */,
);
path = grpc;
sourceTree = "<group>";
};
- 718A3C0626F22D0A00F04A8D /* _generated */ = {
- isa = PBXGroup;
- children = (
- 71009A7526FDCA67002C8453 /* tunnelbroker.grpc.pb.cc */,
- 71009A7626FDCA67002C8453 /* tunnelbroker.grpc.pb.h */,
- 71009A7326FDCA67002C8453 /* tunnelbroker.pb.cc */,
- 71009A7426FDCA67002C8453 /* tunnelbroker.pb.h */,
- );
- path = _generated;
- sourceTree = "<group>";
- };
71B8CCB626BD30EC0040C0A2 /* CommCoreImplementations */ = {
isa = PBXGroup;
children = (
@@ -497,6 +485,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
+ FC2DF94E28BFCF5B0017C4AF /* shared */,
71BE84362636A944002849D2 /* cpp */,
13B07FAE1A68108700A75B9A /* Comm */,
713EE40726C6676B003D7C48 /* CommTests */,
@@ -612,6 +601,34 @@
name = Comm;
sourceTree = "<group>";
};
+ FC2DF94E28BFCF5B0017C4AF /* shared */ = {
+ isa = PBXGroup;
+ children = (
+ FC2DF94F28BFCFA30017C4AF /* protos */,
+ );
+ name = shared;
+ path = ../../shared;
+ sourceTree = "<group>";
+ };
+ FC2DF94F28BFCFA30017C4AF /* protos */ = {
+ isa = PBXGroup;
+ children = (
+ FC2DF95028BFCFB80017C4AF /* _generated */,
+ );
+ path = protos;
+ sourceTree = "<group>";
+ };
+ FC2DF95028BFCFB80017C4AF /* _generated */ = {
+ isa = PBXGroup;
+ children = (
+ FC2DF95128BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc */,
+ FC2DF95228BFCFE90017C4AF /* tunnelbroker.grpc.pb.h */,
+ FC2DF95328BFCFE90017C4AF /* tunnelbroker.pb.cc */,
+ FC2DF95428BFCFE90017C4AF /* tunnelbroker.pb.h */,
+ );
+ path = _generated;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -938,22 +955,22 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ FC2DF95628BFCFE90017C4AF /* tunnelbroker.pb.cc in Sources */,
CB38B48628771CDD00171182 /* TemporaryMessageStorage.mm in Sources */,
CB38B48428771CAF00171182 /* EncryptedFileUtils.mm in Sources */,
CBFE58292885852B003B94C9 /* ThreadOperations.cpp in Sources */,
CB38B48228771C7A00171182 /* NonBlockingLock.mm in Sources */,
- 71009A7826FDCA67002C8453 /* tunnelbroker.grpc.pb.cc in Sources */,
B7BEE749279B3FB6009CCA35 /* GRPCStreamHostObject.cpp in Sources */,
718DE99E2653D41C00365824 /* WorkerThread.cpp in Sources */,
71CA4AEC262F236100835C89 /* Tools.mm in Sources */,
71009A7B26FDCD72002C8453 /* Client.cpp in Sources */,
71762A75270D8AAE00F565ED /* PlatformSpecificTools.mm in Sources */,
71BF5B7126B3FF0900EDE27D /* Session.cpp in Sources */,
- 71009A7726FDCA67002C8453 /* tunnelbroker.pb.cc in Sources */,
726E5D752731A4790032361D /* NetworkModule.cpp in Sources */,
71BF5B7526B401D300EDE27D /* Tools.cpp in Sources */,
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
71142A7726C2650B0039DCBD /* CommSecureStoreIOSWrapper.mm in Sources */,
+ FC2DF95528BFCFE90017C4AF /* tunnelbroker.grpc.pb.cc in Sources */,
CB38F2B1286C6C870010535C /* MessageOperationsUtilities.cpp in Sources */,
71BE84492636A944002849D2 /* NativeModules.cpp in Sources */,
71CA4A64262DA8E500835C89 /* Logger.mm in Sources */,
@@ -989,11 +1006,11 @@
CB4821B227CFB20E001AB7E1 /* SQLiteQueryExecutor.cpp in Sources */,
CB4821B127CFB1FA001AB7E1 /* GlobalNetworkSingleton.cpp in Sources */,
CB4821AE27CFB187001AB7E1 /* Tools.cpp in Sources */,
- CB4821AB27CFB17C001AB7E1 /* tunnelbroker.pb.cc in Sources */,
+ FC2DF95828BFD0350017C4AF /* tunnelbroker.pb.cc in Sources */,
+ FC2DF95728BFD02A0017C4AF /* tunnelbroker.grpc.pb.cc in Sources */,
CB4821AC27CFB17C001AB7E1 /* Session.cpp in Sources */,
CB4821AD27CFB17C001AB7E1 /* NetworkModule.cpp in Sources */,
CB4821A627CFB153001AB7E1 /* Client.cpp in Sources */,
- CB4821A827CFB153001AB7E1 /* tunnelbroker.grpc.pb.cc in Sources */,
CB4821A927CFB153001AB7E1 /* WorkerThread.cpp in Sources */,
CB4821AA27CFB153001AB7E1 /* Tools.mm in Sources */,
CB4821A527CF9F38001AB7E1 /* CommSecureStore.mm in Sources */,