mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update liblinphone to fix 488 crashes

Browse source
This commit is contained in:
Jehan Monnier 2013-11-06 17:44:40 +01:00
parent 43602710a2
commit 696643b92b
6 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Classes/FirstLoginViewController.m
View file

@ -186,7 +186,8 @@ static UICompositeViewDescription *compositeDescription = nil;
,[usernameField.text UTF8String]
,[passwordField.text UTF8String]
,NULL
,NULL);
,NULL
,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);

20
Classes/LinphoneCoreSettingsStore.m
View file

@ -383,20 +383,22 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
const char* identity = linphone_address_as_string_uri_only(linphoneAddress);
const char* password = [accountPassword cStringUsingEncoding:[NSString defaultCStringEncoding]];
// add username password
LinphoneAddress *from = linphone_address_new(identity);
LinphoneAuthInfo *info;
if (from != 0){
info=linphone_auth_info_new(linphone_address_get_username(from),NULL,password,NULL,NULL);
linphone_core_add_auth_info(lc,info);
linphone_address_destroy(from);
}
// configure proxy entries
linphone_proxy_config_set_identity(proxyCfg, identity);
linphone_proxy_config_set_server_addr(proxyCfg, proxy);
linphone_proxy_config_enable_register(proxyCfg, true);
// add username password
LinphoneAddress *from = linphone_address_new(identity);
LinphoneAuthInfo *info;
if (from != 0){
info=linphone_auth_info_new(linphone_address_get_username(from),NULL,password,NULL,NULL,linphone_proxy_config_get_domain(proxyCfg));
linphone_core_add_auth_info(lc,info);
linphone_address_destroy(from);
}
int expire = [self integerForKey:@"expire_preference"];
linphone_proxy_config_expires(proxyCfg,expire);

9
Classes/WizardViewController.m
View file

@ -395,10 +395,15 @@ static UICompositeViewDescription *compositeDescription = nil;
linphone_address_set_username(linphoneAddress, normalizedUserName);
linphone_address_set_domain(linphoneAddress, [domain UTF8String]);
const char* identity = linphone_address_as_string_uri_only(linphoneAddress);
LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String], NULL, [password UTF8String], NULL, NULL);
linphone_proxy_config_set_identity(proxyCfg, identity);
linphone_proxy_config_set_server_addr(proxyCfg, [server UTF8String]);
if([server compare:domain options:NSCaseInsensitiveSearch] != NSOrderedSame) {
LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String]
, NULL, [password UTF8String]
, NULL
, NULL
,linphone_proxy_config_get_domain(proxyCfg));
if([server compare:domain options:NSCaseInsensitiveSearch] != NSOrderedSame) {
linphone_proxy_config_set_route(proxyCfg, [server UTF8String]);
}
int defaultExpire = [[LinphoneManager instance] lpConfigIntForKey:@"default_expires"];

25
linphone.xcodeproj/project.pbxproj
View file

@ -4114,6 +4114,11 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = Z2V957B3D6;
};
};
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */;
compatibilityVersion = "Xcode 3.2";
@ -5770,6 +5775,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "";
@ -5801,6 +5808,7 @@
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -5835,6 +5843,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_ENTITLEMENTS = "";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "";
@ -5866,6 +5876,7 @@
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -5889,7 +5900,7 @@
DEBUG,
);
HEADER_SEARCH_PATHS = (
liblinphone-sdk/apple-darwin/include,
"liblinphone-sdk/apple-darwin/include",
Classes/Utils/NinePatch/,
Classes/Utils/XMLRPC/,
);
@ -5924,7 +5935,7 @@
VIDEO_ENABLED,
);
HEADER_SEARCH_PATHS = (
liblinphone-sdk/apple-darwin/include,
"liblinphone-sdk/apple-darwin/include",
Classes/Utils/NinePatch/,
Classes/Utils/XMLRPC/,
);
@ -5960,7 +5971,7 @@
VIDEO_ENABLED,
);
HEADER_SEARCH_PATHS = (
liblinphone-sdk/apple-darwin/include,
"liblinphone-sdk/apple-darwin/include",
Classes/Utils/NinePatch/,
Classes/Utils/XMLRPC/,
);
@ -5996,7 +6007,7 @@
VIDEO_ENABLED,
);
HEADER_SEARCH_PATHS = (
liblinphone-sdk/apple-darwin/include,
"liblinphone-sdk/apple-darwin/include",
Classes/Utils/NinePatch/,
Classes/Utils/XMLRPC/,
);
@ -6042,6 +6053,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "";
@ -6072,6 +6085,7 @@
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -6106,6 +6120,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_ENTITLEMENTS = "";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "";
@ -6136,6 +6152,7 @@
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit a3227d796655fd64a19964a5d2da5e2ac9371b16
Subproject commit d2c44ec40ad53d611aac0da063e35bee27e4e71e

2
submodules/linphone

@ -1 +1 @@
Subproject commit 23bca78eef25e0bb2fdd54b9525451f837dba412
Subproject commit 8199ed773c7333d9b6edfa98f004126a81655fb6