Skip to content

Commit

Permalink
fix: temporary fix for network config update
Browse files Browse the repository at this point in the history
  • Loading branch information
aeddi committed Aug 19, 2019
1 parent 65cda43 commit 1e7009a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
33 changes: 16 additions & 17 deletions client/ios/Berty.xcodeproj/project.pbxproj
Expand Up @@ -5,7 +5,6 @@
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
Expand Down Expand Up @@ -2319,7 +2318,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = WMBQ84HN4T;
DISPLAY_NAME = "Berty Debug";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -2387,10 +2386,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Release";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = WMBQ84HN4T;
DISPLAY_NAME = Berty;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -2435,8 +2434,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios;
PRODUCT_NAME = Berty;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "180f67c5-ba82-4ef0-ba95-228b27fcf162";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.berty.ios";
REACT_HEADERS_PATH = "";
REACT_LIBRARY_PATH = "";
SWIFT_OBJC_BRIDGING_HEADER = "Berty/Berty-Bridging-Header.h";
Expand Down Expand Up @@ -2696,10 +2695,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-House";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = GR5463T564;
DISPLAY_NAME = "Berty Yolo";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -2747,8 +2746,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios.yolo;
PRODUCT_NAME = Berty;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "9fce9842-13d9-44c0-877f-f1bd4f500c5e";
PROVISIONING_PROFILE_SPECIFIER = "match InHouse chat.berty.ios.yolo";
REACT_HEADERS_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)/include";
REACT_LIBRARY_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Berty/Berty-Bridging-Header.h";
Expand Down Expand Up @@ -2947,10 +2946,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Adhoc";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = WMBQ84HN4T;
DISPLAY_NAME = "Berty Staff";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -2999,8 +2998,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios.staff;
PRODUCT_NAME = Berty;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "a6ff975a-e522-4340-a954-fe68323f6396";
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc chat.berty.ios.staff";
REACT_HEADERS_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)/include";
REACT_LIBRARY_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Berty/Berty-Bridging-Header.h";
Expand Down
5 changes: 4 additions & 1 deletion network/transport/ble/transport.go
Expand Up @@ -77,7 +77,10 @@ func (t *Transport) CanDial(addr ma.Multiaddr) bool {
func (t *Transport) Listen(lMa ma.Multiaddr) (tpt.Listener, error) {
// If a global listener already exists, returns an error.
if gListener != nil {
return nil, errors.New("transport listen failed: one listener maximum")
// TODO: restore this when published as generic lib / fixed in Berty network
// config update
// return nil, errors.New("transport listen failed: one listener maximum")
gListener.Close()
}

// Checks if lMa is a valid multiaddr
Expand Down

0 comments on commit 1e7009a

Please sign in to comment.