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

remove all references to application paths in linphonerc

Browse source
This commit is contained in:
Simon Morlat 2016-02-10 17:00:58 +01:00
parent 2ea62bb0c9
commit 5b850e7b23
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
res/raw-sw600dp/linphonerc_factory
View file

@ -1,3 +1,7 @@
#
#This file shall not contain path referencing package name, in order to be portable when app is renamed.
#Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
[net] [net]
mtu=1300 mtu=1300
@ -8,7 +12,6 @@ register_only_when_network_is_up=1
auto_net_state_mon=0 auto_net_state_mon=0
auto_answer_replacing_calls=1 auto_answer_replacing_calls=1
ping_with_options=0 ping_with_options=0
root_ca=/data/data/org.linphone/files/rootca.pem
[rtp] [rtp]
audio_rtp_port=7076 audio_rtp_port=7076
@ -22,11 +25,11 @@ disable_upnp=1
playback_dev_id= playback_dev_id=
ringer_dev_id= ringer_dev_id=
capture_dev_id= capture_dev_id=
remote_ring=/data/data/org.linphone/files/ringback.wav
local_ring=/data/data/org.linphone/files/oldphone_mono.wav
dtmf_player_amp=0.1 dtmf_player_amp=0.1
#remove this property for any application that is not Linphone public version itself
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 log_collection_upload_server_url=https://www.linphone.org:444/lft.php
user_certificates_path=/data/data/org.linphone/files

9
res/raw/linphonerc_factory
View file

@ -1,3 +1,7 @@
#
#This file shall not contain path referencing package name, in order to be portable when app is renamed.
#Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
[net] [net]
mtu=1300 mtu=1300
@ -11,7 +15,6 @@ register_only_when_network_is_up=1
auto_net_state_mon=0 auto_net_state_mon=0
auto_answer_replacing_calls=1 auto_answer_replacing_calls=1
ping_with_options=0 ping_with_options=0
root_ca=/data/data/org.linphone/files/rootca.pem
[rtp] [rtp]
audio_rtp_port=7076 audio_rtp_port=7076
@ -25,8 +28,6 @@ disable_upnp=1
playback_dev_id= playback_dev_id=
ringer_dev_id= ringer_dev_id=
capture_dev_id= capture_dev_id=
remote_ring=/data/data/org.linphone/files/ringback.wav
local_ring=/data/data/org.linphone/files/oldphone_mono.wav
dtmf_player_amp=0.1 dtmf_player_amp=0.1
#remove this property for any application that is not Linphone public version itself #remove this property for any application that is not Linphone public version itself
@ -36,4 +37,4 @@ 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 log_collection_upload_server_url=https://www.linphone.org:444/lft.php
user_certificates_path=/data/data/org.linphone/files

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

@ -170,6 +170,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mCallLogDatabaseFile = basePath + "/linphone-log-history.db"; mCallLogDatabaseFile = basePath + "/linphone-log-history.db";
mErrorToneFile = basePath + "/error.wav"; mErrorToneFile = basePath + "/error.wav";
mConfigFile = basePath + "/configrc"; mConfigFile = basePath + "/configrc";
mUserCertificatePath = basePath;
mPrefs = LinphonePreferences.instance(); mPrefs = LinphonePreferences.instance();
mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE)); mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE));
@ -194,6 +195,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
private final String mCallLogDatabaseFile; private final String mCallLogDatabaseFile;
private final String mErrorToneFile; private final String mErrorToneFile;
private final String mConfigFile; private final String mConfigFile;
private final String mUserCertificatePath;
private ByteArrayInputStream mUploadingImageStream; private ByteArrayInputStream mUploadingImageStream;
private Timer mTimer; private Timer mTimer;
@ -643,16 +645,18 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(e, "cannot get version name"); Log.e(e, "cannot get version name");
} }
mLc.setRing(mRingSoundFile);
if (mR.getBoolean(R.bool.use_linphonecore_ringing)) { if (mR.getBoolean(R.bool.use_linphonecore_ringing)) {
disableRinging(); disableRinging();
} else { } else {
mLc.setRing(null); mLc.setRing(null); //We'll use the android media player api to play the ringtone
} }
mLc.setRingback(mRingbackSoundFile);
mLc.setRootCA(mLinphoneRootCaFile); mLc.setRootCA(mLinphoneRootCaFile);
mLc.setPlayFile(mPauseSoundFile); mLc.setPlayFile(mPauseSoundFile);
mLc.setChatDatabasePath(mChatDatabaseFile); mLc.setChatDatabasePath(mChatDatabaseFile);
mLc.setCallLogsDatabasePath(mCallLogDatabaseFile); mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
mLc.setUserCertificatesPath(mUserCertificatePath);
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile); //mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
int availableCores = Runtime.getRuntime().availableProcessors(); int availableCores = Runtime.getRuntime().availableProcessors();

2
submodules/linphone

@ -1 +1 @@
Subproject commit b655775220a61b48e6721139bbd81215423bf179 Subproject commit 2c929a08c71950a0dab0ab1b97c574d575d3452f