set text 'registered' to 'connected'

This commit is contained in:
Danmei Chen 2019-04-14 14:56:28 +02:00
parent 670392f80e
commit b746d9e8ed
16 changed files with 17 additions and 17 deletions

View file

@ -849,7 +849,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
case LinphoneRegistrationFailed: {
_waitView.hidden = true;
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
message:message
preferredStyle:UIAlertControllerStyleAlert];
@ -923,7 +923,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)showErrorPopup:(const char *)error {
const char *err = error ? error : "";
if (strcmp(err, "ERROR_BAD_CREDENTIALS") == 0) {
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
message:[AssistantView StringForXMLRPCError:err]
preferredStyle:UIAlertControllerStyleAlert];

View file

@ -473,7 +473,7 @@
LOGE(@"Failed with error %@", response);
NSString *errorMsg;
if ([response isEqualToString:@"ERROR_ACCOUNT_ALREADY_EXISTS"]) {
errorMsg = NSLocalizedString(@"This account is already registered.", nil);
errorMsg = NSLocalizedString(@"This account is already connected.", nil);
} else if ([response isEqualToString:@"ERROR_UID_ALREADY_IN_USE"]) {
errorMsg = NSLocalizedString(@"You already own an account.", nil);
} else if ([response isEqualToString:@"ERROR_ACCOUNT_DOESNT_EXIST"]) {

View file

@ -154,7 +154,7 @@
self.voipRegistry.delegate = self;
// Initiate registration.
LOGI(@"[PushKit] Registering for push notifications");
LOGI(@"[PushKit] Connecting for push notifications");
self.voipRegistry.desiredPushTypes = [NSSet setWithObject:PKPushTypeVoIP];
[self configureUINotification];
@ -164,7 +164,7 @@
if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max)
return;
LOGI(@"Registering for UNNotifications");
LOGI(@"Connecting for UNNotifications");
// Call category
UNNotificationAction *act_ans =
[UNNotificationAction actionWithIdentifier:@"Answer"

View file

@ -1061,7 +1061,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
NSString *username = [NSString stringWithUTF8String:usernameC];
NSString *domain = [NSString stringWithUTF8String:domainC];
alertView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Authentification needed", nil)
message:[NSString stringWithFormat:NSLocalizedString(@"Registration failed because authentication is "
message:[NSString stringWithFormat:NSLocalizedString(@"Connection failed because authentication is "
@"missing or invalid for %@@%@.\nYou can "
@"provide password again, or check your "
@"account configuration in the settings.", nil), username, realm]

View file

@ -204,17 +204,17 @@
switch (state) {
case LinphoneRegistrationOk:
message = NSLocalizedString(@"Registered", nil);
message = NSLocalizedString(@"Connected", nil);
break;
case LinphoneRegistrationNone:
case LinphoneRegistrationCleared:
message = NSLocalizedString(@"Not registered", nil);
message = NSLocalizedString(@"Not connected", nil);
break;
case LinphoneRegistrationFailed:
message = NSLocalizedString(@"Registration failed", nil);
message = NSLocalizedString(@"Connection failed", nil);
break;
case LinphoneRegistrationProgress:
message = NSLocalizedString(@"Registration in progress", nil);
message = NSLocalizedString(@"Connection in progress", nil);
break;
default:
break;

View file

@ -319,7 +319,7 @@ static RootViewManager *rootViewManagerInstance = nil;
LinphoneRegistrationState state = [[notif.userInfo objectForKey:@"state"] intValue];
if (state == LinphoneRegistrationFailed && ![currentView equal:AssistantView.compositeViewDescription] &&
[UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
message:[notif.userInfo objectForKey:@"message"]
preferredStyle:UIAlertControllerStyleAlert];
@ -761,7 +761,7 @@ static RootViewManager *rootViewManagerInstance = nil;
switch (linphone_call_get_reason(call)) {
case LinphoneReasonNotFound:
lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is not registered.", nil), lUserName];
lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is not connected.", nil), lUserName];
break;
case LinphoneReasonBusy:
lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is busy.", nil), lUserName];

View file

@ -98,7 +98,7 @@
[self setInvalidAccountSet:true];
UIView *alertViewText =
[tester waitForViewWithAccessibilityLabel:@"Registration failure" traits:UIAccessibilityTraitStaticText];
[tester waitForViewWithAccessibilityLabel:@"Connection failure" traits:UIAccessibilityTraitStaticText];
if (alertViewText) {
UIView *reason = [tester waitForViewWithAccessibilityLabel:@"Bad credentials, check your account settings"
traits:UIAccessibilityTraitStaticText];

View file

@ -84,7 +84,7 @@
NSString *phone = @"+5 15 #0664;447*46";
[self createContact:contactName lastName:@"dummy" phoneNumber:phone SIPAddress:nil];
[tester tapViewWithAccessibilityLabel:[@"Call " stringByAppendingString:phone]];
[tester waitForViewWithAccessibilityLabel:[phone stringByAppendingString:@" is not registered."]];
[tester waitForViewWithAccessibilityLabel:[phone stringByAppendingString:@" is not connected."]];
[tester tapViewWithAccessibilityLabel:@"Cancel"];
}

View file

@ -169,18 +169,18 @@
}
- (void)waitForRegistration {
// wait for account to be registered
// wait for account to be connected
int timeout = 15;
while (timeout &&
![tester tryFindingViewWithAccessibilityLabel:@"Registration state"
value:@"Registered"
value:@"Connected"
traits:UIAccessibilityTraitButton
error:nil]) {
[tester waitForTimeInterval:1];
timeout--;
}
[tester waitForViewWithAccessibilityLabel:@"Registration state"
value:@"Registered"
value:@"Connected"
traits:UIAccessibilityTraitButton];
}