From e5cf9331c9fc57064a7fce2beb760a018a49e82f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 28 Sep 2012 12:06:33 +0200 Subject: [PATCH] Add registration failure additionnal message Change sip to viewer mode --- Classes/LinphoneManager.m | 2 +- Classes/PhoneMainView.m | 15 +++++---- Classes/WizardViewController.m | 7 +++-- Resources/en.lproj/Localizable.strings | Bin 17258 -> 17408 bytes Resources/fr.lproj/Localizable.strings | Bin 17858 -> 17996 bytes linphone-Info.plist | 2 +- linphone.ldb/Contents.plist | 29 ++++++++++++++++-- .../Localizable/1/Localizable.strings | Bin 17258 -> 17408 bytes 8 files changed, 43 insertions(+), 12 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 8644451dd..eda755873 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -423,7 +423,7 @@ static void linphone_iphone_transfer_state_changed(LinphoneCore* lc, LinphoneCal #pragma mark - Registration State Functions --(void) onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message { +- (void)onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message { [LinphoneLogger logc:LinphoneLoggerLog format:"NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message]; if (state==LinphoneRegistrationOk) [LinphoneManager instance]->stopWaitingRegisters=TRUE; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 7aeb28c8b..488df4e09 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -283,12 +283,15 @@ static PhoneMainView* phoneMainViewInstance=nil; LinphoneProxyConfig *cfg = [[notif.userInfo objectForKey: @"cfg"] pointerValue]; // Show error if (state == LinphoneRegistrationFailed) { - NSString* lErrorMessage=nil; - if (linphone_proxy_config_get_error(cfg) == LinphoneReasonBadCredentials) { - lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings",nil); - } else if (linphone_proxy_config_get_error(cfg) == LinphoneReasonNoResponse) { - lErrorMessage = NSLocalizedString(@"SIP server unreachable",nil); - } + NSString* lErrorMessage = nil; + LinphoneReason reason = linphone_proxy_config_get_error(cfg); + if (reason == LinphoneReasonBadCredentials) { + lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings", nil); + } else if (reason == LinphoneReasonNoResponse) { + lErrorMessage = NSLocalizedString(@"SIP server unreachable", nil); + } else { + lErrorMessage = NSLocalizedString(@"Unknown error", nil); + } if (lErrorMessage != nil && linphone_proxy_config_get_error(cfg) != LinphoneReasonNoResponse) { //do not report network connection issue on registration diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 408abb40a..4daec30f4 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -351,6 +351,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server { + [self clearProxyConfig]; if(server == nil) { server = domain; } @@ -777,8 +778,10 @@ static UICompositeViewDescription *compositeDescription = nil; - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { if ([touch.view isKindOfClass:[UIButton class]]) { //Avoid tap gesture on Button - [LinphoneUtils findAndResignFirstResponder:currentView]; - return NO; + if([LinphoneUtils findAndResignFirstResponder:currentView]) { + [(UIButton*)touch.view sendActionsForControlEvents:UIControlEventTouchUpInside]; + return NO; + } } return YES; } diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 03cca0ed321fd679ee7af4f251e531bc1565bb23..e2f6b267d5416e31791d3780bf734821151b371d 100644 GIT binary patch delta 46 zcmaFW#@NuoxM8t_cpgJGLmopuLphLCU`S;s0>XTTqR9phl9Tt_r)^&BaGVJMPL>XQ delta 14 VcmZqZV0_iaxM8uwW=qH8OaL!{1_S^A diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 93ea9abbbdda616f4a08f5dd2035ed2ec932b0ce..196affc93153b24f284602f3317e7df0b8304645 100644 GIT binary patch delta 81 zcmX@q&3LAVaYKOB delta 67 zcmX@p!+5BhaYKL=a|}b?=CM1*vN^~30TTd= C&Kj}+ diff --git a/linphone-Info.plist b/linphone-Info.plist index 0571fa27c..6ffe2f7d5 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -47,7 +47,7 @@ CFBundleTypeRole - Editor + Viewer CFBundleURLIconFile linphone_icon_72@2x CFBundleURLName diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index a1bb4d322..fe24368da 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -11997,7 +11997,7 @@ change date - 2012-09-28T08:39:17Z + 2012-09-28T09:53:17Z changed values class @@ -12007,7 +12007,7 @@ flags 0 hash - 974d882db652398dc5678a38298fec69 + 301ca0dd125a814aec815b3dce0b61e4 name Localizable.strings @@ -14226,6 +14226,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Unknown error + localizations + + en + Unknown error + fr + Erreur inconnue + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index 03cca0ed321fd679ee7af4f251e531bc1565bb23..e2f6b267d5416e31791d3780bf734821151b371d 100644 GIT binary patch delta 46 zcmaFW#@NuoxM8t_cpgJGLmopuLphLCU`S;s0>XTTqR9phl9Tt_r)^&BaGVJMPL>XQ delta 14 VcmZqZV0_iaxM8uwW=qH8OaL!{1_S^A