From b72465e1de9c513e4ae7f18aa0e3323dccc870e8 Mon Sep 17 00:00:00 2001 From: REIS Benjamin Date: Wed, 26 Oct 2016 16:41:48 +0200 Subject: [PATCH] transifex-push + fix assistant recreation of an existing account --- Classes/AssistantView.m | 24 +++++++++++++----- Classes/Base.lproj/AboutView.strings | Bin 3746 -> 3750 bytes Classes/Base.lproj/AssistantLinkView.strings | Bin 6808 -> 6484 bytes .../Base.lproj/AssistantViewScreens.strings | Bin 34134 -> 34194 bytes Classes/Base.lproj/ShopView.strings | Bin 1342 -> 464 bytes Classes/LinphoneUI/UICheckBoxTableView.m | 6 ++--- Resources/en.lproj/Localizable.strings | Bin 49728 -> 55218 bytes .../en.lproj/Network.strings | 2 ++ 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 2cddb537c..d2b2e37f3 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -881,6 +881,23 @@ static UICompositeViewDescription *compositeDescription = nil; } } +- (void) isAccountActivated:(const char *)resp { + if (currentView != _createAccountView) { + if( linphone_account_creator_get_phone_number(account_creator) == NULL) { + [self configureProxyConfig]; + [PhoneMainView.instance changeCurrentView:AssistantLinkView.compositeViewDescription]; + } else { + [PhoneMainView.instance changeCurrentView:DialerView.compositeViewDescription]; + } + } else { + if (!linphone_account_creator_get_username(account_creator)) { + [self showErrorPopup:"ERROR_ALIAS_ALREADY_IN_USE"]; + } else { + [self showErrorPopup:"ERROR_ACCOUNT_ALREADY_IN_USE"]; + } + } +} + #pragma mark - Account creator callbacks void assistant_is_account_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) { @@ -943,12 +960,7 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorAccountActivated) { - if( linphone_account_creator_get_phone_number(creator) == NULL) { - [thiz configureProxyConfig]; - [PhoneMainView.instance changeCurrentView:AssistantLinkView.compositeViewDescription]; - } else { - [PhoneMainView.instance changeCurrentView:DialerView.compositeViewDescription]; - } + [thiz isAccountActivated:resp]; } else if (status == LinphoneAccountCreatorAccountNotActivated) { if (!IPAD || linphone_account_creator_get_phone_number(creator) != NULL) { //Re send SMS if the username is the phone number diff --git a/Classes/Base.lproj/AboutView.strings b/Classes/Base.lproj/AboutView.strings index d4a07033642dd3c53ca63eae6f739feda898a975..19b2330a57528ed80728862a4bd4fb10a12104f2 100644 GIT binary patch delta 49 zcmZ1^yG(Y26$`r|g9(EkgTZ7)R{6Q2a;!5JSWF7E!%9tna2tMgNqP8 diff --git a/Classes/Base.lproj/AssistantLinkView.strings b/Classes/Base.lproj/AssistantLinkView.strings index 2be816fe53e4284d79308ad832a57288050f9688..4396611fef15658f3c34367c93ea4caa77e64094 100644 GIT binary patch delta 346 zcmbPXdc|l%1Iy+EY+)>{84QUGWs?QD6(toI${8{lN*FR26o6t13}rwv2Pl#D$6|7bgvjJ~ToM@aiK6C{OL+7)H}G39sk;FK v%MXZy89ab4cV_Sh@<3wl4517`;6U^QiGdA$Cm2DzdU4Z<1{IsRguU1R>{wwH diff --git a/Classes/Base.lproj/AssistantViewScreens.strings b/Classes/Base.lproj/AssistantViewScreens.strings index 919ec41e26f599bdecd48ada5220017d330f1264..a7219fcf64b15094cad335fda0ebdbebe5ce2b8e 100644 GIT binary patch delta 988 zcmccC#Wbm#X~Pcg$xqD8Cg;hCO)hFsVpN#C(OQ187*7zI=tm~i$pHcelk0f-HgoYF zW1no3%*UI|kk63Ekj9Y7P{fcsIj~HcQ-J{_mco!aIniBw@*NSb$qJ1!lNZQIO_mb% zn*5GvJvNg!IJiufNz|I`A||rgOiYh;k{cUq216o4*gdxKrsb| zG9Z})6iETnB|sYFF1TA5^nmOTpcq6Xm!SZtHWjEYb#i`#sw7BvD$oa+V4ox-Oqi_b zCOny|k!Ny&o7m(D?lP0NSxZe`Bkjc<4pgrIw0j_36EnF$Kwxr$v&iHCHmS)+WJES^ zlUc^dm^ismMp#sVK?CUB0(ek>0!I@Zv%BPiAZmoMsF}Pl&VBO)c?FTl6RO#OaT&?r z&k)KGH2I)$_hg4wR1x*b0m3UL_nBF2PBBg5n*2>#Z*m@^)MOrqh{@lS4@`D(1V)?V zDVEJ|+~=`P7BLVI1O-_lFj`W8bSXnIFz^-4MR^l}2?ms8N`W#Zlh6AtC0ebcx%=in z0X58%3xqp1%Y+?c-~1}BOd7;9En;wFsASM(FklD+lEn;#z!+9yum)PJ#h}l?1!QAU sF}aX)F{!DVOq&9^MM=pEn-i*HIMAXbzF8I=-Ym^ts8O>yzWF;N02BEBIsgCw delta 773 zcmb7CO-vI}5T30f>e>ReEwZ}lQWqs=t@Y4aq8^Z@G_^t@3z}GO;VSVeeuL$y0-lZ!4WQP-~80%k4qfP{fLRqYXCKdUV zs7wzTZkjA?>p_hA;`rtF9uoE4)qz@TQv3)^HDKyO7$r%;V>QioA0mly6oWo79DE}= zQaYfUX#Y3eHCe-A$b%hS5k~0eX&8zR^_Xr~$wcGWhaAZ?|V(rW)@htbH5uJJjA8#vBlRsuRgXAd9vOeR)s%4MDok?f?J) diff --git a/Classes/Base.lproj/ShopView.strings b/Classes/Base.lproj/ShopView.strings index a5c86efab54ac9a316c4fa3d62e61ff9a61c5da2..cc79d924be22232a2e9063fa9386591735cb850e 100644 GIT binary patch delta 15 XcmdnTb%A+;(dHM73XGEvu+#wnG5!Vc literal 1342 zcmbu8-Acni5QWcmo+9+JkXR^UMZ8cev?#Xz1kt-T6^zDKG=hC6pHcmibQ6u6R48G? zvN@SK-^}dSr=u;k*oRdAy=j>nfgf`ZdBEH4CEB;CK z%awAZsUG+iq8X}RXgZt+@>tiryF|QL{n5sY!``OwYcjWrxMgmKC{0wSxS!%IUgb^L zzvI%7k0D%W221MQWf{)A26bdTs@R9=Mm^pKMCew?Yzm+FdH#~6*}*!#zg?R^5|SnD zZv=Y;d&;y_Sqnp-`kp}@W?fIHRa%8+@?&P<5$1%6@pP-RqPC`|Hie(XUgxWx(sm_OWR&VlYT&J!3tYWJ*BrNcIbt;4@FZtA}}FSD%IA#)tzF`eJ? z2G>n*klj~L18$n9bDnX9&8D!i{ol=|+?Ti=6+Y|8BIYrHX_vY7w3FR|yw7GjZ3-LN I&wP%)0Z+xm+5i9m diff --git a/Classes/LinphoneUI/UICheckBoxTableView.m b/Classes/LinphoneUI/UICheckBoxTableView.m index 60a7ce174..f153f58cc 100644 --- a/Classes/LinphoneUI/UICheckBoxTableView.m +++ b/Classes/LinphoneUI/UICheckBoxTableView.m @@ -51,7 +51,7 @@ - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - _emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] != 0); + _emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] > 0); } - (void)toggleRowSelectionForRowAtIndexPath:(NSIndexPath *)indexPath { @@ -123,8 +123,8 @@ - (void)loadData { [_selectedItems removeAllObjects]; [self.tableView reloadData]; - - _editButton.enabled = _emptyView.hidden = ([self totalNumberOfItems] > 0); + + _emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] > 0); } - (void)removeSelectionUsing:(void (^)(NSIndexPath *indexPath))remover { diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 2cd663c29dd529437182d6d063b427c7b5f2c365..fce0e8960af74a6b46e29a9a22f4cec050ceb34d 100644 GIT binary patch delta 4163 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 V0$)GzSwPdVG