diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index f41082c70..2f93b6eb9 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -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]; } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 58691872a..f6ad3fe02 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -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]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 813283f4d..cba11771f 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -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); diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 85649fc90..9dab1d411 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -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); diff --git a/Resources/wizard_external_sip.rc b/Resources/wizard_external_sip.rc index f427f2758..84be19c86 100644 --- a/Resources/wizard_external_sip.rc +++ b/Resources/wizard_external_sip.rc @@ -17,10 +17,10 @@
0 - 1 stun.linphone.org 1 + 1
@@ -34,4 +34,7 @@ -1
+
+ +
\ No newline at end of file diff --git a/Resources/wizard_linphone_create.rc b/Resources/wizard_linphone_create.rc index 6da5025a0..ee15a41e5 100644 --- a/Resources/wizard_linphone_create.rc +++ b/Resources/wizard_linphone_create.rc @@ -22,10 +22,10 @@
1 - https://www.linphone.org:444/lft.php 1 stun.linphone.org 1 + 1
@@ -39,4 +39,7 @@ -1
+
+ https://www.linphone.org:444/lft.php +
diff --git a/Resources/wizard_linphone_existing.rc b/Resources/wizard_linphone_existing.rc index b9ef41f36..7977a0d9f 100644 --- a/Resources/wizard_linphone_existing.rc +++ b/Resources/wizard_linphone_existing.rc @@ -22,10 +22,10 @@
1 - https://www.linphone.org:444/lft.php 1 stun.linphone.org 1 + 1
@@ -38,4 +38,8 @@ -1 -1
+ +
+ https://www.linphone.org:444/lft.php +
diff --git a/Resources/wizard_remote.rc b/Resources/wizard_remote.rc index 3df265ada..534e2acff 100644 --- a/Resources/wizard_remote.rc +++ b/Resources/wizard_remote.rc @@ -16,9 +16,12 @@
0 - + 1
+
+ +
\ No newline at end of file diff --git a/Settings/InAppSettings.bundle/Advanced.plist b/Settings/InAppSettings.bundle/Advanced.plist index ca86b640e..cb07abc0d 100644 --- a/Settings/InAppSettings.bundle/Advanced.plist +++ b/Settings/InAppSettings.bundle/Advanced.plist @@ -176,7 +176,7 @@ Title Server URL Key - sharing_server_preference + file_transfer_server_url_preference IASKTextAlignment IASKUITextAlignmentRight diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index fe1fad7d8..ee679de1a 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -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 */,