From d399aaeda6bbfbc5fb5c113558c6db1980fd1a5d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Apr 2016 10:31:02 +0200
Subject: [PATCH] Improved file transfer server url handling

---
 res/raw-sw600dp/linphonerc_default        | 5 ++++-
 res/raw-sw600dp/linphonerc_factory        | 3 +--
 res/raw/linphonerc_default                | 5 ++++-
 res/raw/linphonerc_factory                | 4 +---
 src/org/linphone/LinphoneManager.java     | 1 -
 src/org/linphone/LinphonePreferences.java | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/res/raw-sw600dp/linphonerc_default b/res/raw-sw600dp/linphonerc_default
index 8ee2fbaba..e05864072 100644
--- a/res/raw-sw600dp/linphonerc_default
+++ b/res/raw-sw600dp/linphonerc_default
@@ -12,10 +12,13 @@ keepalive_period=30000
 size=vga
 
 [app]
-sharing_server=https://www.linphone.org:444/lft.php
 tunnel=disabled
 push_notification=1
 
 [tunnel]
 host=
 port=443
+
+[misc]
+log_collection_upload_server_url=https://www.linphone.org:444/lft.php
+file_transfer_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
diff --git a/res/raw-sw600dp/linphonerc_factory b/res/raw-sw600dp/linphonerc_factory
index a1314bcce..adf12c2f5 100644
--- a/res/raw-sw600dp/linphonerc_factory
+++ b/res/raw-sw600dp/linphonerc_factory
@@ -31,5 +31,4 @@ dtmf_player_amp=0.1
 ec_calibrator_cool_tones=1
 
 [misc]
-max_calls=10
-log_collection_upload_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
+max_calls=10
\ No newline at end of file
diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default
index 2238536a3..490709b92 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -12,7 +12,6 @@ keepalive_period=30000
 size=qvga
 
 [app]
-sharing_server=https://www.linphone.org:444/lft.php
 tunnel=disabled
 push_notification=1
 auto_start=1
@@ -20,3 +19,7 @@ auto_start=1
 [tunnel]
 host=
 port=443
+
+[misc]
+log_collection_upload_server_url=https://www.linphone.org:444/lft.php
+file_transfer_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 2a919c8d6..e13273368 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -31,6 +31,4 @@ dtmf_player_amp=0.1
 ec_calibrator_cool_tones=1
 
 [misc]
-max_calls=10
-log_collection_upload_server_url=https://www.linphone.org:444/lft.php
-
+max_calls=10
\ No newline at end of file
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e5427e20f..f4b0ddb17 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -690,7 +690,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		}
 
 		resetCameraFromPreferences();
-		mLc.setFileTransferServer(LinphonePreferences.instance().getSharingPictureServerUrl());
 	}
 
 	private void copyAssetsFromPackage() throws IOException {
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 041e43078..c5ef97bf3 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1039,11 +1039,11 @@ public class LinphonePreferences {
 	}
 
 	public String getSharingPictureServerUrl() {
-		return getConfig().getString("app", "sharing_server", null);
+		return getLc().getFileTransferServer();
 	}
 
 	public void setSharingPictureServerUrl(String url) {
-		getConfig().setString("app", "sharing_server", url);
+		getLc().setFileTransferServer(url);
 	}
 
 	public void setRemoteProvisioningUrl(String url) {