oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up ahead of PR.

This commit is contained in:
Matthew Chen 2018-02-28 22:34:29 -05:00
parent ea783a8ad5
commit 4afedac68c
6 changed files with 13 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/AppSettingsViewController.m
View File

@ -89,10 +89,6 @@
self.title = NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", @"Title for settings activity");
[self updateTableContents];
dispatch_async(dispatch_get_main_queue(), ^{
[self showPrivacy];
});
}
- (void)viewWillAppear:(BOOL)animated

4
Signal/src/ViewControllers/HomeViewController.m
View File

@ -285,10 +285,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
}
[self updateBarButtonItems];
dispatch_async(dispatch_get_main_queue(), ^{
[self settingsButtonPressed:nil];
});
}
- (void)updateBarButtonItems

484
Signal/src/ViewControllers/OWS2FASettingsViewController.m
View File

@ -198,11 +198,8 @@ NS_ASSUME_NONNULL_BEGIN
[instructionsLabel autoPinTopToSuperviewWithMargin:kVSpacing];
[instructionsLabel autoPinWidthToSuperviewWithMargin:self.hMargin];
// CGFloat textFieldWidth = [self.pinTextfield sizeThatFits:CGSizeZero].width + 10.f;
[self.pinTextfield autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:instructionsLabel withOffset:kVSpacing];
[self.pinTextfield autoPinWidthToSuperviewWithMargin:self.hMargin];
// [self.pinTextfield autoSetDimension:ALDimensionWidth toSize:textFieldWidth];
[self.pinTextfield autoHCenterInSuperview];
UIView *underscoreView = [UIView new];
@ -338,8 +335,6 @@ NS_ASSUME_NONNULL_BEGIN
- (void)textFieldDidChange:(id)sender
{
DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
[self updateNavigationItems];
}
@ -347,8 +342,6 @@ NS_ASSUME_NONNULL_BEGIN
- (void)nextButtonWasPressed
{
DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
switch (self.mode) {
case OWS2FASettingsMode_Status:
OWSFail(@"%@ status mode should not have a next button.", self.logTag);
@ -487,480 +480,3 @@ NS_ASSUME_NONNULL_BEGIN
@end
NS_ASSUME_NONNULL_END
//#import "RegistrationViewController.h"
//#import "CodeVerificationViewController.h"
//#import "CountryCodeViewController.h"
//#import "PhoneNumber.h"
//#import "PhoneNumberUtil.h"
//#import "Signal-Swift.h"
//#import "TSAccountManager.h"
//#import "UIView+OWS.h"
//#import "ViewControllerUtils.h"
//#import <SAMKeychain/SAMKeychain.h>
//#import <SignalMessaging/Environment.h>
//#import <SignalMessaging/NSString+OWS.h>
//
// NS_ASSUME_NONNULL_BEGIN
//
//#ifdef DEBUG
//
// NSString *const kKeychainService_LastRegistered = @"kKeychainService_LastRegistered";
// NSString *const kKeychainKey_LastRegisteredCountryCode = @"kKeychainKey_LastRegisteredCountryCode";
// NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegisteredPhoneNumber";
//
//#endif
//
//@interface RegistrationViewController () <CountryCodeViewControllerDelegate, UITextFieldDelegate>
//
//@property (nonatomic) NSString *countryCode;
//@property (nonatomic) NSString *callingCode;
//
//@property (nonatomic) UILabel *countryCodeLabel;
//@property (nonatomic) UITextField *phoneNumberTextField;
//@property (nonatomic) UILabel *examplePhoneNumberLabel;
//@property (nonatomic) OWSFlatButton *activateButton;
//@property (nonatomic) UIActivityIndicatorView *spinnerView;
//
//@end
//
//#pragma mark -
//
//@implementation RegistrationViewController
//
//- (void)loadView
//{
// [super loadView];
//
// [self createViews];
//
// // Do any additional setup after loading the view.
// [self populateDefaultCountryNameAndCode];
// [SignalApp.sharedApp setSignUpFlowNavigationController:self.navigationController];
//}
//
//- (void)viewDidLoad {
// [super viewDidLoad];
//
// OWSProdInfo([OWSAnalyticsEvents registrationBegan]);
//}
//
//- (void)createViews
//{
// self.view.backgroundColor = [UIColor whiteColor];
// self.view.userInteractionEnabled = YES;
// [self.view
// addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backgroundTapped:)]];
//
// UIView *headerWrapper = [UIView containerView];
// [self.view addSubview:headerWrapper];
// headerWrapper.backgroundColor = UIColor.ows_signalBrandBlueColor;
//
// UIView *headerContent = [UIView new];
// [headerWrapper addSubview:headerContent];
// [headerWrapper autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsZero excludingEdge:ALEdgeBottom];
// [headerContent autoPinEdgeToSuperviewEdge:ALEdgeBottom];
// [headerContent autoPinToTopLayoutGuideOfViewController:self withInset:0];
// [headerContent autoPinWidthToSuperview];
//
// UILabel *headerLabel = [UILabel new];
// headerLabel.text = NSLocalizedString(@"REGISTRATION_TITLE_LABEL", @"");
// headerLabel.textColor = [UIColor whiteColor];
// headerLabel.font = [UIFont ows_mediumFontWithSize:ScaleFromIPhone5To7Plus(20.f, 24.f)];
// [headerContent addSubview:headerLabel];
// [headerLabel autoHCenterInSuperview];
// [headerLabel autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:14.f];
//
// CGFloat screenHeight = MAX([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height);
// if (screenHeight < 568) {
// // iPhone 4s or smaller.
// [headerContent autoSetDimension:ALDimensionHeight toSize:20];
// headerLabel.hidden = YES;
// } else if (screenHeight < 667) {
// // iPhone 5 or smaller.
// [headerContent autoSetDimension:ALDimensionHeight toSize:80];
// } else {
// [headerContent autoSetDimension:ALDimensionHeight toSize:220];
//
// UIImage *logo = [UIImage imageNamed:@"logoSignal"];
// OWSAssert(logo);
// UIImageView *logoView = [UIImageView new];
// logoView.image = logo;
// [headerContent addSubview:logoView];
// [logoView autoHCenterInSuperview];
// [logoView autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:headerLabel withOffset:-14.f];
// }
//
// const CGFloat kRowHeight = 60.f;
// const CGFloat kRowHMargin = 20.f;
// const CGFloat kSeparatorHeight = 1.f;
// const CGFloat kExamplePhoneNumberVSpacing = 8.f;
// const CGFloat fontSizePoints = ScaleFromIPhone5To7Plus(16.f, 20.f);
//
// UIView *contentView = [UIView containerView];
// [contentView setHLayoutMargins:kRowHMargin];
// contentView.backgroundColor = [UIColor whiteColor];
// [self.view addSubview:contentView];
// [contentView autoPinToBottomLayoutGuideOfViewController:self withInset:0];
// [contentView autoPinWidthToSuperview];
// [contentView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:headerContent];
//
// // Country
// UIView *countryRow = [UIView containerView];
// [contentView addSubview:countryRow];
// [countryRow autoPinLeadingAndTrailingToSuperview];
// [countryRow autoPinEdgeToSuperviewEdge:ALEdgeTop];
// [countryRow autoSetDimension:ALDimensionHeight toSize:kRowHeight];
// [countryRow
// addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
// action:@selector(countryCodeRowWasTapped:)]];
//
// UILabel *countryNameLabel = [UILabel new];
// countryNameLabel.text
// = NSLocalizedString(@"REGISTRATION_DEFAULT_COUNTRY_NAME", @"Label for the country code field");
// countryNameLabel.textColor = [UIColor blackColor];
// countryNameLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints];
// [countryRow addSubview:countryNameLabel];
// [countryNameLabel autoVCenterInSuperview];
// [countryNameLabel autoPinLeadingToSuperview];
//
// UILabel *countryCodeLabel = [UILabel new];
// self.countryCodeLabel = countryCodeLabel;
// countryCodeLabel.textColor = [UIColor ows_materialBlueColor];
// countryCodeLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints + 2.f];
// [countryRow addSubview:countryCodeLabel];
// [countryCodeLabel autoVCenterInSuperview];
// [countryCodeLabel autoPinTrailingToSuperview];
//
// UIView *separatorView1 = [UIView new];
// separatorView1.backgroundColor = [UIColor colorWithWhite:0.75f alpha:1.f];
// [contentView addSubview:separatorView1];
// [separatorView1 autoPinWidthToSuperview];
// [separatorView1 autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:countryRow];
// [separatorView1 autoSetDimension:ALDimensionHeight toSize:kSeparatorHeight];
//
// // Phone Number
// UIView *phoneNumberRow = [UIView containerView];
// [contentView addSubview:phoneNumberRow];
// [phoneNumberRow autoPinLeadingAndTrailingToSuperview];
// [phoneNumberRow autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:separatorView1];
// [phoneNumberRow autoSetDimension:ALDimensionHeight toSize:kRowHeight];
//
// UILabel *phoneNumberLabel = [UILabel new];
// phoneNumberLabel.text
// = NSLocalizedString(@"REGISTRATION_PHONENUMBER_BUTTON", @"Label for the phone number textfield");
// phoneNumberLabel.textColor = [UIColor blackColor];
// phoneNumberLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints];
// [phoneNumberRow addSubview:phoneNumberLabel];
// [phoneNumberLabel autoVCenterInSuperview];
// [phoneNumberLabel autoPinLeadingToSuperview];
//
// UITextField *phoneNumberTextField = [UITextField new];
// phoneNumberTextField.textAlignment = NSTextAlignmentRight;
// phoneNumberTextField.delegate = self;
// phoneNumberTextField.keyboardType = UIKeyboardTypeNumberPad;
// phoneNumberTextField.placeholder = NSLocalizedString(
// @"REGISTRATION_ENTERNUMBER_DEFAULT_TEXT", @"Placeholder text
// for the phone number textfield");
// self.phoneNumberTextField = phoneNumberTextField;
// phoneNumberTextField.textColor = [UIColor ows_materialBlueColor];
// phoneNumberTextField.font = [UIFont ows_mediumFontWithSize:fontSizePoints + 2];
// [phoneNumberRow addSubview:phoneNumberTextField];
// [phoneNumberTextField autoVCenterInSuperview];
// [phoneNumberTextField autoPinTrailingToSuperview];
//
// UILabel *examplePhoneNumberLabel = [UILabel new];
// self.examplePhoneNumberLabel = examplePhoneNumberLabel;
// examplePhoneNumberLabel.font = [UIFont ows_regularFontWithSize:fontSizePoints - 2.f];
// examplePhoneNumberLabel.textColor = [UIColor colorWithWhite:0.5f alpha:1.f];
// [contentView addSubview:examplePhoneNumberLabel];
// [examplePhoneNumberLabel autoPinTrailingToSuperview];
// [examplePhoneNumberLabel autoPinEdge:ALEdgeTop
// toEdge:ALEdgeBottom
// ofView:phoneNumberTextField
// withOffset:kExamplePhoneNumberVSpacing];
//
// UIView *separatorView2 = [UIView new];
// separatorView2.backgroundColor = [UIColor colorWithWhite:0.75f alpha:1.f];
// [contentView addSubview:separatorView2];
// [separatorView2 autoPinWidthToSuperview];
// [separatorView2 autoPinEdge:ALEdgeTop
// toEdge:ALEdgeBottom
// ofView:phoneNumberRow
// withOffset:examplePhoneNumberLabel.font.lineHeight];
// [separatorView2 autoSetDimension:ALDimensionHeight toSize:kSeparatorHeight];
//
// // Activate Button
// const CGFloat kActivateButtonHeight = 47.f;
// // NOTE: We use ows_signalBrandBlueColor instead of ows_materialBlueColor
// // throughout the onboarding flow to be consistent with the headers.
// OWSFlatButton *activateButton = [OWSFlatButton buttonWithTitle:NSLocalizedString(@"REGISTRATION_VERIFY_DEVICE",
// @"")
// font:[OWSFlatButton fontForHeight:kActivateButtonHeight]
// titleColor:[UIColor whiteColor]
// backgroundColor:[UIColor ows_signalBrandBlueColor]
// target:self
// selector:@selector(sendCodeAction)];
// self.activateButton = activateButton;
// [contentView addSubview:activateButton];
// [activateButton autoPinLeadingAndTrailingToSuperview];
// [activateButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:separatorView2 withOffset:15];
// [activateButton autoSetDimension:ALDimensionHeight toSize:kActivateButtonHeight];
//
// UIActivityIndicatorView *spinnerView =
// [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
// self.spinnerView = spinnerView;
// [activateButton addSubview:spinnerView];
// [spinnerView autoVCenterInSuperview];
// [spinnerView autoSetDimension:ALDimensionWidth toSize:20.f];
// [spinnerView autoSetDimension:ALDimensionHeight toSize:20.f];
// [spinnerView autoPinTrailingToSuperviewWithMargin:20.f];
// [spinnerView stopAnimating];
//}
//
//- (void)viewDidAppear:(BOOL)animated {
// [super viewDidAppear:animated];
//
// [self.activateButton setEnabled:YES];
// [self.spinnerView stopAnimating];
// [self.phoneNumberTextField becomeFirstResponder];
//}
//
//#pragma mark - Country
//
//- (void)populateDefaultCountryNameAndCode {
// NSString *countryCode = [PhoneNumber defaultCountryCode];
//
//#ifdef DEBUG
// if ([self lastRegisteredCountryCode].length > 0) {
// countryCode = [self lastRegisteredCountryCode];
// }
// self.phoneNumberTextField.text = [self lastRegisteredPhoneNumber];
//#endif
//
// NSNumber *callingCode = [[PhoneNumberUtil sharedUtil].nbPhoneNumberUtil getCountryCodeForRegion:countryCode];
// NSString *countryName = [PhoneNumberUtil countryNameFromCountryCode:countryCode];
// [self updateCountryWithName:countryName
// callingCode:[NSString stringWithFormat:@"%@%@",
// COUNTRY_CODE_PREFIX,
// callingCode]
// countryCode:countryCode];
//}
//
//- (void)updateCountryWithName:(NSString *)countryName
// callingCode:(NSString *)callingCode
// countryCode:(NSString *)countryCode {
// OWSAssertIsOnMainThread();
// OWSAssert(countryName.length > 0);
// OWSAssert(callingCode.length > 0);
// OWSAssert(countryCode.length > 0);
//
// _countryCode = countryCode;
// _callingCode = callingCode;
//
// NSString *title = [NSString stringWithFormat:@"%@ (%@)",
// callingCode,
// countryCode.uppercaseString];
// self.countryCodeLabel.text = title;
// [self.countryCodeLabel setNeedsLayout];
//
// self.examplePhoneNumberLabel.text =
// [ViewControllerUtils examplePhoneNumberForCountryCode:countryCode callingCode:callingCode];
// [self.examplePhoneNumberLabel setNeedsLayout];
//}
//
//#pragma mark - Actions
//
//- (void)sendCodeAction
//{
// NSString *phoneNumberText = [_phoneNumberTextField.text ows_stripped];
// if (phoneNumberText.length < 1) {
// [OWSAlerts
// showAlertWithTitle:NSLocalizedString(@"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE",
// @"Title of alert indicating that users needs to enter a phone number to
// register.")
// message:
// NSLocalizedString(@"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE",
// @"Message of alert indicating that users needs to enter a phone number to register.")];
// return;
// }
// NSString *countryCode = self.countryCode;
// NSString *phoneNumber = [NSString stringWithFormat:@"%@%@", _callingCode, phoneNumberText];
// PhoneNumber *localNumber = [PhoneNumber tryParsePhoneNumberFromUserSpecifiedText:phoneNumber];
// NSString *parsedPhoneNumber = localNumber.toE164;
// if (parsedPhoneNumber.length < 1) {
// [OWSAlerts showAlertWithTitle:
// NSLocalizedString(@"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE",
// @"Title of alert indicating that users needs to enter a valid phone number to register.")
// message:NSLocalizedString(@"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE",
// @"Message of alert indicating that users needs to enter a
// valid phone number "
// @"to register.")];
// return;
// }
//
// [self.activateButton setEnabled:NO];
// [self.spinnerView startAnimating];
// [self.phoneNumberTextField resignFirstResponder];
//
// __weak RegistrationViewController *weakSelf = self;
// [TSAccountManager registerWithPhoneNumber:parsedPhoneNumber
// success:^{
// OWSProdInfo([OWSAnalyticsEvents registrationRegisteredPhoneNumber]);
//
// [weakSelf.spinnerView stopAnimating];
//
// CodeVerificationViewController *vc = [CodeVerificationViewController new];
// [weakSelf.navigationController pushViewController:vc animated:YES];
//
//#ifdef DEBUG
// [weakSelf setLastRegisteredCountryCode:countryCode];
// [weakSelf setLastRegisteredPhoneNumber:phoneNumberText];
//#endif
// }
// failure:^(NSError *error) {
// if (error.code == 400) {
// [OWSAlerts showAlertWithTitle:NSLocalizedString(@"REGISTRATION_ERROR",
// nil)
// message:NSLocalizedString(@"REGISTRATION_NON_VALID_NUMBER",
// nil)];
// } else {
// [OWSAlerts showAlertWithTitle:error.localizedDescription
// message:error.localizedRecoverySuggestion];
// }
//
// [weakSelf.activateButton setEnabled:YES];
// [weakSelf.spinnerView stopAnimating];
// [weakSelf.phoneNumberTextField becomeFirstResponder];
// }
// smsVerification:YES];
//}
//
//- (void)countryCodeRowWasTapped:(UIGestureRecognizer *)sender
//{
// if (sender.state == UIGestureRecognizerStateRecognized) {
// [self changeCountryCodeTapped];
// }
//}
//
//- (void)changeCountryCodeTapped
//{
// CountryCodeViewController *countryCodeController = [CountryCodeViewController new];
// countryCodeController.countryCodeDelegate = self;
// UINavigationController *navigationController =
// [[UINavigationController alloc] initWithRootViewController:countryCodeController];
// [self presentViewController:navigationController animated:YES completion:[UIUtil modalCompletionBlock]];
//}
//
//- (void)backgroundTapped:(UIGestureRecognizer *)sender
//{
// if (sender.state == UIGestureRecognizerStateRecognized) {
// [self.phoneNumberTextField becomeFirstResponder];
// }
//}
//
//#pragma mark - CountryCodeViewControllerDelegate
//
//- (void)countryCodeViewController:(CountryCodeViewController *)vc
// didSelectCountryCode:(NSString *)countryCode
// countryName:(NSString *)countryName
// callingCode:(NSString *)callingCode
//{
// OWSAssert(countryCode.length > 0);
// OWSAssert(countryName.length > 0);
// OWSAssert(callingCode.length > 0);
//
// [self updateCountryWithName:countryName callingCode:callingCode countryCode:countryCode];
//
// // Trigger the formatting logic with a no-op edit.
// [self textField:self.phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""];
//}
//
//#pragma mark - Keyboard notifications
//
//- (void)initializeKeyboardHandlers {
// UITapGestureRecognizer *outsideTabRecognizer =
// [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboardFromAppropriateSubView)];
// [self.view addGestureRecognizer:outsideTabRecognizer];
//}
//
//- (void)dismissKeyboardFromAppropriateSubView {
// [self.view endEditing:NO];
//}
//
//#pragma mark - UITextFieldDelegate
//
//- (BOOL)textField:(UITextField *)textField
// shouldChangeCharactersInRange:(NSRange)range
// replacementString:(NSString *)insertionText {
//
// [ViewControllerUtils phoneNumberTextField:textField
// shouldChangeCharactersInRange:range
// replacementString:insertionText
// countryCode:_callingCode];
//
// return NO; // inform our caller that we took care of performing the change
//}
//
//- (BOOL)textFieldShouldReturn:(UITextField *)textField {
// [self sendCodeAction];
// [textField resignFirstResponder];
// return NO;
//}
//
//#pragma mark - Debug
//
//#ifdef DEBUG
//
//- (NSString *_Nullable)debugValueForKey:(NSString *)key
//{
// OWSCAssert([NSThread isMainThread]);
// OWSCAssert(key.length > 0);
//
// NSError *error;
// NSString *value = [SAMKeychain passwordForService:kKeychainService_LastRegistered account:key error:&error];
// if (value && !error) {
// return value;
// }
// return nil;
//}
//
//- (void)setDebugValue:(NSString *)value forKey:(NSString *)key
//{
// OWSCAssert([NSThread isMainThread]);
// OWSCAssert(key.length > 0);
// OWSCAssert(value.length > 0);
//
// NSError *error;
// [SAMKeychain setAccessibilityType:kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly];
// BOOL success = [SAMKeychain setPassword:value forService:kKeychainService_LastRegistered account:key
// error:&error]; if (!success || error) {
// DDLogError(@"%@ Error persisting 'last registered' value in keychain: %@", self.logTag, error);
// }
//}
//
//- (NSString *_Nullable)lastRegisteredCountryCode
//{
// return [self debugValueForKey:kKeychainKey_LastRegisteredCountryCode];
//}
//
//- (void)setLastRegisteredCountryCode:(NSString *)value
//{
// [self setDebugValue:value forKey:kKeychainKey_LastRegisteredCountryCode];
//}
//
//- (NSString *_Nullable)lastRegisteredPhoneNumber
//{
// return [self debugValueForKey:kKeychainKey_LastRegisteredPhoneNumber];
//}
//
//- (void)setLastRegisteredPhoneNumber:(NSString *)value
//{
// [self setDebugValue:value forKey:kKeychainKey_LastRegisteredPhoneNumber];
//}
//
//#endif
//
//@end
//
// NS_ASSUME_NONNULL_END

4
Signal/src/ViewControllers/PrivacySettingsTableViewController.m
View File

@ -21,10 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
self.title = NSLocalizedString(@"SETTINGS_PRIVACY_TITLE", @"");
[self updateTableContents];
dispatch_async(dispatch_get_main_queue(), ^{
[self show2FASettings];
});
}
- (void)viewDidAppear:(BOOL)animated

12
Signal/translations/en.lproj/Localizable.strings
View File

@ -1398,9 +1398,7 @@
/* Label for the country code field */
"REGISTRATION_DEFAULT_COUNTRY_NAME" = "Country Code";
/* Placeholder text
// for the phone number textfield
Placeholder text for the phone number textfield */
/* Placeholder text for the phone number textfield */
"REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Enter Number";
/* No comment provided by engineer. */
@ -1430,9 +1428,7 @@
/* No comment provided by engineer. */
"REGISTRATION_VERIFY_DEVICE" = "Activate This Device";
/* Message of alert indicating that users needs to enter a
// valid phone number to register.
Message of alert indicating that users needs to enter a valid phone number to register. */
/* Message of alert indicating that users needs to enter a valid phone number to register. */
"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register.";
/* Title of alert indicating that users needs to enter a valid phone number to register. */
@ -1441,9 +1437,7 @@
/* Message of alert indicating that users needs to enter a phone number to register. */
"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a phone number to register.";
/* Title of alert indicating that users needs to enter a phone number to
// register.
Title of alert indicating that users needs to enter a phone number to register. */
/* Title of alert indicating that users needs to enter a phone number to register. */
"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "No Phone Number";
/* No comment provided by engineer. */

21
SignalServiceKit/src/TSConstants.h
View File

@ -20,20 +20,20 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
//#ifndef DEBUG
// Production
//#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
//#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
//#define textSecureCDNServerURL @"https://cdn.signal.org"
//#define textSecureServiceReflectorHost @"signal-reflector-meek.appspot.com"
//#define textSecureCDNReflectorHost @"signal-cdn-reflector.appspot.com"
#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
#define textSecureCDNServerURL @"https://cdn.signal.org"
#define textSecureServiceReflectorHost @"signal-reflector-meek.appspot.com"
#define textSecureCDNReflectorHost @"signal-cdn-reflector.appspot.com"
//#else
//
//// Staging
#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
#define textSecureServiceReflectorHost @"meek-signal-service-staging.appspot.com";
#define textSecureCDNReflectorHost @"meek-signal-cdn-staging.appspot.com";
//#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
//#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
//#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
//#define textSecureServiceReflectorHost @"meek-signal-service-staging.appspot.com";
//#define textSecureCDNReflectorHost @"meek-signal-cdn-staging.appspot.com";
//
//#endif
@ -51,7 +51,6 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
#define textSecureProfileAPIFormat @"v1/profile/%@"
#define textSecureSetProfileNameAPIFormat @"v1/profile/name/%@"
#define textSecureProfileAvatarFormAPI @"v1/profile/form/avatar"
#define textSecure2FAAPI @"/v1/accounts/pin"
#define SignalApplicationGroup @"group.org.whispersystems.signal.group"