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

Allow to clear the proxy config with a button in the settings.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2015-02-20 11:27:53 +01:00
parent d902a4e70a
commit 0fa635dc68
9 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/FirstLoginViewController.m
View file

@ -190,7 +190,7 @@ static UICompositeViewDescription *compositeDescription = nil;
,linphone_proxy_config_get_domain(proxyCfg));
linphone_core_add_auth_info([LinphoneManager getLc], auth_info);
linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
linphone_core_set_default_proxy([LinphoneManager getLc], proxyCfg);
linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
[self.waitView setHidden:false];
};
}

2
Classes/LinphoneCoreSettingsStore.m
View file

@ -438,7 +438,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
} else {
// was a new proxy config, add it
linphone_core_add_proxy_config(lc, proxyCfg);
linphone_core_set_default_proxy(lc,proxyCfg);
linphone_core_set_default_proxy_config(lc,proxyCfg);
}
bad_proxy:

29
Classes/SettingsViewController.m
View file

@ -32,6 +32,8 @@
#import "IASKTextField.h"
#include "linphone/lpconfig.h"
#import "DTAlertView.h"
#ifdef DEBUG
@interface UIDevice (debug)
@ -686,6 +688,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)settingsViewController:(IASKAppSettingsViewController*)sender buttonTappedForSpecifier:(IASKSpecifier*)specifier {
NSString *key = [specifier.specifierDict objectForKey:kIASKKey];
LinphoneCore* lc = [LinphoneManager getLc];
#ifdef DEBUG
if([key isEqual:@"release_button"]) {
[UIApplication sharedApplication].keyWindow.rootViewController = nil;
@ -701,9 +704,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
#endif
if([key isEqual:@"wizard_button"]) {
LinphoneProxyConfig* proxy = NULL;
linphone_core_get_default_proxy([LinphoneManager getLc], &proxy);
if (proxy == NULL ) {
if (linphone_core_get_default_proxy_config(lc) == NULL ) {
[self goToWizard];
return;
}
@ -714,12 +715,30 @@ static UICompositeViewDescription *compositeDescription = nil;
otherButtonTitles:NSLocalizedString(@"Launch Wizard",nil), nil];
[alert show];
[alert release];
} else if([key isEqual:@"about_button"]) {
} else if ( [key isEqual:@"clear_proxy_button"] ) {
if ( linphone_core_get_default_proxy_config(lc) == NULL ) {
return;
}
DTAlertView* alert = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"Warning", nil) message:NSLocalizedString(@"Are you sure to want to clear your proxy setup?",nil)];
[alert addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil) block:nil];
[alert addButtonWithTitle:NSLocalizedString(@"Yes", nil)
block:^{
linphone_core_clear_proxy_config(lc);
linphone_core_clear_all_auth_info(lc);
[settingsStore transformLinphoneCoreToKeys];
[settingsController.tableView reloadData];
}];
[alert show];
[alert release];
} else if([key isEqual:@"about_button"]) {
[[PhoneMainView instance] changeCurrentView:[AboutViewController compositeViewDescription] push:TRUE];
} else if ([key isEqualToString:@"reset_logs_button"]) {
linphone_core_reset_log_collection();
} else if ([key isEqual:@"send_logs_button"]) {
char * filepath = linphone_core_compress_log_collection([LinphoneManager getLc]);
char * filepath = linphone_core_compress_log_collection(lc);
if (filepath == NULL) {
[LinphoneLogger log:LinphoneLoggerError format:@"Cannot sent logs: file is NULL"];
return;

2
Classes/WizardViewController.m
View file

@ -514,7 +514,7 @@ static UICompositeViewDescription *compositeDescription = nil;
linphone_proxy_config_enable_register(proxyCfg, true);
linphone_core_add_auth_info([LinphoneManager getLc], info);
linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
linphone_core_set_default_proxy([LinphoneManager getLc], proxyCfg);
linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
}
- (NSString*)identityFromUsername:(NSString*)username {

8
Settings/InAppSettings.bundle/Root.plist
View file

@ -18,6 +18,14 @@
<key>Type</key>
<string>IASKButtonSpecifier</string>
</dict>
<dict>
<key>Key</key>
<string>clear_proxy_button</string>
<key>Title</key>
<string>Clear Account</string>
<key>Type</key>
<string>IASKButtonSpecifier</string>
</dict>
<dict>
<key>AutocapitalizationType</key>
<string>None</string>

3
Settings/InAppSettings.bundle/ar.lproj/Root.strings
View file

@ -60,3 +60,6 @@
/* More options */
"More options" = "الخيارات الأخرى";
/* Clear Account */
"Clear Account" = "Clear Account";

3
Settings/InAppSettings.bundle/en.lproj/Root.strings
View file

@ -60,3 +60,6 @@
/* More options */
"More options" = "More options";
/* Clear Account */
"Clear Account" = "Clear Account";

3
Settings/InAppSettings.bundle/fr.lproj/Root.strings
View file

@ -60,3 +60,6 @@
/* More options */
"More options" = "Plus d'options";
/* Clear Account */
"Clear Account" = "Effacer le compte";

3
Settings/InAppSettings.bundle/ru.lproj/Root.strings
View file

@ -60,3 +60,6 @@
/* More options */
"More options" = "Дополнительный счет";
/* Clear Account */
"Clear Account" = "Clear Account";