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

fix bug with expire field that was ALWAYS set to 600 regardless of user's preferences, preventing push notifications to work.

Browse source 
update exosip for TCP reset transport fix.
This commit is contained in:
Simon Morlat 2012-09-03 22:56:10 +02:00
parent 667280868a
commit 9215dde5d9
4 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Classes/LinphoneCoreSettingsStore.m
View file

@ -102,7 +102,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setString: linphone_address_get_username(addr) forKey:@"username_preference"];
[self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"];
[self setInteger: linphone_proxy_config_get_expires(cfg) forKey:@"expire_preference"];
[self setInteger: lp_config_get_int(linphone_core_get_config(lc),"app","default_expires",3600) forKey:@"expire_preference"];
[self setString:linphone_proxy_config_get_dial_prefix(cfg) forKey:@"prefix_preference"];
if (strcmp(linphone_address_get_domain(addr),linphone_address_get_domain(proxy_addr))!=0
|| port!=NULL){
@ -352,19 +352,17 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
linphone_proxy_config_set_identity(proxyCfg,identity);
linphone_proxy_config_set_server_addr(proxyCfg,proxy);
linphone_proxy_config_enable_register(proxyCfg,true);
int expire = [self integerForKey:@"expire_preference"];
lp_config_set_int(linphone_core_get_config(lc),"app","default_expires",expire);
BOOL isWifiOnly = [self boolForKey:@"wifi_only_preference"];
if (isWifiOnly && lLinphoneMgr.connectivity == wwan) {
linphone_proxy_config_expires(proxyCfg, 0);
} else {
if ([self objectForKey:@"expire_preference"]) {
int expire = [self integerForKey:@"expire_preference"];
/*if(expire < lLinphoneMgr.defaultExpires)
expire = lLinphoneMgr.defaultExpires;*/
linphone_proxy_config_expires(proxyCfg, expire);
}
//else not set
linphone_proxy_config_expires(proxyCfg,expire);
}
if (isOutboundProxy)

1
Classes/LinphoneManager.h
View file

@ -126,7 +126,6 @@ typedef struct _LinphoneManagerSounds {
@property (nonatomic, retain) id<IASKSettingsStore> settingsStore;
@property (readonly) FastAddressBook* fastAddressBook;
@property Connectivity connectivity;
@property (nonatomic) int defaultExpires;
@property (readonly) const char* frontCamId;
@property (readonly) const char* backCamId;
@property (readonly) sqlite3* database;

4
Classes/LinphoneManager.m
View file

@ -73,7 +73,6 @@ extern void libmsbcg729_init();
@synthesize connectivity;
@synthesize frontCamId;
@synthesize backCamId;
@synthesize defaultExpires;
@synthesize settingsStore;
@synthesize database;
@synthesize fastAddressBook;
@ -203,7 +202,6 @@ struct codec_name_pref_table codec_pref_table[]={
logs = [[NSMutableArray alloc] init];
database = NULL;
settingsStore = nil;
self.defaultExpires = 600;
[self openDatabase];
[self copyDefaultSettings];
lastRemoteNotificationTime=0;
@ -506,7 +504,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
&& (lLinphoneMgr.connectivity == newConnectivity || lLinphoneMgr.connectivity == none)) {
linphone_proxy_config_expires(proxy, 0);
} else if (proxy){
linphone_proxy_config_expires(proxy, lLinphoneMgr.defaultExpires); //might be better to save the previous value
linphone_proxy_config_expires(proxy, lp_config_get_int(linphone_core_get_config([LinphoneManager getLc]),"app","default_expires",3600));
}
if (lLinphoneMgr.connectivity != newConnectivity) {

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit b62c4167702f5333686754f55a2da81705e170ba
Subproject commit cabb39c79560ab11c3dc668ce9d5fee8ea19e832