diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index be988e163..89ff9ab09 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "AboutTableViewController.h" @@ -56,14 +56,12 @@ accessoryText:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]]; -#ifdef SHOW_LEGAL_TERMS_LINK [informationSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_LEGAL_TERMS_CELL", @"table cell label") actionBlock:^{ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; }]]; -#endif [contents addSection:informationSection]; diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index 2ea33ad28..cbaf4172e 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -92,7 +92,6 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi headerLabel.textColor = [UIColor whiteColor]; headerLabel.font = [UIFont ows_mediumFontWithSize:ScaleFromIPhone5To7Plus(20.f, 24.f)]; -#ifdef SHOW_LEGAL_TERMS_LINK NSString *legalTopMatterFormat = NSLocalizedString(@"REGISTRATION_LEGAL_TOP_MATTER_FORMAT", @"legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink"); NSString *legalTopMatterLinkWord = NSLocalizedString( @@ -117,12 +116,9 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapLegalTerms:)]; [legalTopMatterLabel addGestureRecognizer:tapGesture]; -#endif UIStackView *headerContent = [[UIStackView alloc] initWithArrangedSubviews:@[ headerLabel ]]; -#ifdef SHOW_LEGAL_TERMS_LINK [headerContent addArrangedSubview:legalTopMatterLabel]; -#endif headerContent.axis = UILayoutConstraintAxisVertical; headerContent.alignment = UIStackViewAlignmentCenter; headerContent.spacing = ScaleFromIPhone5To7Plus(8, 16); @@ -268,7 +264,6 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi [spinnerView autoPinTrailingToSuperviewMarginWithInset:20.f]; [spinnerView stopAnimating]; -#ifdef SHOW_LEGAL_TERMS_LINK NSString *bottomTermsLinkText = NSLocalizedString(@"REGISTRATION_LEGAL_TERMS_LINK", @"one line label below submit button on registration screen, which links to an external webpage."); UIButton *bottomLegalLinkButton = [UIButton new]; @@ -287,7 +282,6 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi withOffset:ScaleFromIPhone5To7Plus(8, 12)]; [bottomLegalLinkButton setCompressionResistanceHigh]; [bottomLegalLinkButton setContentHuggingHigh]; -#endif } - (void)viewDidAppear:(BOOL)animated diff --git a/SignalServiceKit/src/TSConstants.h b/SignalServiceKit/src/TSConstants.h index 869074df4..82f58d620 100644 --- a/SignalServiceKit/src/TSConstants.h +++ b/SignalServiceKit/src/TSConstants.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #ifndef TextSecureKit_Constants_h @@ -19,7 +19,6 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) { #define textSecureHTTPTimeOut 10 #define kLegalTermsUrlString @"https://signal.org/legal/" -#define SHOW_LEGAL_TERMS_LINK //#ifndef DEBUG