Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Common/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -109404,6 +109404,9 @@
}
}
}
},
"Malformed WHIP URL" : {

},
"Manage streams" : {
"localizations" : {
Expand Down
15 changes: 15 additions & 0 deletions Common/Various/Validate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ func isValidRistUrl(url: String) -> String? {
return nil
}

func isValidWhipUrl(url: String) -> String? {
guard URL(string: url) != nil else {
return String(localized: "Malformed WHIP URL")
}
return nil
}

private func isValidIrlUrl(url: String) -> String? {
guard URL(string: url) != nil else {
return String(localized: "Malformed IRL URL")
Expand Down Expand Up @@ -107,6 +114,14 @@ func isValidUrl(url value: String,
if let message = isValidRistUrl(url: value) {
return message
}
case "whip":
if let message = isValidWhipUrl(url: value) {
return message
}
case "whips":
if let message = isValidWhipUrl(url: value) {
return message
}
case "irl":
if let message = isValidIrlUrl(url: value) {
return message
Expand Down
19 changes: 19 additions & 0 deletions Moblin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
03B7DAB52BA640C100CEFC1B /* XMLCoder in Frameworks */ = {isa = PBXBuildFile; productRef = 03B7DAB42BA640C100CEFC1B /* XMLCoder */; };
03BC11672AE5654700C38FC4 /* SDWebImageSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 03BC11662AE5654700C38FC4 /* SDWebImageSwiftUI */; };
03BC116B2AE56C2200C38FC4 /* SDWebImageWebPCoder in Frameworks */ = {isa = PBXBuildFile; productRef = 03BC116A2AE56C2200C38FC4 /* SDWebImageWebPCoder */; };
03C1737B2F3AF80500487806 /* Webrtc in Frameworks */ = {isa = PBXBuildFile; productRef = 03C1737A2F3AF80500487806 /* Webrtc */; };
03D5A1C22F5A600100A1B2C3 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
03ECDF532B8E4E6000BD920E /* Moblin.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 03ECDF462B8E4E5E00BD920E /* Moblin.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
03ECDF5D2B8E5F0B00BD920E /* WrappingHStack in Frameworks */ = {isa = PBXBuildFile; productRef = 03ECDF5C2B8E5F0B00BD920E /* WrappingHStack */; };
03F465EC2C441D1400630708 /* CrcSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 03F465EB2C441D1400630708 /* CrcSwift */; };
Expand Down Expand Up @@ -212,6 +214,7 @@
files = (
03B7DAB52BA640C100CEFC1B /* XMLCoder in Frameworks */,
033BEAC42C0FCC0B005F4E06 /* NWWebSocket in Frameworks */,
03C1737B2F3AF80500487806 /* Webrtc in Frameworks */,
0307869A2AEC23FB0061FDE2 /* StoreKit.framework in Frameworks */,
03BC11672AE5654700C38FC4 /* SDWebImageSwiftUI in Frameworks */,
0318D36A2CF51D6900E12F3B /* SwiftProtobuf in Frameworks */,
Expand All @@ -230,6 +233,7 @@
03A08B7C2AC295620018BA95 /* AlertToast in Frameworks */,
0377239C2DE35191007D040D /* VRMSceneKit in Frameworks */,
03BC116B2AE56C2200C38FC4 /* SDWebImageWebPCoder in Frameworks */,
03D5A1C22F5A600100A1B2C3 /* (null) in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -364,6 +368,7 @@
035351932F1C271700428DAC /* AppAuthCore */,
035351952F1C27A500428DAC /* AppAuth */,
0360FD152F228EEB00FF8847 /* MetalPetal */,
03C1737A2F3AF80500487806 /* Webrtc */,
);
productName = Mobs;
productReference = 035E9E332A9A02D6009D4F5A /* Moblin.app */;
Expand Down Expand Up @@ -519,6 +524,7 @@
882D0C142DF76F5B0035BFAF /* XCRemoteSwiftPackageReference "BlackSharkLib" */,
035351922F1C271700428DAC /* XCRemoteSwiftPackageReference "AppAuth-iOS" */,
0360FD142F228EEB00FF8847 /* XCRemoteSwiftPackageReference "MetalPetal" */,
03C173792F3AF80500487806 /* XCRemoteSwiftPackageReference "Webrtc" */,
);
productRefGroup = 035E9E342A9A02D6009D4F5A /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1335,6 +1341,14 @@
minimumVersion = 0.14.0;
};
};
03C173792F3AF80500487806 /* XCRemoteSwiftPackageReference "Webrtc" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/eerimoq/Webrtc/";
requirement = {
branch = main;
kind = branch;
};
};
03F465EA2C441D1400630708 /* XCRemoteSwiftPackageReference "CrcSwift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/eerimoq/CrcSwift.git";
Expand Down Expand Up @@ -1449,6 +1463,11 @@
package = 03BC11692AE56C2200C38FC4 /* XCRemoteSwiftPackageReference "SDWebImageWebPCoder" */;
productName = SDWebImageWebPCoder;
};
03C1737A2F3AF80500487806 /* Webrtc */ = {
isa = XCSwiftPackageProductDependency;
package = 03C173792F3AF80500487806 /* XCRemoteSwiftPackageReference "Webrtc" */;
productName = Webrtc;
};
03ECDF5C2B8E5F0B00BD920E /* WrappingHStack */ = {
isa = XCSwiftPackageProductDependency;
package = 0320D8742AED36860030418F /* XCRemoteSwiftPackageReference "WrappingHStack" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading