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

Assistant: reset default account if assistant is aborted

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-12-07 14:15:51 +01:00
parent 0e61311a27
commit 4ddbbeb22b
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/AssistantView.h
View file

@ -29,6 +29,7 @@
UIView *nextView;
NSMutableArray *historyViews;
LinphoneProxyConfig *new_config;
LinphoneProxyConfig *previous_default_config;
}
@property(nonatomic, strong) IBOutlet TPKeyboardAvoidingScrollView *contentView;

14
Classes/AssistantView.m
View file

@ -99,17 +99,10 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
- (void)viewDidLoad {
[super viewDidLoad];
if (LinphoneManager.runningOnIpad) {
[LinphoneUtils adjustFontSize:_welcomeView mult:2.22f];
[LinphoneUtils adjustFontSize:_createAccountView mult:2.22f];
[LinphoneUtils adjustFontSize:_linphoneLoginView mult:2.22f];
[LinphoneUtils adjustFontSize:_loginView mult:2.22f];
[LinphoneUtils adjustFontSize:_createAccountActivationView mult:2.22f];
[LinphoneUtils adjustFontSize:_remoteProvisioningLoginView mult:2.22f];
// if we quit assistant without creating a new proxy config, just restore the previous one
if (!linphone_core_get_default_proxy_config([LinphoneManager getLc])) {
linphone_core_set_default_proxy_config([LinphoneManager getLc], previous_default_config);
}
}
@ -154,6 +147,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[self resetLiblinphone];
// we will set the new default proxy config in the assistant
previous_default_config = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
linphone_core_set_default_proxy_config([LinphoneManager getLc], NULL);
}