mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-01 09:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

linphonerc: remove sharing_server_preference and use file_transfer_server_url to comply with liblinphone

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-16 10:54:24 +02:00
parent 29fff18d6d
commit ae4f983df3
10 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/ChatRoomViewController.m
View file

@ -157,7 +157,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[messageBackgroundImage setImage:[TUNinePatchCache imageOfSize:[messageBackgroundImage bounds].size
forNinePatchNamed:@"chat_message_background"]];
BOOL fileSharingEnabled = [LinphoneManager.instance lpConfigStringForKey:@"sharing_server_preference"].length > 0;
BOOL fileSharingEnabled = linphone_core_get_file_transfer_server([LinphoneManager getLc]) != NULL;
[pictureButton setEnabled:fileSharingEnabled];
}

6
Classes/LinphoneCoreSettingsStore.m
View file

@ -332,7 +332,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setCString:linphone_address_get_username(parsed) forKey:@"primary_username_preference"];
}
linphone_address_destroy(parsed);
[self setObject:[lm lpConfigStringForKey:@"sharing_server_preference"] forKey:@"sharing_server_preference"];
[self setCString:linphone_core_get_file_transfer_server(lc) forKey:@"file_transfer_server_url_preference"];
}
changedDict = [[NSMutableDictionary alloc] init];
@ -781,8 +781,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[lm lpConfigSetInt:[self integerForKey:@"advanced_account_preference"] forKey:@"advanced_account_preference"];
[[LinphoneManager instance] lpConfigSetString:[self stringForKey:@"sharing_server_preference"]
forKey:@"sharing_server_preference"];
linphone_core_set_file_transfer_server(lc,
[[self stringForKey:@"file_transfer_server_url_preference"] UTF8String]);
}
changedDict = [[NSMutableDictionary alloc] init];

12
Classes/LinphoneManager.m
View file

@ -531,9 +531,10 @@ exit_dbmigration:
}
/* File transfer migration */
if ([self lpConfigBoolForKey:@"file_transfer_migration_done"] == FALSE) {
NSString *newURL = @"https://www.linphone.org:444/lft.php";
LOGI(@"Migrating sharing server url from %@ to %@", [self lpConfigStringForKey:@"sharing_server_preference"], newURL);
[self lpConfigSetString:newURL forKey:@"sharing_server_preference"];
const char *newURL = "https://www.linphone.org:444/lft.php";
LOGI(@"Migrating sharing server url from %s to %s",
linphone_core_get_file_transfer_server([LinphoneManager getLc]), newURL);
linphone_core_set_file_transfer_server([LinphoneManager getLc], newURL);
[self lpConfigSetBool:TRUE forKey:@"file_transfer_migration_done"];
}
}
@ -1330,11 +1331,6 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL,
linphone_core_set_static_picture(theLinphoneCore, imagePath);
}
NSString *urlString = [self lpConfigStringForKey:@"sharing_server_preference"];
if (urlString) {
linphone_core_set_file_transfer_server(theLinphoneCore, [urlString UTF8String]);
}
/*DETECT cameras*/
frontCamId = backCamId = nil;
char **camlist = (char **)linphone_core_get_video_devices(theLinphoneCore);

2
Classes/WizardViewController.m
View file

@ -238,8 +238,6 @@ static UICompositeViewDescription *compositeDescription = nil;
LOGE(@"cannot set transport");
}
[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"file_transfer_migration_done"];
[[LinphoneManager instance] lpConfigSetString:@"" forKey:@"sharing_server_preference"];
[[LinphoneManager instance] lpConfigSetBool:FALSE forKey:@"ice_preference"];
[[LinphoneManager instance] lpConfigSetString:@"" forKey:@"stun_preference"];
linphone_core_set_stun_server(lc, NULL);

5
Resources/wizard_external_sip.rc
View file

@ -17,10 +17,10 @@
<section name="app">
<entry name="pushnotification_preference" overwrite="true">0</entry>
<entry name="sharing_server_preference" overwrite="true"></entry>
<entry name="ice_preference" overwrite="true">1</entry>
<entry name="stun_preference" overwrite="true">stun.linphone.org</entry>
<entry name="random_port_preference" overwrite="true">1</entry>
<entry name="file_transfer_migration_done" overwrite="true">1</entry>
</section>
<section name="net">
@ -34,4 +34,7 @@
<entry name="sip_tls_port" overwrite="true">-1</entry>
</section>
<section name="misc">
<entry name="file_transfer_server_url" overwrite="true"></entry>
</section>
</config>

5
Resources/wizard_linphone_create.rc
View file

@ -22,10 +22,10 @@
<section name="app">
<entry name="pushnotification_preference" overwrite="true">1</entry>
<entry name="sharing_server_preference" overwrite="true">https://www.linphone.org:444/lft.php</entry>
<entry name="ice_preference" overwrite="true">1</entry>
<entry name="stun_preference" overwrite="true">stun.linphone.org</entry>
<entry name="random_port_preference" overwrite="true">1</entry>
<entry name="file_transfer_migration_done" overwrite="true">1</entry>
</section>
<section name="net">
@ -39,4 +39,7 @@
<entry name="sip_tls_port" overwrite="true">-1</entry>
</section>
<section name="misc">
<entry name="file_transfer_server_url" overwrite="true">https://www.linphone.org:444/lft.php</entry>
</section>
</config>

6
Resources/wizard_linphone_existing.rc
View file

@ -22,10 +22,10 @@
<section name="app">
<entry name="pushnotification_preference" overwrite="true">1</entry>
<entry name="sharing_server_preference" overwrite="true">https://www.linphone.org:444/lft.php</entry>
<entry name="ice_preference" overwrite="true">1</entry>
<entry name="stun_preference" overwrite="true">stun.linphone.org</entry>
<entry name="random_port_preference" overwrite="true">1</entry>
<entry name="file_transfer_migration_done" overwrite="true">1</entry>
</section>
<section name="net">
@ -38,4 +38,8 @@
<entry name="sip_tcp_port" overwrite="true">-1</entry>
<entry name="sip_tls_port" overwrite="true">-1</entry>
</section>
<section name="misc">
<entry name="file_transfer_server_url" overwrite="true">https://www.linphone.org:444/lft.php</entry>
</section>
</config>

5
Resources/wizard_remote.rc
View file

@ -16,9 +16,12 @@
<section name="app">
<entry name="pushnotification_preference" overwrite="true">0</entry>
<entry name="sharing_server_preference" overwrite="true"></entry>
<entry name="ice_preference" overwrite="true"></entry>
<entry name="stun_preference" overwrite="true"></entry>
<entry name="file_transfer_migration_done" overwrite="true">1</entry>
</section>
<section name="misc">
<entry name="file_transfer_server_url" overwrite="true"></entry>
</section>
</config>

2
Settings/InAppSettings.bundle/Advanced.plist
View file

@ -176,7 +176,7 @@
<key>Title</key>
<string>Server URL</string>
<key>Key</key>
<string>sharing_server_preference</string>
<string>file_transfer_server_url_preference</string>
<key>IASKTextAlignment</key>
<string>IASKUITextAlignmentRight</string>
</dict>

4
linphone.xcodeproj/project.pbxproj
View file

@ -161,6 +161,8 @@
639CEB031A1DF4EB004DE38F /* UICompositeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB051A1DF4EB004DE38F /* UICompositeViewController.xib */; };
639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB081A1DF4F1004DE38F /* UIChatRoomCell.xib */; };
639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; };
63B6D1151BA9612B0074B4F5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B026F21AA710AF00FF49F7 /* libiconv.dylib */; };
63B6D1161BA961300074B4F5 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
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 */; };
@ -2025,6 +2027,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
63B6D1161BA961300074B4F5 /* libsqlite3.dylib in Frameworks */,
63B6D1151BA9612B0074B4F5 /* libiconv.dylib in Frameworks */,
635ED88B1B95A3B500404347 /* libxml2.dylib in Frameworks */,
63C5107C1B8DF3DF008A415A /* libbellesip.a in Frameworks */,
63C5107D1B8DF3DF008A415A /* liblinphonetester.a in Frameworks */,