Skip to content

fix: don't use hardcoded support urls - WPB-24858 #4594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
johnxnguyen wants to merge 1 commit into
base: release/cycle-4.16
Choose a base branch
from
Draft

fix: don't use hardcoded support urls - WPB-24858 #4594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion wire-ios/Configuration/url.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@
"howToAddConversationToCustomFolder": "https://support.wire.com/hc/en-us/articles/360002855817-Add-a-conversation-to-a-custom-folder",
"howToChangeEmail": "https://support.wire.com/hc/en-us/articles/203762940-Change-your-email-address",
"howToDeleteAccount": "https://support.wire.com/hc/en-us/articles/207555795-Delete-a-personal-account",
"learnMoreAboutChannels": "https://support.wire.com/hc/en-us/articles/25732551379101-Create-a-channel"
"learnMoreAboutChannels": "https://support.wire.com/hc/en-us/articles/25732551379101-Create-a-channel",
"learnMoreAboutE2EE": "https://support.wire.com/hc/articles/10898523878173"

}
4 changes: 4 additions & 0 deletions wire-ios/Wire-iOS/Sources/Helpers/Bundle/Bundle+WireURLs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ struct WireURLs: Codable {
/// Link to an article about channels.
let learnMoreAboutChannels: URL

/// Link to an article about end to end encryption.
let learnMoreAboutE2EE: URL

static var shared: WireURLs = {
do {
return try WireURLs(forResource: "url", withExtension: "json")
Expand Down Expand Up @@ -144,6 +147,7 @@ struct WireURLs: Codable {
case howToChangeEmail
case howToDeleteAccount
case learnMoreAboutChannels
case learnMoreAboutE2EE
}

enum WireURLsError: Error {
Expand Down
2 changes: 1 addition & 1 deletion wire-ios/Wire-iOS/Sources/UserInterface/ConnectRequests/GuestAccountWarningView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ final class GuestAccountWarningView: UIView {
stackView.addArrangedSubview(messageLabel)

let linkText = L10n.Localizable.Conversation.ConnectionView.Welcome.learnMore
let linkUrl = URL(string: "https://support.wire.com/hc/articles/10898523878173")!
let linkUrl = WireURLs.shared.learnMoreAboutE2EE

let linkAttributes: [NSAttributedString.Key: AnyObject] = [
.font: UIFont.mediumSemiboldFont,
Expand Down
2 changes: 1 addition & 1 deletion ...ConfigurationMessageCell/Components/ConversationWelcomeSystemMessageCellDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ final class ConversationWelcomeSystemMessageCellDescription: ConversationMessage
}

let linkLabel = L10n.Localizable.Conversation.ConnectionView.Welcome.learnMore
let linkUrl = URL(string: "https://support.wire.com/hc/articles/10898523878173")!
let linkUrl = WireURLs.shared.learnMoreAboutE2EE

let titleAttributes: [NSAttributedString.Key: AnyObject] = [
.font: FontSpec(.header, .semibold).font!,
Expand Down
Loading