diff --git a/Vector/Assets/en.lproj/Vector.strings b/Vector/Assets/en.lproj/Vector.strings index 7821d9b9f..fe7fc3bab 100644 --- a/Vector/Assets/en.lproj/Vector.strings +++ b/Vector/Assets/en.lproj/Vector.strings @@ -245,6 +245,7 @@ "settings_contacts_discover_matrix_users_with_local_emails" = "Use emails to discover users"; "settings_version" = "Version %@"; +"settings_copyright" = "Copyright"; "settings_term_conditions" = "Terms & conditions"; "settings_privacy_policy" = "Privacy Policy"; "settings_third_party_notices" = "Third-party Notices"; diff --git a/Vector/ViewController/SettingsViewController.m b/Vector/ViewController/SettingsViewController.m index 4c0da715d..765bb5483 100644 --- a/Vector/ViewController/SettingsViewController.m +++ b/Vector/ViewController/SettingsViewController.m @@ -51,13 +51,14 @@ #define CONTACTS_SETTINGS_COUNT 1 #define OTHER_VERSION_INDEX 0 -#define OTHER_TERM_CONDITIONS_INDEX 1 -#define OTHER_PRIVACY_INDEX 2 -#define OTHER_THIRD_PARTY_INDEX 3 -#define OTHER_CRASH_REPORT_INDEX 4 -#define OTHER_MARK_ALL_AS_READ_INDEX 5 -#define OTHER_CLEAR_CACHE_INDEX 6 -#define OTHER_COUNT 7 +#define OTHER_COPYRIGHT_INDEX 1 +#define OTHER_TERM_CONDITIONS_INDEX 2 +#define OTHER_PRIVACY_INDEX 3 +#define OTHER_THIRD_PARTY_INDEX 4 +#define OTHER_CRASH_REPORT_INDEX 5 +#define OTHER_MARK_ALL_AS_READ_INDEX 6 +#define OTHER_CLEAR_CACHE_INDEX 7 +#define OTHER_COUNT 8 #define LABS_COUNT 0 @@ -941,12 +942,26 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); termAndConditionCell = [[MXKTableViewCell alloc] init]; termAndConditionCell.textLabel.font = [UIFont systemFontOfSize:17]; } - + termAndConditionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil); termAndConditionCell.textLabel.textColor = kVectorTextColorBlack; - + cell = termAndConditionCell; } + else if (row == OTHER_COPYRIGHT_INDEX) + { + MXKTableViewCell *copyrightCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCell defaultReuseIdentifier]]; + if (!copyrightCell) + { + copyrightCell = [[MXKTableViewCell alloc] init]; + copyrightCell.textLabel.font = [UIFont systemFontOfSize:17]; + } + + copyrightCell.textLabel.text = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil); + copyrightCell.textLabel.textColor = kVectorTextColorBlack; + + cell = copyrightCell; + } else if (row == OTHER_PRIVACY_INDEX) { MXKTableViewCell *privacyPolicyCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCell defaultReuseIdentifier]]; @@ -1212,23 +1227,28 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); else if (section == SETTINGS_SECTION_OTHER_INDEX) { - if (row == OTHER_TERM_CONDITIONS_INDEX) - { - MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithURL:@"https://vector.im/tac.html"]; - [self.navigationController pushViewController:webViewViewController animated:YES]; - } - else if (row == OTHER_PRIVACY_INDEX) - { - MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithURL:@"https://vector.im/privacy.html"]; - [self.navigationController pushViewController:webViewViewController animated:YES]; - } - else if (row == OTHER_THIRD_PARTY_INDEX) - { - NSString *htmlFile = [[NSBundle mainBundle] pathForResource:@"third_party_licenses" ofType:@"html" inDirectory:nil]; - - MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithLocalHTMLFile:htmlFile]; - [self.navigationController pushViewController:webViewViewController animated:YES]; - } + if (row == OTHER_COPYRIGHT_INDEX) + { + MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithURL:@"https://riot.im/copyright"]; + [self.navigationController pushViewController:webViewViewController animated:YES]; + } + else if (row == OTHER_TERM_CONDITIONS_INDEX) + { + MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithURL:@"https://riot.im/tac"]; + [self.navigationController pushViewController:webViewViewController animated:YES]; + } + else if (row == OTHER_PRIVACY_INDEX) + { + MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithURL:@"https://riot.im/privacy"]; + [self.navigationController pushViewController:webViewViewController animated:YES]; + } + else if (row == OTHER_THIRD_PARTY_INDEX) + { + NSString *htmlFile = [[NSBundle mainBundle] pathForResource:@"third_party_licenses" ofType:@"html" inDirectory:nil]; + + MXKWebViewViewController *webViewViewController = [[MXKWebViewViewController alloc] initWithLocalHTMLFile:htmlFile]; + [self.navigationController pushViewController:webViewViewController animated:YES]; + } } else if (section == SETTINGS_SECTION_USER_SETTINGS_INDEX) {