ET-5823: Fix to make URLScheme case insensitive

This commit is contained in:
Xavi Gil
2026-02-10 11:43:59 +01:00
parent 4ab5434565
commit 2b9734bd3b
7 changed files with 115 additions and 3 deletions
@@ -59,7 +59,7 @@ enum DeepLinkRouteCoder {
guard
let components = URLComponents(url: deepLink, resolvingAgainstBaseURL: true),
let rawScheme = components.scheme,
let supportedScheme = Bundle.URLScheme(rawValue: rawScheme)
let supportedScheme = Bundle.URLScheme(caseInsensitive: rawScheme)
else {
return nil
}
+1
View File
@@ -7,3 +7,4 @@ DerivedData/
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.swiftpm/xcode/xcshareddata/
.netrc
Package.resolved
+7 -1
View File
@@ -26,6 +26,12 @@ let package = Package(
resources: [
.process("Resources")
]
)
),
.testTarget(
name: "InboxCoreTests",
dependencies: [
.target(name: "InboxCore"),
]
),
]
)
@@ -18,7 +18,7 @@
import Foundation
public extension Bundle {
enum URLScheme: String, Sendable {
enum URLScheme: String, Sendable, CaseInsensitiveRawRepresentable {
case mailto
case protonmail
}
@@ -0,0 +1,29 @@
// Copyright (c) 2026 Proton Technologies AG
//
// This file is part of Proton Mail.
//
// Proton Mail is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Proton Mail is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Proton Mail. If not, see https://www.gnu.org/licenses/.
public protocol CaseInsensitiveRawRepresentable: RawRepresentable, CaseIterable where RawValue == String {}
public extension CaseInsensitiveRawRepresentable {
init?(caseInsensitive rawValue: String) {
guard
let match = Self.allCases.first(where: {
$0.rawValue.caseInsensitiveCompare(rawValue) == .orderedSame
})
else { return nil }
self = match
}
}
@@ -0,0 +1,69 @@
// Copyright (c) 2026 Proton Technologies AG
//
// This file is part of Proton Mail.
//
// Proton Mail is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Proton Mail is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Proton Mail. If not, see https://www.gnu.org/licenses/.
import XCTest
@testable import InboxCore
final class CaseInsensitiveRawRepresentableTests: XCTestCase {
private enum TestStatus: String, CaseInsensitiveRawRepresentable {
case active = "Active"
case inactive = "Inactive"
case pending = "PENDING"
case archived = "archived"
}
func testInit_WithExactMatch_ReturnsCorrectCase() {
XCTAssertEqual(TestStatus(caseInsensitive: "Active"), .active)
XCTAssertEqual(TestStatus(caseInsensitive: "Inactive"), .inactive)
XCTAssertEqual(TestStatus(caseInsensitive: "PENDING"), .pending)
XCTAssertEqual(TestStatus(caseInsensitive: "archived"), .archived)
}
func testInit_WithLowercaseInput_ReturnsCorrectCase() {
XCTAssertEqual(TestStatus(caseInsensitive: "active"), .active)
XCTAssertEqual(TestStatus(caseInsensitive: "inactive"), .inactive)
XCTAssertEqual(TestStatus(caseInsensitive: "pending"), .pending)
XCTAssertEqual(TestStatus(caseInsensitive: "archived"), .archived)
}
func testInit_WithUppercaseInput_ReturnsCorrectCase() {
XCTAssertEqual(TestStatus(caseInsensitive: "ACTIVE"), .active)
XCTAssertEqual(TestStatus(caseInsensitive: "INACTIVE"), .inactive)
XCTAssertEqual(TestStatus(caseInsensitive: "PENDING"), .pending)
XCTAssertEqual(TestStatus(caseInsensitive: "ARCHIVED"), .archived)
}
func testInit_WithMixedCaseInput_ReturnsCorrectCase() {
XCTAssertEqual(TestStatus(caseInsensitive: "AcTiVe"), .active)
XCTAssertEqual(TestStatus(caseInsensitive: "InAcTiVe"), .inactive)
XCTAssertEqual(TestStatus(caseInsensitive: "PeNdInG"), .pending)
XCTAssertEqual(TestStatus(caseInsensitive: "ArChIvEd"), .archived)
}
func testInit_WithNonExistentValue_ReturnsNil() {
XCTAssertNil(TestStatus(caseInsensitive: "unknown"))
XCTAssertNil(TestStatus(caseInsensitive: "UNKNOWN"))
XCTAssertNil(TestStatus(caseInsensitive: "deleted"))
XCTAssertNil(TestStatus(caseInsensitive: "suspended"))
}
func testInit_WithEmptyString_ReturnsNil() {
XCTAssertNil(TestStatus(caseInsensitive: ""))
}
}
@@ -34,6 +34,13 @@
"name" : "InboxCoreUITests"
}
},
{
"target" : {
"containerPath" : "container:Modules\/InboxCore",
"identifier" : "InboxCoreTests",
"name" : "InboxCoreTests"
}
},
{
"target" : {
"containerPath" : "container:Modules\/TestableShareExtension",