From af3c8514ca12fc2dfe3b0682163feb45f95ae7d2 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] [sendLog] linphonerc updated for server transfert

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

diff --git a/res/raw-sw600dp/linphonerc_default b/res/raw-sw600dp/linphonerc_default
index ee2185fad..e05864072 100644
--- a/res/raw-sw600dp/linphonerc_default
+++ b/res/raw-sw600dp/linphonerc_default
@@ -18,3 +18,7 @@ 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/linphonerc_default b/res/raw/linphonerc_default
index 27dcac0ab..4b03491b1 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -12,10 +12,13 @@ keepalive_period=30000
 size=qvga
 
 [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/linphonerc_factory b/res/raw/linphonerc_factory
index acd8e2550..7c468dac1 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -39,4 +39,4 @@ ec_calibrator_cool_tones=1
 
 
 [misc]
-max_calls=10
\ No newline at end of file
+max_calls=10
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index aa7831edd..464dd6391 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -721,7 +721,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) {