From cefce5b2f22a264d9963f01f61bc91c3129cab40 Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Wed, 20 Apr 2022 16:34:30 -0500 Subject: [PATCH] Clean up donate URL code This small change cleans up two things for the donate URL: 1. Moves it into a constant in `TSConstants` 2. Adds a trailing slash to the URL (because the server will redirect you without one) I think these cleanups are useful by themselves, but I'll be using the constant again in an upcoming change and split this off into its own small commit. Made sure I could still open the URL in the app. --- .../ViewControllers/AppSettings/AppSettingsViewController.swift | 2 +- .../src/ViewControllers/AppSettings/BoostViewController.swift | 2 +- SignalServiceKit/src/TSConstants.swift | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift index 6168ed68dc..0167aabf1f 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift @@ -318,7 +318,7 @@ class AppSettingsViewController: OWSTableViewController2 { accessoryView: nil, accessibilityIdentifier: UIView.accessibilityIdentifier(in: self, name: "donate"), actionBlock: { () in - UIApplication.shared.open(URL(string: "https://signal.org/donate")!, options: [:], completionHandler: nil) + UIApplication.shared.open(TSConstants.donateUrl, options: [:], completionHandler: nil) })) } diff --git a/Signal/src/ViewControllers/AppSettings/BoostViewController.swift b/Signal/src/ViewControllers/AppSettings/BoostViewController.swift index bd6d9d8990..7b8b2a4d87 100644 --- a/Signal/src/ViewControllers/AppSettings/BoostViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/BoostViewController.swift @@ -336,7 +336,7 @@ class BoostViewController: OWSTableViewController2 { } private func openDonateWebsite() { - UIApplication.shared.open(URL(string: "https://signal.org/donate")!, options: [:], completionHandler: nil) + UIApplication.shared.open(TSConstants.donateUrl, options: [:], completionHandler: nil) } } diff --git a/SignalServiceKit/src/TSConstants.swift b/SignalServiceKit/src/TSConstants.swift index 10dd52479a..222cdd0793 100644 --- a/SignalServiceKit/src/TSConstants.swift +++ b/SignalServiceKit/src/TSConstants.swift @@ -21,6 +21,7 @@ public class TSConstants: NSObject { private override init() {} public static let legalTermsUrl = URL(string: "https://signal.org/legal/")! + public static let donateUrl = URL(string: "https://signal.org/donate/")! @objc public static var mainServiceWebSocketAPI_identified: String { shared.mainServiceWebSocketAPI_identified }