Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

BuildSettings: Integrate legal URLs

Browse source
This commit is contained in:
manuroe 2020-07-31 08:29:22 +02:00
parent e5a4c261ff
commit 1e51d5617f
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Config/BuildSettings.swift
View file

@ -29,12 +29,20 @@ final class BuildSettings: NSObject {
Bundle.app.object(forInfoDictionaryKey: "applicationGroupIdentifier") as! String
}
// Legal URLs
static let applicationCopyrightUrlString = "https://element.io/copyright"
static let applicationPrivacyPolicyUrlString = "https://element.io/privacy"
static let applicationTermsConditionsUrlString = "https://element.io/terms-of-service"
/// Setting to force protection by pin code
static let forcePinProtection: Bool = false
/// Force non-jailbroken app usage
static let forceNonJailbrokenUsage: Bool = true
static let showUserFirstNameInSettings: Bool = false
static let showUserSurnameInSettings: Bool = false
static let allowAddingEmailThreepids: Bool = true
@ -58,11 +66,13 @@ final class BuildSettings: NSObject {
static let allowDeactivatingAccount: Bool = true
static let allowSendingStickers: Bool = true
// Message settings
static let allowMessageDetailsShare: Bool = true
static let allowMessageDetailsPermalink: Bool = true
static let allowMessageDetailsViewSource: Bool = true
// Authentication Screen
static let authScreenShowRegister = true
static let authScreenShowCustomServerOptions = true

6
Riot/Assets/Riot-Defaults.plist
View file

@ -86,12 +86,6 @@
<key>matrix.org</key>
<string></string>
</dict>
<key>settingsCopyrightUrl</key>
<string>https://element.io/copyright</string>
<key>settingsPrivacyPolicyUrl</key>
<string>https://element.io/privacy</string>
<key>settingsTermsConditionsUrl</key>
<string>https://element.io/terms-of-service</string>
<key>enableBotCreation</key>
<false/>
</dict>

9
Riot/Modules/Settings/SettingsViewController.m
View file

@ -2629,8 +2629,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
{
if (row == OTHER_COPYRIGHT_INDEX)
{
NSString *copyrightUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsCopyrightUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:copyrightUrlString];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationCopyrightUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil);
@ -2638,8 +2637,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_TERM_CONDITIONS_INDEX)
{
NSString *termsConditionsUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsTermsConditionsUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:termsConditionsUrlString];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationTermsConditionsUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil);
@ -2647,8 +2645,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_PRIVACY_INDEX)
{
NSString *privacyPolicyUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsPrivacyPolicyUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:privacyPolicyUrlString];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationPrivacyPolicyUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil);