diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist
index c7f887560..5b1db9f65 100644
--- a/Riot/Assets/Riot-Defaults.plist
+++ b/Riot/Assets/Riot-Defaults.plist
@@ -86,5 +86,11 @@
matrix.org
+ settingsCopyrightUrl
+ https://riot.im/copyright
+ settingsPrivacyPolicyUrl
+ https://riot.im/privacy
+ settingsTermsConditionsUrl
+ https://riot.im/tac_apple
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index fae7d7b30..20df85976 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -489,11 +489,8 @@
"settings_version" = "Version %@";
"settings_olm_version" = "Olm Version %@";
"settings_copyright" = "Copyright";
-"settings_copyright_url" = "https://element.io/copyright";
"settings_term_conditions" = "Terms & Conditions";
-"settings_term_conditions_url" = "https://element.io/tac_apple";
"settings_privacy_policy" = "Privacy Policy";
-"settings_privacy_policy_url" = "https://element.io/privacy";
"settings_third_party_notices" = "Third-party Notices";
"settings_send_crash_report" = "Send anon crash & usage data";
"settings_enable_rageshake" = "Rage shake to report bug";
diff --git a/Riot/Generated/RiotDefaults.swift b/Riot/Generated/RiotDefaults.swift
index 3cb6f869a..9de06e9b9 100644
--- a/Riot/Generated/RiotDefaults.swift
+++ b/Riot/Generated/RiotDefaults.swift
@@ -37,6 +37,9 @@ internal enum RiotDefaults {
internal static let pusherAppIdDev: String = _document["pusherAppIdDev"]
internal static let pusherAppIdProd: String = _document["pusherAppIdProd"]
internal static let roomDirectoryServers: [String: Any] = _document["roomDirectoryServers"]
+ internal static let settingsCopyrightUrl: String = _document["settingsCopyrightUrl"]
+ internal static let settingsPrivacyPolicyUrl: String = _document["settingsPrivacyPolicyUrl"]
+ internal static let settingsTermsConditionsUrl: String = _document["settingsTermsConditionsUrl"]
internal static let showAllEventsInRoomHistory: Bool = _document["showAllEventsInRoomHistory"]
internal static let showLeftMembersInRoomMemberList: Bool = _document["showLeftMembersInRoomMemberList"]
internal static let showRedactionsInRoomHistory: Bool = _document["showRedactionsInRoomHistory"]
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 8ef473a0b..f6bdd53be 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -3354,10 +3354,6 @@ internal enum VectorL10n {
internal static var settingsCopyright: String {
return VectorL10n.tr("Vector", "settings_copyright")
}
- /// https://riot.im/copyright
- internal static var settingsCopyrightUrl: String {
- return VectorL10n.tr("Vector", "settings_copyright_url")
- }
/// Encrypt to verified sessions only
internal static var settingsCryptoBlacklistUnverifiedDevices: String {
return VectorL10n.tr("Vector", "settings_crypto_blacklist_unverified_devices")
@@ -3706,10 +3702,6 @@ internal enum VectorL10n {
internal static var settingsPrivacyPolicy: String {
return VectorL10n.tr("Vector", "settings_privacy_policy")
}
- /// https://riot.im/privacy
- internal static var settingsPrivacyPolicyUrl: String {
- return VectorL10n.tr("Vector", "settings_privacy_policy_url")
- }
/// Profile Picture
internal static var settingsProfilePicture: String {
return VectorL10n.tr("Vector", "settings_profile_picture")
@@ -3762,10 +3754,6 @@ internal enum VectorL10n {
internal static var settingsTermConditions: String {
return VectorL10n.tr("Vector", "settings_term_conditions")
}
- /// https://riot.im/tac_apple
- internal static var settingsTermConditionsUrl: String {
- return VectorL10n.tr("Vector", "settings_term_conditions_url")
- }
/// Third-party Notices
internal static var settingsThirdPartyNotices: String {
return VectorL10n.tr("Vector", "settings_third_party_notices")
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index be33654b8..caf27bfca 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -2556,7 +2556,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
{
if (row == OTHER_COPYRIGHT_INDEX)
{
- WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_copyright_url", @"Vector", nil)];
+ NSString *copyrightUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsCopyrightUrl"];
+ WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:copyrightUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil);
@@ -2564,7 +2565,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_TERM_CONDITIONS_INDEX)
{
- WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_term_conditions_url", @"Vector", nil)];
+ NSString *termsConditionsUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsTermsConditionsUrl"];
+ WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:termsConditionsUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil);
@@ -2572,7 +2574,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_PRIVACY_INDEX)
{
- WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_privacy_policy_url", @"Vector", nil)];
+ NSString *privacyPolicyUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsPrivacyPolicyUrl"];
+ WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:privacyPolicyUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil);