forked from mirrors/linphone-iphone
rename wizard -> assistant
This commit is contained in:
parent
bb92accc7c
commit
ab2cfbe1e6
49 changed files with 213 additions and 207 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* WizardViewController.h
|
||||
/* AssistantViewController.h
|
||||
*
|
||||
* Copyright (C) 2012 Belledonne Comunications, Grenoble, France
|
||||
*
|
||||
|
|
@ -22,32 +22,28 @@
|
|||
#import "UICompositeViewController.h"
|
||||
#import "TPKeyboardAvoidingScrollView.h"
|
||||
|
||||
@interface WizardViewController : TPMultiLayoutViewController
|
||||
<UITextFieldDelegate,
|
||||
UICompositeViewDelegate,
|
||||
XMLRPCConnectionDelegate,
|
||||
UIGestureRecognizerDelegate,
|
||||
UIAlertViewDelegate>
|
||||
{
|
||||
@private
|
||||
UITextField *activeTextField;
|
||||
UIView *currentView;
|
||||
UIView *nextView;
|
||||
NSMutableArray *historyViews;
|
||||
@interface AssistantViewController
|
||||
: TPMultiLayoutViewController <UITextFieldDelegate, UICompositeViewDelegate, XMLRPCConnectionDelegate,
|
||||
UIGestureRecognizerDelegate, UIAlertViewDelegate> {
|
||||
@private
|
||||
UITextField *activeTextField;
|
||||
UIView *currentView;
|
||||
UIView *nextView;
|
||||
NSMutableArray *historyViews;
|
||||
}
|
||||
|
||||
@property(nonatomic, strong) IBOutlet TPKeyboardAvoidingScrollView *contentView;
|
||||
|
||||
@property (nonatomic, strong) IBOutlet UIView *choiceView;
|
||||
@property (nonatomic, strong) IBOutlet UIView *createAccountView;
|
||||
@property (nonatomic, strong) IBOutlet UIView *connectAccountView;
|
||||
@property (nonatomic, strong) IBOutlet UIView *externalAccountView;
|
||||
@property (nonatomic, strong) IBOutlet UIView *validateAccountView;
|
||||
@property (strong, nonatomic) IBOutlet UIView *provisionedAccountView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *choiceView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *createAccountView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *connectAccountView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *externalAccountView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *validateAccountView;
|
||||
@property(strong, nonatomic) IBOutlet UIView *provisionedAccountView;
|
||||
|
||||
@property (nonatomic, strong) IBOutlet UIView *waitView;
|
||||
@property(nonatomic, strong) IBOutlet UIView *waitView;
|
||||
|
||||
@property (nonatomic, strong) IBOutlet UIButton *backButton;
|
||||
@property(nonatomic, strong) IBOutlet UIButton *backButton;
|
||||
@property(nonatomic, strong) IBOutlet UIButton *createChoiceButton;
|
||||
@property(nonatomic, strong) IBOutlet UIButton *connectChoiceButton;
|
||||
@property(nonatomic, strong) IBOutlet UIButton *externalChoiceButton;
|
||||
|
|
@ -60,12 +56,12 @@
|
|||
|
||||
@property(strong, nonatomic) IBOutlet UIButton *createAccountButton;
|
||||
|
||||
@property (strong, nonatomic) IBOutlet UITextField *provisionedUsername;
|
||||
@property (strong, nonatomic) IBOutlet UITextField *provisionedPassword;
|
||||
@property (strong, nonatomic) IBOutlet UITextField *provisionedDomain;
|
||||
@property(strong, nonatomic) IBOutlet UITextField *provisionedUsername;
|
||||
@property(strong, nonatomic) IBOutlet UITextField *provisionedPassword;
|
||||
@property(strong, nonatomic) IBOutlet UITextField *provisionedDomain;
|
||||
|
||||
@property (nonatomic, strong) IBOutlet UIImageView *choiceViewLogoImageView;
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *transportChooser;
|
||||
@property(nonatomic, strong) IBOutlet UIImageView *choiceViewLogoImageView;
|
||||
@property(strong, nonatomic) IBOutlet UISegmentedControl *transportChooser;
|
||||
|
||||
- (void)reset;
|
||||
- (void)fillDefaultValues;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
/* WizardViewController.m
|
||||
/* AssistantViewController.m
|
||||
*
|
||||
* Copyright (C) 2012 Belledonne Comunications, Grenoble, France
|
||||
*
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import "WizardViewController.h"
|
||||
#import "AssistantViewController.h"
|
||||
#import "LinphoneManager.h"
|
||||
#import "PhoneMainView.h"
|
||||
#import "UITextField+DoneButton.h"
|
||||
|
|
@ -39,14 +39,14 @@ typedef enum _ViewElement {
|
|||
ViewElement_Username_Error = 404
|
||||
} ViewElement;
|
||||
|
||||
@implementation WizardViewController
|
||||
@implementation AssistantViewController
|
||||
|
||||
#pragma mark - Lifecycle Functions
|
||||
|
||||
- (id)init {
|
||||
self = [super initWithNibName:@"WizardViewController" bundle:[NSBundle mainBundle]];
|
||||
self = [super initWithNibName:@"AssistantViewController" bundle:[NSBundle mainBundle]];
|
||||
if (self != nil) {
|
||||
[[NSBundle mainBundle] loadNibNamed:@"WizardViews" owner:self options:nil];
|
||||
[[NSBundle mainBundle] loadNibNamed:@"AssistantViews" owner:self options:nil];
|
||||
historyViews = [[NSMutableArray alloc] init];
|
||||
currentView = nil;
|
||||
}
|
||||
|
|
@ -63,8 +63,8 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
|
||||
+ (UICompositeViewDescription *)compositeViewDescription {
|
||||
if (compositeDescription == nil) {
|
||||
compositeDescription = [[UICompositeViewDescription alloc] init:@"Wizard"
|
||||
content:@"WizardViewController"
|
||||
compositeDescription = [[UICompositeViewDescription alloc] init:@"Assistant"
|
||||
content:@"AssistantViewController"
|
||||
stateBar:@"UIStateBar"
|
||||
tabBar:nil
|
||||
fullscreen:false
|
||||
|
|
@ -132,7 +132,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[(UITextField *)view setText:@""];
|
||||
} else {
|
||||
for (UIView *subview in view.subviews) {
|
||||
[WizardViewController cleanTextField:subview];
|
||||
[AssistantViewController cleanTextField:subview];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -153,7 +153,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
lc, NULL, linphone_address_get_username(addr), linphone_proxy_config_get_domain(current_conf));
|
||||
linphone_address_destroy(addr);
|
||||
if (auth) {
|
||||
LOGI(@"A proxy config was set up with the remote provisioning, skip wizard");
|
||||
LOGI(@"A proxy config was set up with the remote provisioning, skip assistant");
|
||||
[self onDialerBackClick:nil];
|
||||
}
|
||||
}
|
||||
|
|
@ -168,13 +168,13 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
const char *domain = linphone_address_get_domain(default_addr);
|
||||
const char *username = linphone_address_get_username(default_addr);
|
||||
if (domain && strlen(domain) > 0) {
|
||||
// UITextField* domainfield = [WizardViewController findTextField:ViewElement_Domain
|
||||
// UITextField* domainfield = [AssistantViewController findTextField:ViewElement_Domain
|
||||
// view:_externalAccountView];
|
||||
[_provisionedDomain setText:[NSString stringWithUTF8String:domain]];
|
||||
}
|
||||
|
||||
if (username && strlen(username) > 0 && username[0] != '?') {
|
||||
// UITextField* userField = [WizardViewController findTextField:ViewElement_Username
|
||||
// UITextField* userField = [AssistantViewController findTextField:ViewElement_Username
|
||||
// view:_externalAccountView];
|
||||
[_provisionedUsername setText:[NSString stringWithUTF8String:username]];
|
||||
}
|
||||
|
|
@ -187,12 +187,12 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
- (void)resetTextFields {
|
||||
[WizardViewController cleanTextField:_choiceView];
|
||||
[WizardViewController cleanTextField:_createAccountView];
|
||||
[WizardViewController cleanTextField:_connectAccountView];
|
||||
[WizardViewController cleanTextField:_externalAccountView];
|
||||
[WizardViewController cleanTextField:_validateAccountView];
|
||||
[WizardViewController cleanTextField:_provisionedAccountView];
|
||||
[AssistantViewController cleanTextField:_choiceView];
|
||||
[AssistantViewController cleanTextField:_createAccountView];
|
||||
[AssistantViewController cleanTextField:_connectAccountView];
|
||||
[AssistantViewController cleanTextField:_externalAccountView];
|
||||
[AssistantViewController cleanTextField:_validateAccountView];
|
||||
[AssistantViewController cleanTextField:_provisionedAccountView];
|
||||
}
|
||||
|
||||
- (void)reset {
|
||||
|
|
@ -221,7 +221,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
if ([child tag] == tag) {
|
||||
return (UITextField *)child;
|
||||
} else {
|
||||
UIView *o = [WizardViewController findView:tag view:child];
|
||||
UIView *o = [AssistantViewController findView:tag view:child];
|
||||
if (o)
|
||||
return o;
|
||||
}
|
||||
|
|
@ -230,14 +230,14 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
+ (UITextField *)findTextField:(ViewElement)tag view:(UIView *)view {
|
||||
UIView *aview = [WizardViewController findView:tag view:view];
|
||||
UIView *aview = [AssistantViewController findView:tag view:view];
|
||||
if ([aview isKindOfClass:[UITextField class]])
|
||||
return (UITextField *)aview;
|
||||
return nil;
|
||||
}
|
||||
|
||||
+ (UILabel *)findLabel:(ViewElement)tag view:(UIView *)view {
|
||||
UIView *aview = [WizardViewController findView:tag view:view];
|
||||
UIView *aview = [AssistantViewController findView:tag view:view];
|
||||
if ([aview isKindOfClass:[UILabel class]])
|
||||
return (UILabel *)aview;
|
||||
return nil;
|
||||
|
|
@ -249,7 +249,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
|
||||
- (void)changeView:(UIView *)view back:(BOOL)back animation:(BOOL)animation {
|
||||
|
||||
static BOOL placement_done = NO; // indicates if the button placement has been done in the wizard choice view
|
||||
static BOOL placement_done = NO; // indicates if the button placement has been done in the assistant choice view
|
||||
|
||||
// Change toolbar buttons following view
|
||||
_backButton.enabled = (view == _choiceView);
|
||||
|
|
@ -262,9 +262,10 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
// [ External Btn ]
|
||||
// [ Remote Prov ]
|
||||
|
||||
BOOL show_logo = [[LinphoneManager instance] lpConfigBoolForKey:@"show_wizard_logo_in_choice_view_preference"];
|
||||
BOOL show_extern = ![[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_custom_account"];
|
||||
BOOL show_new = ![[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_create_account"];
|
||||
BOOL show_logo =
|
||||
[[LinphoneManager instance] lpConfigBoolForKey:@"show_assistant_logo_in_choice_view_preference"];
|
||||
BOOL show_extern = ![[LinphoneManager instance] lpConfigBoolForKey:@"hide_assistant_custom_account"];
|
||||
BOOL show_new = ![[LinphoneManager instance] lpConfigBoolForKey:@"hide_assistant_create_account"];
|
||||
|
||||
if (!placement_done) {
|
||||
// visibility
|
||||
|
|
@ -422,7 +423,8 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
normalizedUserName, sizeof(normalizedUserName));
|
||||
linphone_address_set_username(linphoneAddress, normalizedUserName);
|
||||
linphone_address_set_domain(
|
||||
linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]);
|
||||
linphoneAddress,
|
||||
[[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"assistant"] UTF8String]);
|
||||
NSString *uri = [NSString stringWithUTF8String:linphone_address_as_string_uri_only(linphoneAddress)];
|
||||
NSString *scheme = [NSString stringWithUTF8String:linphone_address_get_scheme(linphoneAddress)];
|
||||
return [uri substringFromIndex:[scheme length] + 1];
|
||||
|
|
@ -434,7 +436,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
LOGI(@"XMLRPC check_account %@", username);
|
||||
|
||||
NSURL *URL =
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"assistant"]];
|
||||
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL:URL];
|
||||
[request setMethod:@"check_account" withParameters:[NSArray arrayWithObjects:username, nil]];
|
||||
|
||||
|
|
@ -449,7 +451,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
LOGI(@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent);
|
||||
|
||||
NSURL *URL =
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"assistant"]];
|
||||
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL:URL];
|
||||
[request setMethod:@"create_account_with_useragent"
|
||||
withParameters:[NSArray arrayWithObjects:identity, password, email, useragent, nil]];
|
||||
|
|
@ -464,7 +466,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
LOGI(@"XMLRPC check_account_validated %@", identity);
|
||||
|
||||
NSURL *URL =
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
|
||||
[NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"assistant"]];
|
||||
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL:URL];
|
||||
[request setMethod:@"check_account_validated" withParameters:[NSArray arrayWithObjects:identity, nil]];
|
||||
|
||||
|
|
@ -479,45 +481,45 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
- (void)registrationUpdate:(LinphoneRegistrationState)state
|
||||
forProxy:(LinphoneProxyConfig *)proxy
|
||||
message:(NSString *)message {
|
||||
// in wizard we only care about ourself
|
||||
// in assistant we only care about ourself
|
||||
if (proxy != linphone_core_get_default_proxy_config([LinphoneManager getLc])) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (state) {
|
||||
case LinphoneRegistrationOk: {
|
||||
_waitView.hidden = true;
|
||||
[[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]];
|
||||
break;
|
||||
}
|
||||
case LinphoneRegistrationNone:
|
||||
case LinphoneRegistrationCleared: {
|
||||
_waitView.hidden = true;
|
||||
break;
|
||||
}
|
||||
case LinphoneRegistrationFailed: {
|
||||
_waitView.hidden = true;
|
||||
if ([message isEqualToString:@"Forbidden"]) {
|
||||
message = NSLocalizedString(@"Incorrect username or password.", nil);
|
||||
case LinphoneRegistrationOk: {
|
||||
_waitView.hidden = true;
|
||||
[[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]];
|
||||
break;
|
||||
}
|
||||
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure", nil)
|
||||
message:message
|
||||
delegate:nil
|
||||
cancelButtonTitle:@"OK"
|
||||
otherButtonTitles:nil];
|
||||
[alert show];
|
||||
break;
|
||||
}
|
||||
case LinphoneRegistrationProgress: {
|
||||
_waitView.hidden = false;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
case LinphoneRegistrationNone:
|
||||
case LinphoneRegistrationCleared: {
|
||||
_waitView.hidden = true;
|
||||
break;
|
||||
}
|
||||
case LinphoneRegistrationFailed: {
|
||||
_waitView.hidden = true;
|
||||
if ([message isEqualToString:@"Forbidden"]) {
|
||||
message = NSLocalizedString(@"Incorrect username or password.", nil);
|
||||
}
|
||||
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure", nil)
|
||||
message:message
|
||||
delegate:nil
|
||||
cancelButtonTitle:@"OK"
|
||||
otherButtonTitles:nil];
|
||||
[alert show];
|
||||
break;
|
||||
}
|
||||
case LinphoneRegistrationProgress: {
|
||||
_waitView.hidden = false;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)loadWizardConfig:(NSString *)rcFilename {
|
||||
- (void)loadAssistantConfig:(NSString *)rcFilename {
|
||||
NSString *fullPath = [@"file://" stringByAppendingString:[LinphoneManager bundleFile:rcFilename]];
|
||||
linphone_core_set_provisioning_uri([LinphoneManager getLc],
|
||||
[fullPath cStringUsingEncoding:[NSString defaultCStringEncoding]]);
|
||||
|
|
@ -529,7 +531,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
linphone_core_enable_video_preview([LinphoneManager getLc], FALSE);
|
||||
[[LinphoneManager instance] resetLinphoneCore];
|
||||
linphone_core_enable_video_preview([LinphoneManager getLc], hasPreview);
|
||||
// we will set the new default proxy config in the wizard
|
||||
// we will set the new default proxy config in the assistant
|
||||
linphone_core_set_default_proxy_config([LinphoneManager getLc], NULL);
|
||||
}
|
||||
|
||||
|
|
@ -564,7 +566,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
if (!isValidUsername) {
|
||||
UILabel *error = [WizardViewController findLabel:ViewElement_Username_Error view:_contentView];
|
||||
UILabel *error = [AssistantViewController findLabel:ViewElement_Username_Error view:_contentView];
|
||||
|
||||
// show error with fade animation
|
||||
[error setText:[NSString stringWithFormat:NSLocalizedString(@"Illegal character in %@: %@", nil),
|
||||
|
|
@ -590,7 +592,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
return YES;
|
||||
}
|
||||
- (void)hideError:(NSTimer *)timer {
|
||||
UILabel *error_label = [WizardViewController findLabel:ViewElement_Username_Error view:_contentView];
|
||||
UILabel *error_label = [AssistantViewController findLabel:ViewElement_Username_Error view:_contentView];
|
||||
if (error_label) {
|
||||
[UIView animateWithDuration:0.3
|
||||
animations:^{
|
||||
|
|
@ -618,21 +620,21 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
|
||||
- (IBAction)onCreateChoiceClick:(id)sender {
|
||||
nextView = _createAccountView;
|
||||
[self loadWizardConfig:@"wizard_linphone_create.rc"];
|
||||
[self loadAssistantConfig:@"assistant_linphone_create.rc"];
|
||||
}
|
||||
|
||||
- (IBAction)onConnectChoiceClick:(id)sender {
|
||||
nextView = _connectAccountView;
|
||||
[self loadWizardConfig:@"wizard_linphone_existing.rc"];
|
||||
[self loadAssistantConfig:@"assistant_linphone_existing.rc"];
|
||||
}
|
||||
|
||||
- (IBAction)onExternalChoiceClick:(id)sender {
|
||||
nextView = _externalAccountView;
|
||||
[self loadWizardConfig:@"wizard_external_sip.rc"];
|
||||
[self loadAssistantConfig:@"assistant_external_sip.rc"];
|
||||
}
|
||||
|
||||
- (IBAction)onCheckValidationClick:(id)sender {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *username = [AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *identity = [self identityFromUsername:username];
|
||||
[self checkAccountValidation:identity];
|
||||
}
|
||||
|
|
@ -712,17 +714,17 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
- (IBAction)onSignInExternalClick:(id)sender {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *domain = [WizardViewController findTextField:ViewElement_Domain view:_contentView].text;
|
||||
NSString *username = [AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *domain = [AssistantViewController findTextField:ViewElement_Domain view:_contentView].text;
|
||||
NSString *transport = [_transportChooser titleForSegmentAtIndex:_transportChooser.selectedSegmentIndex];
|
||||
|
||||
[self verificationSignInWithUsername:username password:password domain:domain withTransport:transport];
|
||||
}
|
||||
|
||||
- (IBAction)onSignInClick:(id)sender {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *username = [AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
|
||||
// domain and server will be configured from the default proxy values
|
||||
[self verificationSignInWithUsername:username password:password domain:nil withTransport:nil];
|
||||
|
|
@ -733,8 +735,10 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
password2:(NSString *)password2
|
||||
email:(NSString *)email {
|
||||
NSMutableString *errors = [NSMutableString string];
|
||||
NSInteger username_length = [[LinphoneManager instance] lpConfigIntForKey:@"username_length" forSection:@"wizard"];
|
||||
NSInteger password_length = [[LinphoneManager instance] lpConfigIntForKey:@"password_length" forSection:@"wizard"];
|
||||
NSInteger username_length =
|
||||
[[LinphoneManager instance] lpConfigIntForKey:@"username_length" forSection:@"assistant"];
|
||||
NSInteger password_length =
|
||||
[[LinphoneManager instance] lpConfigIntForKey:@"password_length" forSection:@"assistant"];
|
||||
|
||||
if ([username length] < username_length) {
|
||||
[errors
|
||||
|
|
@ -774,11 +778,11 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
- (IBAction)onCreateAccountClick:(id)sender {
|
||||
UITextField *username_tf = [WizardViewController findTextField:ViewElement_Username view:_contentView];
|
||||
UITextField *username_tf = [AssistantViewController findTextField:ViewElement_Username view:_contentView];
|
||||
NSString *username = username_tf.text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *password2 = [WizardViewController findTextField:ViewElement_Password2 view:_contentView].text;
|
||||
NSString *email = [WizardViewController findTextField:ViewElement_Email view:_contentView].text;
|
||||
NSString *password = [AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *password2 = [AssistantViewController findTextField:ViewElement_Password2 view:_contentView].text;
|
||||
NSString *email = [AssistantViewController findTextField:ViewElement_Email view:_contentView].text;
|
||||
|
||||
if ([self verificationRegisterWithUsername:username password:password password2:password2 email:email]) {
|
||||
username = [username lowercaseString];
|
||||
|
|
@ -843,28 +847,28 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
_waitView.hidden = true;
|
||||
|
||||
switch (status) {
|
||||
case LinphoneConfiguringSuccessful:
|
||||
if (nextView == nil) {
|
||||
[self fillDefaultValues];
|
||||
} else {
|
||||
[self changeView:nextView back:false animation:TRUE];
|
||||
nextView = nil;
|
||||
case LinphoneConfiguringSuccessful:
|
||||
if (nextView == nil) {
|
||||
[self fillDefaultValues];
|
||||
} else {
|
||||
[self changeView:nextView back:false animation:TRUE];
|
||||
nextView = nil;
|
||||
}
|
||||
break;
|
||||
case LinphoneConfiguringFailed: {
|
||||
NSString *error_message = [notif.userInfo valueForKey:@"message"];
|
||||
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Provisioning Load error", nil)
|
||||
message:error_message
|
||||
delegate:nil
|
||||
cancelButtonTitle:NSLocalizedString(@"OK", nil)
|
||||
otherButtonTitles:nil];
|
||||
[alert show];
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case LinphoneConfiguringFailed: {
|
||||
NSString *error_message = [notif.userInfo valueForKey:@"message"];
|
||||
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Provisioning Load error", nil)
|
||||
message:error_message
|
||||
delegate:nil
|
||||
cancelButtonTitle:NSLocalizedString(@"OK", nil)
|
||||
otherButtonTitles:nil];
|
||||
[alert show];
|
||||
break;
|
||||
}
|
||||
|
||||
case LinphoneConfiguringSkipped:
|
||||
default:
|
||||
break;
|
||||
case LinphoneConfiguringSkipped:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -902,19 +906,23 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
otherButtonTitles:nil, nil];
|
||||
[errorView show];
|
||||
} else {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *email = [WizardViewController findTextField:ViewElement_Email view:_contentView].text;
|
||||
NSString *username =
|
||||
[AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password =
|
||||
[AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *email = [AssistantViewController findTextField:ViewElement_Email view:_contentView].text;
|
||||
NSString *identity = [self identityFromUsername:username];
|
||||
[self createAccount:identity password:password email:email];
|
||||
}
|
||||
} else if ([[request method] isEqualToString:@"create_account_with_useragent"]) {
|
||||
if ([response.object isEqualToNumber:[NSNumber numberWithInt:0]]) {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *username =
|
||||
[AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password =
|
||||
[AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
[self changeView:_validateAccountView back:FALSE animation:TRUE];
|
||||
[WizardViewController findTextField:ViewElement_Username view:_contentView].text = username;
|
||||
[WizardViewController findTextField:ViewElement_Password view:_contentView].text = password;
|
||||
[AssistantViewController findTextField:ViewElement_Username view:_contentView].text = username;
|
||||
[AssistantViewController findTextField:ViewElement_Password view:_contentView].text = password;
|
||||
} else {
|
||||
UIAlertView *errorView = [[UIAlertView alloc]
|
||||
initWithTitle:NSLocalizedString(@"Account creation issue", nil)
|
||||
|
|
@ -926,8 +934,10 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
} else if ([[request method] isEqualToString:@"check_account_validated"]) {
|
||||
if ([response.object isEqualToNumber:[NSNumber numberWithInt:1]]) {
|
||||
NSString *username = [WizardViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password = [WizardViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
NSString *username =
|
||||
[AssistantViewController findTextField:ViewElement_Username view:_contentView].text;
|
||||
NSString *password =
|
||||
[AssistantViewController findTextField:ViewElement_Password view:_contentView].text;
|
||||
[self addProxyConfig:username password:password domain:nil withTransport:nil];
|
||||
} else {
|
||||
UIAlertView *errorView =
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WizardViewController">
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AssistantViewController">
|
||||
<connections>
|
||||
<outlet property="contentView" destination="98" id="99"/>
|
||||
<outlet property="portraitView" destination="12" id="117"/>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WizardViewController">
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AssistantViewController">
|
||||
<connections>
|
||||
<outlet property="choiceView" destination="33" id="40"/>
|
||||
<outlet property="connectAccountView" destination="52" id="71"/>
|
||||
|
|
@ -1896,7 +1896,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
|
|||
}
|
||||
if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) {
|
||||
linphone_address_set_domain(
|
||||
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
|
||||
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"assistant"]
|
||||
cStringUsingEncoding:[NSString defaultCStringEncoding]]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#import "OutgoingCallViewController.h"
|
||||
#import "SettingsViewController.h"
|
||||
#import "SideMenuViewController.h"
|
||||
#import "WizardViewController.h"
|
||||
#import "AssistantViewController.h"
|
||||
|
||||
#import "DTAlertView.h"
|
||||
#import "DTActionSheet.h"
|
||||
|
|
|
|||
|
|
@ -295,9 +295,9 @@ static RootViewManager *rootViewManagerInstance = nil;
|
|||
linphone_core_get_default_proxy([LinphoneManager getLc], &conf);
|
||||
if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_login_view" forSection:@"app"] && conf == NULL) {
|
||||
already_shown = TRUE;
|
||||
WizardViewController *controller = DYNAMIC_CAST(
|
||||
[[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]],
|
||||
WizardViewController);
|
||||
AssistantViewController *controller = DYNAMIC_CAST(
|
||||
[[PhoneMainView instance] changeCurrentView:[AssistantViewController compositeViewDescription]],
|
||||
AssistantViewController);
|
||||
if (controller != nil) {
|
||||
[controller fillDefaultValues];
|
||||
}
|
||||
|
|
@ -420,12 +420,12 @@ static RootViewManager *rootViewManagerInstance = nil;
|
|||
// always start to dialer when testing
|
||||
// Change to default view
|
||||
const MSList *list = linphone_core_get_proxy_config_list(core);
|
||||
if (list != NULL || ([lm lpConfigBoolForKey:@"hide_wizard_preference"] == true) || lm.isTesting) {
|
||||
if (list != NULL || ([lm lpConfigBoolForKey:@"hide_assistant_preference"] == true) || lm.isTesting) {
|
||||
[self changeCurrentView:[DialerViewController compositeViewDescription]];
|
||||
} else {
|
||||
WizardViewController *controller = DYNAMIC_CAST(
|
||||
[[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]],
|
||||
WizardViewController);
|
||||
AssistantViewController *controller = DYNAMIC_CAST(
|
||||
[[PhoneMainView instance] changeCurrentView:[AssistantViewController compositeViewDescription]],
|
||||
AssistantViewController);
|
||||
if (controller != nil) {
|
||||
[controller reset];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -651,7 +651,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[hiddenKeys addObject:@"preview_preference"];
|
||||
}
|
||||
if ([lm lpConfigBoolForKey:@"hide_run_assistant_preference"]) {
|
||||
[hiddenKeys addObject:@"wizard_button"];
|
||||
[hiddenKeys addObject:@"assistant_button"];
|
||||
}
|
||||
|
||||
if (!linphone_core_tunnel_available()) {
|
||||
|
|
@ -701,8 +701,8 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
object:self];
|
||||
}
|
||||
#endif
|
||||
if ([key isEqual:@"wizard_button"]) {
|
||||
[PhoneMainView.instance changeCurrentView:WizardViewController.compositeViewDescription];
|
||||
if ([key isEqual:@"assistant_button"]) {
|
||||
[PhoneMainView.instance changeCurrentView:AssistantViewController.compositeViewDescription];
|
||||
return;
|
||||
} else if ([key isEqual:@"clear_proxy_button"]) {
|
||||
if (linphone_core_get_default_proxy_config(lc) == NULL) {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
addObject:[[SideMenuEntry alloc] initWithTitle:NSLocalizedString(@"Assistant", nil)
|
||||
tapBlock:^() {
|
||||
[PhoneMainView.instance
|
||||
changeCurrentView:WizardViewController.compositeViewDescription
|
||||
changeCurrentView:AssistantViewController.compositeViewDescription
|
||||
push:NO
|
||||
animated:NO];
|
||||
}]];
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -123,7 +123,7 @@ MainStoryboard
|
|||
#--> tabBar
|
||||
|
||||
|
||||
When the application is started, the phoneMainView gets asked to transition to the Dialer view or the Wizard view.
|
||||
When the application is started, the phoneMainView gets asked to transition to the Dialer view or the Assistant view.
|
||||
PhoneMainView exposes the -changeCurrentView: method, which will setup its
|
||||
Any Linphone view is actually presented in the UICompositeViewController, with or without a stateBar and tabBar.
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -62,8 +62,8 @@ enable_log_collect=0
|
|||
[default_values]
|
||||
reg_expires=600
|
||||
|
||||
[wizard]
|
||||
service_url=https://www.linphone.org/wizard.php
|
||||
[assistant]
|
||||
service_url=https://www.linphone.org/assistant.php
|
||||
domain=sip.linphone.org
|
||||
proxy=sip.linphone.org
|
||||
password_length=6
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ enable_log_collect=0
|
|||
[default_values]
|
||||
reg_expires=600
|
||||
|
||||
[wizard]
|
||||
service_url=https://www.linphone.org/wizard.php
|
||||
[assistant]
|
||||
service_url=https://www.linphone.org/assistant.php
|
||||
domain=sip.linphone.org
|
||||
proxy=sip.linphone.org
|
||||
password_length=6
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -12,7 +12,7 @@
|
|||
</dict>
|
||||
<dict>
|
||||
<key>Key</key>
|
||||
<string>wizard_button</string>
|
||||
<string>assistant_button</string>
|
||||
<key>Title</key>
|
||||
<string>Run assistant</string>
|
||||
<key>Type</key>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// WizardTester.h
|
||||
// AssistantTester.h
|
||||
// linphone
|
||||
//
|
||||
// Created by Guillaume on 17/01/2015.
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
|
||||
#import "LinphoneTestCase.h"
|
||||
|
||||
@interface WizardTester : LinphoneTestCase
|
||||
@interface AssistantTester : LinphoneTestCase
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
//
|
||||
// WizardTester.m
|
||||
// AssistantTester.m
|
||||
// linphone
|
||||
//
|
||||
// Created by Guillaume on 17/01/2015.
|
||||
//
|
||||
//
|
||||
|
||||
#import "WizardTester.h"
|
||||
#import "AssistantTester.h"
|
||||
#import <KIF/KIF.h>
|
||||
|
||||
@implementation WizardTester
|
||||
@implementation AssistantTester
|
||||
|
||||
- (void)beforeEach {
|
||||
[super beforeEach];
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
[tester tapViewWithAccessibilityLabel:@"Settings"];
|
||||
[tester tapViewWithAccessibilityLabel:@"Run assistant"];
|
||||
[tester waitForTimeInterval:0.5];
|
||||
if ([tester tryFindingViewWithAccessibilityLabel:@"Launch Wizard" error:nil]) {
|
||||
[tester tapViewWithAccessibilityLabel:@"Launch Wizard"];
|
||||
if ([tester tryFindingViewWithAccessibilityLabel:@"Launch Assistant" error:nil]) {
|
||||
[tester tapViewWithAccessibilityLabel:@"Launch Assistant"];
|
||||
[tester waitForTimeInterval:0.5];
|
||||
}
|
||||
}
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
[tester fail];
|
||||
} else {
|
||||
[tester tapViewWithAccessibilityLabel:@"OK"]; // alertview
|
||||
[tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel wizard
|
||||
[tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel assistant
|
||||
}
|
||||
} else {
|
||||
[tester fail];
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
630589E71B4E810900EFAE36 /* ChatTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589DF1B4E810900EFAE36 /* ChatTester.m */; };
|
||||
630589E81B4E810900EFAE36 /* ContactsTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E11B4E810900EFAE36 /* ContactsTester.m */; };
|
||||
630589EA1B4E810900EFAE36 /* LinphoneTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E41B4E810900EFAE36 /* LinphoneTestCase.m */; };
|
||||
630589EB1B4E810900EFAE36 /* WizardTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E61B4E810900EFAE36 /* WizardTester.m */; };
|
||||
630589EB1B4E810900EFAE36 /* AssistantTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E61B4E810900EFAE36 /* AssistantTester.m */; };
|
||||
63058A241B4E821E00EFAE36 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A0E1B4E821E00EFAE36 /* AppDelegate.m */; };
|
||||
63058A251B4E821E00EFAE36 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63058A0F1B4E821E00EFAE36 /* InfoPlist.strings */; };
|
||||
63058A261B4E821E00EFAE36 /* Main_iPad.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63058A111B4E821E00EFAE36 /* Main_iPad.strings */; };
|
||||
|
|
@ -269,10 +269,10 @@
|
|||
63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDF1B6A0FF200AA16FD /* ring.wav */; };
|
||||
63AADBFD1B6A0FF200AA16FD /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE01B6A0FF200AA16FD /* ringback.wav */; };
|
||||
63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE21B6A0FF200AA16FD /* shortring.caf */; };
|
||||
63AADBFF1B6A0FF200AA16FD /* wizard_external_sip.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */; };
|
||||
63AADC001B6A0FF200AA16FD /* wizard_linphone_create.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */; };
|
||||
63AADC011B6A0FF200AA16FD /* wizard_linphone_existing.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */; };
|
||||
63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */; };
|
||||
63AADBFF1B6A0FF200AA16FD /* assistant_external_sip.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE31B6A0FF200AA16FD /* assistant_external_sip.rc */; };
|
||||
63AADC001B6A0FF200AA16FD /* assistant_linphone_create.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */; };
|
||||
63AADC011B6A0FF200AA16FD /* assistant_linphone_existing.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */; };
|
||||
63AADC021B6A0FF200AA16FD /* assistant_remote.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE61B6A0FF200AA16FD /* assistant_remote.rc */; };
|
||||
63B81A0C1B57DA33009604A6 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 63B81A031B57DA33009604A6 /* LICENSE.txt */; };
|
||||
63B81A0D1B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B81A051B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.m */; };
|
||||
63B81A0E1B57DA33009604A6 /* TPKeyboardAvoidingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B81A071B57DA33009604A6 /* TPKeyboardAvoidingScrollView.m */; };
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
D32B6E2F15A5C0AC0033019F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
|
||||
D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */; };
|
||||
D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D34F6F9D1594D3FB0095705B /* InAppSettings.bundle */; };
|
||||
D350F20E15A43BB100149E54 /* WizardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D350F20C15A43BB100149E54 /* WizardViewController.m */; };
|
||||
D350F20E15A43BB100149E54 /* AssistantViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D350F20C15A43BB100149E54 /* AssistantViewController.m */; };
|
||||
D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; };
|
||||
D3549816158761D0000081D8 /* ContactsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3549815158761D0000081D8 /* ContactsTableViewController.m */; };
|
||||
D35498211587716B000081D8 /* UIStateBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* UIStateBar.m */; };
|
||||
|
|
@ -377,7 +377,7 @@
|
|||
D38187CD15FE346700C3EDCA /* HistoryDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D015FE346700C3EDCA /* HistoryDetailsViewController.xib */; };
|
||||
D38187D115FE346B00C3EDCA /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D415FE346B00C3EDCA /* HistoryViewController.xib */; };
|
||||
D38187D915FE347700C3EDCA /* IncomingCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */; };
|
||||
D38187DD15FE348A00C3EDCA /* WizardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E015FE348A00C3EDCA /* WizardViewController.xib */; };
|
||||
D38187DD15FE348A00C3EDCA /* AssistantViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E015FE348A00C3EDCA /* AssistantViewController.xib */; };
|
||||
D38187F015FE354000C3EDCA /* UIConferenceHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187F315FE354000C3EDCA /* UIConferenceHeader.xib */; };
|
||||
D38187F815FE355D00C3EDCA /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187FB15FE355D00C3EDCA /* UIMainBar.xib */; };
|
||||
D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D381881415FE3F0B00C3EDCA /* UICallCell.xib */; };
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
|
||||
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
|
||||
D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C6526615AC1A8F0092A874 /* UIEditableTableViewCell.m */; };
|
||||
D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* WizardViews.xib */; };
|
||||
D3D5126C160B3A8E00946DF8 /* AssistantViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */; };
|
||||
D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA53FC159850E80037DC6B /* LinphoneManager.m */; };
|
||||
D3EA540D1598528B0037DC6B /* ChatTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatTableViewController.m */; };
|
||||
D3EA5411159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; };
|
||||
|
|
@ -630,8 +630,8 @@
|
|||
630589E11B4E810900EFAE36 /* ContactsTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsTester.m; sourceTree = "<group>"; };
|
||||
630589E31B4E810900EFAE36 /* LinphoneTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneTestCase.h; sourceTree = "<group>"; };
|
||||
630589E41B4E810900EFAE36 /* LinphoneTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneTestCase.m; sourceTree = "<group>"; };
|
||||
630589E51B4E810900EFAE36 /* WizardTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WizardTester.h; sourceTree = "<group>"; };
|
||||
630589E61B4E810900EFAE36 /* WizardTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WizardTester.m; sourceTree = "<group>"; };
|
||||
630589E51B4E810900EFAE36 /* AssistantTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssistantTester.h; sourceTree = "<group>"; };
|
||||
630589E61B4E810900EFAE36 /* AssistantTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssistantTester.m; sourceTree = "<group>"; };
|
||||
630589F21B4E816900EFAE36 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = Classes/KIF/KIF.xcodeproj; sourceTree = SOURCE_ROOT; };
|
||||
63058A0A1B4E81B700EFAE36 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
63058A0D1B4E821E00EFAE36 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
||||
|
|
@ -878,10 +878,10 @@
|
|||
63AADBE01B6A0FF200AA16FD /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ringback.wav; sourceTree = "<group>"; };
|
||||
63AADBE11B6A0FF200AA16FD /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
63AADBE21B6A0FF200AA16FD /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = shortring.caf; sourceTree = "<group>"; };
|
||||
63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_external_sip.rc; sourceTree = "<group>"; };
|
||||
63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_linphone_create.rc; sourceTree = "<group>"; };
|
||||
63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_linphone_existing.rc; sourceTree = "<group>"; };
|
||||
63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_remote.rc; sourceTree = "<group>"; };
|
||||
63AADBE31B6A0FF200AA16FD /* assistant_external_sip.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_external_sip.rc; sourceTree = "<group>"; };
|
||||
63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_create.rc; sourceTree = "<group>"; };
|
||||
63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_existing.rc; sourceTree = "<group>"; };
|
||||
63AADBE61B6A0FF200AA16FD /* assistant_remote.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_remote.rc; sourceTree = "<group>"; };
|
||||
63AADBE71B6A0FF200AA16FD /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
63B81A031B57DA33009604A6 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
|
||||
63B81A041B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingCollectionView.h; sourceTree = "<group>"; };
|
||||
|
|
@ -937,8 +937,8 @@
|
|||
D32B9DFA15A2F131000B6DEC /* FastAddressBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FastAddressBook.h; path = Utils/FastAddressBook.h; sourceTree = "<group>"; };
|
||||
D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FastAddressBook.m; path = Utils/FastAddressBook.m; sourceTree = "<group>"; };
|
||||
D34F6F9D1594D3FB0095705B /* InAppSettings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = InAppSettings.bundle; sourceTree = "<group>"; };
|
||||
D350F20B15A43BB100149E54 /* WizardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WizardViewController.h; sourceTree = "<group>"; };
|
||||
D350F20C15A43BB100149E54 /* WizardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WizardViewController.m; sourceTree = "<group>"; };
|
||||
D350F20B15A43BB100149E54 /* AssistantViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssistantViewController.h; sourceTree = "<group>"; };
|
||||
D350F20C15A43BB100149E54 /* AssistantViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssistantViewController.m; sourceTree = "<group>"; };
|
||||
D35497FB15875372000081D8 /* ContactsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsViewController.h; sourceTree = "<group>"; };
|
||||
D35497FC15875372000081D8 /* ContactsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ContactsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
D3549814158761CF000081D8 /* ContactsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsTableViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1072,8 +1072,8 @@
|
|||
F09548281883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallCell.xib; sourceTree = "<group>"; };
|
||||
F09548291883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIConferenceHeader.xib; sourceTree = "<group>"; };
|
||||
F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIMainBar.xib; sourceTree = "<group>"; };
|
||||
F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViewController.xib; sourceTree = "<group>"; };
|
||||
F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViews.xib; sourceTree = "<group>"; };
|
||||
F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantViewController.xib; sourceTree = "<group>"; };
|
||||
F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantViews.xib; sourceTree = "<group>"; };
|
||||
F09548311883F1EB00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
|
||||
F09548321883F20A00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
|
||||
F09548331883F25C00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatViewController.strings; sourceTree = "<group>"; };
|
||||
|
|
@ -1098,10 +1098,10 @@
|
|||
F09548501883F5D900E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIConferenceHeader.strings; sourceTree = "<group>"; };
|
||||
F09548551883F61300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIMainBar.strings; sourceTree = "<group>"; };
|
||||
F09548561883F61600E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIMainBar.strings; sourceTree = "<group>"; };
|
||||
F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViewController.strings; sourceTree = "<group>"; };
|
||||
F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViewController.strings; sourceTree = "<group>"; };
|
||||
F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViews.strings; sourceTree = "<group>"; };
|
||||
F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViews.strings; sourceTree = "<group>"; };
|
||||
F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantViewController.strings; sourceTree = "<group>"; };
|
||||
F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantViewController.strings; sourceTree = "<group>"; };
|
||||
F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantViews.strings; sourceTree = "<group>"; };
|
||||
F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantViews.strings; sourceTree = "<group>"; };
|
||||
F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutViewController.strings; sourceTree = "<group>"; };
|
||||
F0AF06F11A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
|
||||
F0AF06F21A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatViewController.strings; sourceTree = "<group>"; };
|
||||
|
|
@ -1125,8 +1125,8 @@
|
|||
F0AF070C1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIStateBar.strings; sourceTree = "<group>"; };
|
||||
F0AF070D1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/PhoneMainView.strings; sourceTree = "<group>"; };
|
||||
F0AF070E1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SettingsViewController.strings; sourceTree = "<group>"; };
|
||||
F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViewController.strings; sourceTree = "<group>"; };
|
||||
F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViews.strings; sourceTree = "<group>"; };
|
||||
F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantViewController.strings; sourceTree = "<group>"; };
|
||||
F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantViews.strings; sourceTree = "<group>"; };
|
||||
F0B026F21AA710AF00FF49F7 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
|
||||
F0B89C2118DC89E30050B60E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
|
||||
F0BB8BD51936208100974404 /* liblinphoneTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = liblinphoneTester.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
|
@ -1282,6 +1282,10 @@
|
|||
22E0A81D111C44E100B04932 /* AboutViewController.h */,
|
||||
22E0A81C111C44E100B04932 /* AboutViewController.m */,
|
||||
636316D31A1DEBCB0009B839 /* AboutViewController.xib */,
|
||||
D350F20B15A43BB100149E54 /* AssistantViewController.h */,
|
||||
D350F20C15A43BB100149E54 /* AssistantViewController.m */,
|
||||
D38187E015FE348A00C3EDCA /* AssistantViewController.xib */,
|
||||
D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */,
|
||||
D32B6E2715A5BC430033019F /* ChatRoomTableViewController.h */,
|
||||
D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */,
|
||||
D3F795D315A582800077328B /* ChatRoomViewController.h */,
|
||||
|
|
@ -1360,10 +1364,6 @@
|
|||
D326483415887D4400930C67 /* Utils */,
|
||||
34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */,
|
||||
34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */,
|
||||
D350F20B15A43BB100149E54 /* WizardViewController.h */,
|
||||
D350F20C15A43BB100149E54 /* WizardViewController.m */,
|
||||
D38187E015FE348A00C3EDCA /* WizardViewController.xib */,
|
||||
D3D5126A160B3A8E00946DF8 /* WizardViews.xib */,
|
||||
);
|
||||
path = Classes;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1577,8 +1577,8 @@
|
|||
630589E11B4E810900EFAE36 /* ContactsTester.m */,
|
||||
630589E31B4E810900EFAE36 /* LinphoneTestCase.h */,
|
||||
630589E41B4E810900EFAE36 /* LinphoneTestCase.m */,
|
||||
630589E51B4E810900EFAE36 /* WizardTester.h */,
|
||||
630589E61B4E810900EFAE36 /* WizardTester.m */,
|
||||
630589E51B4E810900EFAE36 /* AssistantTester.h */,
|
||||
630589E61B4E810900EFAE36 /* AssistantTester.m */,
|
||||
);
|
||||
path = TestsUI;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1823,10 +1823,10 @@
|
|||
63AADBE01B6A0FF200AA16FD /* ringback.wav */,
|
||||
631348311B6FA53300C6BDCB /* rootca.pem */,
|
||||
63AADBE21B6A0FF200AA16FD /* shortring.caf */,
|
||||
63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */,
|
||||
63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */,
|
||||
63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */,
|
||||
63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */,
|
||||
63AADBE31B6A0FF200AA16FD /* assistant_external_sip.rc */,
|
||||
63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */,
|
||||
63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */,
|
||||
63AADBE61B6A0FF200AA16FD /* assistant_remote.rc */,
|
||||
);
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2253,7 +2253,7 @@
|
|||
631560361B69175F0047F4D3 /* color_C.png in Resources */,
|
||||
6315603F1B69175F0047F4D3 /* color_L.png in Resources */,
|
||||
634CED981B6630DB00D7A921 /* backspace_over.png in Resources */,
|
||||
63AADBFF1B6A0FF200AA16FD /* wizard_external_sip.rc in Resources */,
|
||||
63AADBFF1B6A0FF200AA16FD /* assistant_external_sip.rc in Resources */,
|
||||
634CEDF11B6630DB00D7A921 /* options_default.png in Resources */,
|
||||
634CEE141B6630DB00D7A921 /* status_disconnected_desktop.png in Resources */,
|
||||
634CEDD41B6630DB00D7A921 /* history_all_selected.png in Resources */,
|
||||
|
|
@ -2312,7 +2312,7 @@
|
|||
634CED9F1B6630DB00D7A921 /* call_quality_indicator_0.png in Resources */,
|
||||
634CED941B6630DB00D7A921 /* add_field_over.png in Resources */,
|
||||
634CED9E1B6630DB00D7A921 /* call_hangup.png in Resources */,
|
||||
63AADC011B6A0FF200AA16FD /* wizard_linphone_existing.rc in Resources */,
|
||||
63AADC011B6A0FF200AA16FD /* assistant_linphone_existing.rc in Resources */,
|
||||
631560341B69175F0047F4D3 /* color_A.png in Resources */,
|
||||
636316D41A1DEC650009B839 /* SettingsViewController.xib in Resources */,
|
||||
63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */,
|
||||
|
|
@ -2334,7 +2334,7 @@
|
|||
63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */,
|
||||
634CEDFF1B6630DB00D7A921 /* resizable_chat_bubble_incoming.png in Resources */,
|
||||
634CEDF21B6630DB00D7A921 /* options_selected.png in Resources */,
|
||||
D38187DD15FE348A00C3EDCA /* WizardViewController.xib in Resources */,
|
||||
D38187DD15FE348A00C3EDCA /* AssistantViewController.xib in Resources */,
|
||||
634CEDE61B6630DB00D7A921 /* numpad_2.png in Resources */,
|
||||
634CEDC21B6630DB00D7A921 /* contact_add.png in Resources */,
|
||||
634CEE111B6630DB00D7A921 /* status_busy_desktop.png in Resources */,
|
||||
|
|
@ -2365,7 +2365,7 @@
|
|||
634CEE171B6630DB00D7A921 /* voicemail.png in Resources */,
|
||||
634CEE151B6630DB00D7A921 /* status_disconnected_phone.png in Resources */,
|
||||
634CEDE91B6630DB00D7A921 /* numpad_5.png in Resources */,
|
||||
63AADC001B6A0FF200AA16FD /* wizard_linphone_create.rc in Resources */,
|
||||
63AADC001B6A0FF200AA16FD /* assistant_linphone_create.rc in Resources */,
|
||||
63AADBEE1B6A0FF200AA16FD /* corner-right-bottom.png in Resources */,
|
||||
634CEDE41B6630DB00D7A921 /* numpad_0.png in Resources */,
|
||||
D38187CD15FE346700C3EDCA /* HistoryDetailsViewController.xib in Resources */,
|
||||
|
|
@ -2377,7 +2377,7 @@
|
|||
634CEDC41B6630DB00D7A921 /* contacts_all_selected.png in Resources */,
|
||||
F0642EF119DAC891009DB336 /* MainStoryboard.storyboard in Resources */,
|
||||
634CEDBC1B6630DB00D7A921 /* chat_start_body_over.png in Resources */,
|
||||
63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */,
|
||||
63AADC021B6A0FF200AA16FD /* assistant_remote.rc in Resources */,
|
||||
634CEE121B6630DB00D7A921 /* status_busy_phone.png in Resources */,
|
||||
634CEDFB1B6630DB00D7A921 /* quit_default.png in Resources */,
|
||||
63158FAD1B468E0E00969917 /* ImageOptim.sh in Resources */,
|
||||
|
|
@ -2400,7 +2400,7 @@
|
|||
634CEDC51B6630DB00D7A921 /* contacts_sip_default.png in Resources */,
|
||||
D381881915FE3FCA00C3EDCA /* InCallViewController.xib in Resources */,
|
||||
634CEDFA1B6630DB00D7A921 /* pause_small_over_selected.png in Resources */,
|
||||
D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */,
|
||||
D3D5126C160B3A8E00946DF8 /* AssistantViews.xib in Resources */,
|
||||
634CEDA01B6630DB00D7A921 /* call_quality_indicator_1.png in Resources */,
|
||||
634CEDD01B6630DB00D7A921 /* footer_contacts.png in Resources */,
|
||||
634CEDE51B6630DB00D7A921 /* numpad_1.png in Resources */,
|
||||
|
|
@ -2595,7 +2595,7 @@
|
|||
D32460E6159D9AAD00BA7F3A /* UITransparentView.m in Sources */,
|
||||
D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */,
|
||||
D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */,
|
||||
D350F20E15A43BB100149E54 /* WizardViewController.m in Sources */,
|
||||
D350F20E15A43BB100149E54 /* AssistantViewController.m in Sources */,
|
||||
D3F795D615A582810077328B /* ChatRoomViewController.m in Sources */,
|
||||
D32B6E2915A5BC440033019F /* ChatRoomTableViewController.m in Sources */,
|
||||
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */,
|
||||
|
|
@ -2673,7 +2673,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
630589EA1B4E810900EFAE36 /* LinphoneTestCase.m in Sources */,
|
||||
630589EB1B4E810900EFAE36 /* WizardTester.m in Sources */,
|
||||
630589EB1B4E810900EFAE36 /* AssistantTester.m in Sources */,
|
||||
630589E71B4E810900EFAE36 /* ChatTester.m in Sources */,
|
||||
630589E81B4E810900EFAE36 /* ContactsTester.m in Sources */,
|
||||
);
|
||||
|
|
@ -2961,7 +2961,7 @@
|
|||
name = IncomingCallViewController.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
D38187E015FE348A00C3EDCA /* WizardViewController.xib */ = {
|
||||
D38187E015FE348A00C3EDCA /* AssistantViewController.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
F095482E1883F15500E8A69B /* Base */,
|
||||
|
|
@ -2969,7 +2969,7 @@
|
|||
F095485A1883F67B00E8A69B /* ru */,
|
||||
F0AF070F1A24BA770086C9C1 /* ar */,
|
||||
);
|
||||
name = WizardViewController.xib;
|
||||
name = AssistantViewController.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
D38187F315FE354000C3EDCA /* UIConferenceHeader.xib */ = {
|
||||
|
|
@ -3016,7 +3016,7 @@
|
|||
name = InCallViewController.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
D3D5126A160B3A8E00946DF8 /* WizardViews.xib */ = {
|
||||
D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
F09548301883F15500E8A69B /* Base */,
|
||||
|
|
@ -3024,7 +3024,7 @@
|
|||
F095485E1883F6EA00E8A69B /* ru */,
|
||||
F0AF07111A24BA770086C9C1 /* ar */,
|
||||
);
|
||||
name = WizardViews.xib;
|
||||
name = AssistantViews.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F088488D19FF8C41007FFCF3 /* UIContactCell.xib */ = {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue