Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved file transfer server url handling

Browse source
This commit is contained in:
Sylvain Berfini 2016-04-29 10:31:02 +02:00
parent a3ad1105e2
commit d399aaeda6
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/raw-sw600dp/linphonerc_default
View file

@ -12,10 +12,13 @@ keepalive_period=30000
size=vga size=vga
[app] [app]
sharing_server=https://www.linphone.org:444/lft.php
tunnel=disabled tunnel=disabled
push_notification=1 push_notification=1
[tunnel] [tunnel]
host= host=
port=443 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

3
res/raw-sw600dp/linphonerc_factory
View file

@ -31,5 +31,4 @@ dtmf_player_amp=0.1
ec_calibrator_cool_tones=1 ec_calibrator_cool_tones=1
[misc] [misc]
max_calls=10 max_calls=10
log_collection_upload_server_url=https://www.linphone.org:444/lft.php

5
res/raw/linphonerc_default
View file

@ -12,7 +12,6 @@ keepalive_period=30000
size=qvga size=qvga
[app] [app]
sharing_server=https://www.linphone.org:444/lft.php
tunnel=disabled tunnel=disabled
push_notification=1 push_notification=1
auto_start=1 auto_start=1
@ -20,3 +19,7 @@ auto_start=1
[tunnel] [tunnel]
host= host=
port=443 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

4
res/raw/linphonerc_factory
View file

@ -31,6 +31,4 @@ dtmf_player_amp=0.1
ec_calibrator_cool_tones=1 ec_calibrator_cool_tones=1
[misc] [misc]
max_calls=10 max_calls=10
log_collection_upload_server_url=https://www.linphone.org:444/lft.php

1
src/org/linphone/LinphoneManager.java
View file

@ -690,7 +690,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
resetCameraFromPreferences(); resetCameraFromPreferences();
mLc.setFileTransferServer(LinphonePreferences.instance().getSharingPictureServerUrl());
} }
private void copyAssetsFromPackage() throws IOException { private void copyAssetsFromPackage() throws IOException {

4
src/org/linphone/LinphonePreferences.java
View file

@ -1039,11 +1039,11 @@ public class LinphonePreferences {
} }
public String getSharingPictureServerUrl() { public String getSharingPictureServerUrl() {
return getConfig().getString("app", "sharing_server", null); return getLc().getFileTransferServer();
} }
public void setSharingPictureServerUrl(String url) { public void setSharingPictureServerUrl(String url) {
getConfig().setString("app", "sharing_server", url); getLc().setFileTransferServer(url);
} }
public void setRemoteProvisioningUrl(String url) { public void setRemoteProvisioningUrl(String url) {