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

Remove network status indicator from settings

Browse Source
pull/14/head
Niels Andriesse 6 years ago
parent 94e7cefbd9
commit c3fe7fba50
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

69
Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m
Unescape Escape View File

@ -136,39 +136,42 @@
[weakSelf showAdvanced];
}]];
} else {
[section addItem:[OWSTableItem
itemWithCustomCellBlock:^{
UITableViewCell *cell = [OWSTableItem newCell];
cell.textLabel.text = NSLocalizedString(@"NETWORK_STATUS_HEADER", @"");
cell.selectionStyle = UITableViewCellSelectionStyleNone;
UILabel *accessoryLabel = [UILabel new];
if (TSAccountManager.sharedInstance.isDeregistered) {
accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_DEREGISTERED",
@"Error indicating that this device is no longer registered.");
accessoryLabel.textColor = [UIColor ows_redColor];
} else {
switch (TSSocketManager.shared.highestSocketState) {
case OWSWebSocketStateClosed:
accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_OFFLINE", @"");
accessoryLabel.textColor = [UIColor ows_redColor];
break;
case OWSWebSocketStateConnecting:
accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_CONNECTING", @"");
accessoryLabel.textColor = [UIColor ows_yellowColor];
break;
case OWSWebSocketStateOpen:
accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_CONNECTED", @"");
accessoryLabel.textColor = [UIColor ows_greenColor];
break;
}
}
[accessoryLabel sizeToFit];
cell.accessoryView = accessoryLabel;
cell.accessibilityIdentifier
= ACCESSIBILITY_IDENTIFIER_WITH_NAME(AppSettingsViewController, @"network_status");
return cell;
}
actionBlock:nil]];
// Loki: Original code
// ========
// [section addItem:[OWSTableItem
// itemWithCustomCellBlock:^{
// UITableViewCell *cell = [OWSTableItem newCell];
// cell.textLabel.text = NSLocalizedString(@"NETWORK_STATUS_HEADER", @"");
// cell.selectionStyle = UITableViewCellSelectionStyleNone;
// UILabel *accessoryLabel = [UILabel new];
// if (TSAccountManager.sharedInstance.isDeregistered) {
// accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_DEREGISTERED",
// @"Error indicating that this device is no longer registered.");
// accessoryLabel.textColor = [UIColor ows_redColor];
// } else {
// switch (TSSocketManager.shared.highestSocketState) {
// case OWSWebSocketStateClosed:
// accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_OFFLINE", @"");
// accessoryLabel.textColor = [UIColor ows_redColor];
// break;
// case OWSWebSocketStateConnecting:
// accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_CONNECTING", @"");
// accessoryLabel.textColor = [UIColor ows_yellowColor];
// break;
// case OWSWebSocketStateOpen:
// accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_CONNECTED", @"");
// accessoryLabel.textColor = [UIColor ows_greenColor];
// break;
// }
// }
// [accessoryLabel sizeToFit];
// cell.accessoryView = accessoryLabel;
// cell.accessibilityIdentifier
// = ACCESSIBILITY_IDENTIFIER_WITH_NAME(AppSettingsViewController, @"network_status");
// return cell;
// }
// actionBlock:nil]];
// ========
}
[section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE",

Write Preview
Loading…
Cancel
Save