witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Assistant UI errors

Browse source
This commit is contained in:
REIS Benjamin 2016-10-03 11:02:19 +02:00
parent 4f55807564
commit 1a766237f6
4 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/AssistantLinkView.m
View file

@ -132,7 +132,11 @@ void assistant_link_phone_number_with_account(LinphoneAccountCreator *creator, L
thiz.linkAccountView.hidden = thiz.activateSMSView.userInteractionEnabled = YES;
thiz.activateSMSView.hidden = thiz.linkAccountView.userInteractionEnabled = NO;
} else {
[thiz showErrorPopup:resp];
if (strcmp(resp, "Missing required parameters") ==0) {
[thiz showErrorPopup:"ERROR_NO_PHONE_NUMBER"];
} else {
[thiz showErrorPopup:resp];
}
}
}

32
Classes/AssistantView.m
View file

@ -727,7 +727,10 @@ static UICompositeViewDescription *compositeDescription = nil;
return NSLocalizedString(@"Your phone number is invalid.", nil);
if
IS(ERROR_CANNOT_SEND_SMS)
return NSLocalizedString(@"Server error, please try again later.", nil);
return NSLocalizedString(@"Server error, please try again later.", nil);
if
IS(ERROR_NO_PHONE_NUMBER)
return NSLocalizedString(@"Please confirm your country code and enter your phone number.", nil);
if (!linphone_core_is_network_reachable(LC))
return NSLocalizedString(@"There is no network connection available, enable "
@ -740,6 +743,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)showErrorPopup:(const char *)err {
UIAlertView *errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Account configuration issue", nil)
message:[self.class StringForXMLRPCError:err]
//message:[NSString stringWithUTF8String:err]
delegate:nil
cancelButtonTitle:NSLocalizedString(@"Cancel", nil)
otherButtonTitles:nil, nil];
@ -755,7 +759,11 @@ static UICompositeViewDescription *compositeDescription = nil;
_outgoingView = AssistantLinkView.compositeViewDescription;
[self configureProxyConfig];
} else {
[self showErrorPopup:resp];
if (strcmp(resp, "Missing required parameters") == 0) {
[self showErrorPopup:"ERROR_NO_PHONE_NUMBER"];
} else {
[self showErrorPopup:resp];
}
}
} else {
if (status == LinphoneAccountCreatorAccountExist || status == LinphoneAccountCreatorAccountExistWithAlias) {
@ -765,7 +773,11 @@ static UICompositeViewDescription *compositeDescription = nil;
} else if (status == LinphoneAccountCreatorAccountNotExist) {
linphone_account_creator_create_account(account_creator);
} else {
[self showErrorPopup:resp];
if (linphone_account_creator_get_phone_number(account_creator) == NULL) {
[self showErrorPopup:"ERROR_NO_PHONE_NUMBER"];
} else {
[self showErrorPopup:resp];
}
}
}
}
@ -788,7 +800,11 @@ void assistant_create_account(LinphoneAccountCreator *creator, LinphoneAccountCr
[thiz changeView:thiz.createAccountActivateEmailView back:FALSE animation:TRUE];
}
} else {
[thiz showErrorPopup:resp];
if (linphone_account_creator_get_phone_number(creator) == NULL) {
[thiz showErrorPopup:"ERROR_NO_PHONE_NUMBER"];
} else {
[thiz showErrorPopup:resp];
}
}
}
@ -938,8 +954,8 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc
- (IBAction)onCreateAccountClick:(id)sender {
ONCLICKBUTTON(sender, 100, {
_waitView.hidden = NO;
linphone_account_creator_is_account_used(account_creator);
_waitView.hidden = NO;
linphone_account_creator_is_account_used(account_creator);
});
}
@ -948,8 +964,8 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc
_waitView.hidden = NO;
linphone_account_creator_set_activation_code(account_creator, ((UITextField*)[self findView:ViewElement_SMSCode inView:_contentView ofType:UITextField.class]).text.UTF8String);
if (linphone_account_creator_get_password(account_creator) == NULL &&
linphone_account_creator_get_ha1(account_creator) == NULL) {
linphone_account_creator_activate_account(account_creator);
linphone_account_creator_get_ha1(account_creator) == NULL) {
linphone_account_creator_activate_account(account_creator);
} else {
linphone_account_creator_activate_phone_number_link(account_creator);
}

2
Classes/Base.lproj/AssistantViewScreens.xib
View file

@ -970,7 +970,7 @@ Once it is done, come back here and click on the button.</string>
<rect key="frame" x="0.0" y="0.0" width="374" height="576"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CONFIGURE SIP ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="wen-Vj-Wgv" userLabel="titleLabel">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="USE YOUR SIP ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="wen-Vj-Wgv" userLabel="titleLabel">
<accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="24"/>
<color key="textColor" red="0.20521381497383118" green="0.20520767569541931" blue="0.20521116256713867" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

BIN
Classes/fr.lproj/AssistantViewScreens.strings
View file

Binary file not shown.