From e86f31362c0f8b290307ba4a5a9d66e1e4d60538 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Fri, 22 Apr 2016 10:56:12 +0200 Subject: [PATCH] String values updated + linphonere_factory tablet --- res/raw-sw600dp/linphonerc_factory | 253 ++------------------------ res/values-fr/strings.xml | 6 +- res/values/strings.xml | 10 +- src/org/linphone/LinphoneManager.java | 2 +- 4 files changed, 26 insertions(+), 245 deletions(-) diff --git a/res/raw-sw600dp/linphonerc_factory b/res/raw-sw600dp/linphonerc_factory index cd250fde4..06ffbdb91 100644 --- a/res/raw-sw600dp/linphonerc_factory +++ b/res/raw-sw600dp/linphonerc_factory @@ -1,57 +1,24 @@ +# +#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] -download_bw=380 -upload_bw=380 mtu=1300 -firewall_policy=ice -stun_server=85.233.205.218 + +[app] +animations=0 +show_login_view=1 +debug_popup_magic=#1234 +debug=1 +server_url=http://85.233.205.218:443/xmlrpc [sip] -contact="Linphone Android" -use_info=0 -use_ipv6=0 -keepalive_period=30000 guess_hostname=1 inc_timeout=15 register_only_when_network_is_up=1 auto_net_state_mon=0 auto_answer_replacing_calls=1 ping_with_options=0 -root_ca=/data/user/0/org.linphone/files/rootca.pem -verify_server_certs=1 -verify_server_cn=1 -media_encryption=zrtp -multi_transport_migration_done=1 -in_call_timeout=0 -delayed_timeout=4 -register_only_when_upnp_is_ok=1 -media_encryption_mandatory=1 -sip_port=-1 -sip_tcp_port=-1 -sip_tls_port=-1 -srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80 -default_proxy=0 -rls_uri=sip:rls@sip.example.org -use_rls_presence=1 - -[video] -size=qvga -device=Android1 -display=1 -capture=1 - -[app] -sharing_server=https://www.linphone.org:444/lft.php -tunnel=disabled -push_notification=1 -animations=0 -show_login_view=1 -debug_popup_magic=#1234 -debug=1 -server_url=http://85.233.205.218:443/xmlrpc -first_launch=0 - -[tunnel] -port=443 [rtp] audio_rtp_port=7076 @@ -60,202 +27,16 @@ audio_jitt_comp=60 video_jitt_comp=60 nortp_timeout=30 disable_upnp=1 -text_rtp_port=11078 -audio_adaptive_jitt_comp_enabled=1 -video_adaptive_jitt_comp_enabled=1 [sound] +playback_dev_id= +ringer_dev_id= +capture_dev_id= dtmf_player_amp=0.1 -ec_calibrator_cool_tones=1 -local_ring=/data/user/0/org.linphone/files/oldphone_mono.wav -remote_ring=/data/user/0/org.linphone/files/ringback.wav -playback_gain_db=0.000000 -mic_gain_db=0.000000 + #remove this property for any application that is not Linphone public version itself +ec_calibrator_cool_tones=1 [misc] max_calls=10 -log_collection_upload_server_url=https://www.linphone.org:444/lft.php -uuid=3ac65678-272f-47d9-8aff-19950c565687 -friends_migration_done=1 -user_certificates_path=/data/user/0/org.linphone/files -file_transfer_server_url=https://www.linphone.org:444/lft.php -config-uri=https://85.233.205.218/xmlrpc?username=sylvain&password=cotcot&domain=sip.orangecyberdefense.com - -[audio_codec_0] -mime=opus -rate=48000 -channels=2 -enabled=1 - -[audio_codec_1] -mime=SILK -rate=16000 -channels=1 -enabled=1 - -[audio_codec_2] -mime=speex -rate=16000 -channels=1 -enabled=1 - -[audio_codec_3] -mime=speex -rate=8000 -channels=1 -enabled=1 - -[audio_codec_4] -mime=PCMU -rate=8000 -channels=1 -enabled=1 - -[audio_codec_5] -mime=PCMA -rate=8000 -channels=1 -enabled=1 - -[audio_codec_6] -mime=GSM -rate=8000 -channels=1 -enabled=0 - -[audio_codec_7] -mime=G722 -rate=8000 -channels=1 -enabled=0 - -[audio_codec_8] -mime=iLBC -rate=8000 -channels=1 -enabled=0 - -[audio_codec_9] -mime=mpeg4-generic -rate=16000 -channels=1 -enabled=0 - -[audio_codec_10] -mime=mpeg4-generic -rate=22050 -channels=1 -enabled=0 - -[audio_codec_11] -mime=mpeg4-generic -rate=32000 -channels=1 -enabled=0 - -[audio_codec_12] -mime=mpeg4-generic -rate=44100 -channels=1 -enabled=0 - -[audio_codec_13] -mime=mpeg4-generic -rate=48000 -channels=1 -enabled=0 - -[audio_codec_14] -mime=iSAC -rate=16000 -channels=1 -enabled=0 - -[audio_codec_15] -mime=speex -rate=32000 -channels=1 -enabled=0 - -[audio_codec_16] -mime=SILK -rate=8000 -channels=1 -enabled=0 - -[audio_codec_17] -mime=SILK -rate=12000 -channels=1 -enabled=0 - -[audio_codec_18] -mime=SILK -rate=24000 -channels=1 -enabled=0 - -[audio_codec_19] -mime=L16 -rate=44100 -channels=2 -enabled=0 - -[audio_codec_20] -mime=L16 -rate=44100 -channels=1 -enabled=0 - -[video_codec_0] -mime=VP8 -rate=90000 -enabled=1 - -[video_codec_1] -mime=H264 -rate=90000 -enabled=1 -recv_fmtp=profile-level-id=42801F - - -[friend_0] -url="Jean Dupont" - -[friend_1] -url="Margaux Clerc" - -[friend_2] -url="Jehan Monnier" - -[friend_3] -url="Marielle Rellier" - -[friend_4] -url="Simon Morlat" - -[friend_5] -url="François Grisez" - -[proxy_0] -reg_proxy= -reg_route= -reg_identity=sip:sylvain@sip.linphone.org -quality_reporting_enabled=0 -quality_reporting_interval=0 -reg_expires=3600 -reg_sendregister=1 -publish=1 -avpf=-1 -avpf_rr_interval=5 -dial_escape_plus=0 -privacy=32768 -refkey=push_notification -publish_expires=600 - -[auth_info_0] -username=sylvain -passwd=lucifer -realm=sip.linphone.org -domain=sip.linphone.org \ No newline at end of file +log_collection_upload_server_url=https://www.linphone.org:444/lft.php \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index b64e5e6b1..b316608f6 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -8,10 +8,10 @@ Rechercher un contact - Orange Secure Phone - Orange Secure Phone Service + Mobile Security Intense + Mobile Security Intense Linphone - Orange Secure Phone + Mobile Security Intense Démarrage %s enregistré %s n\'a pas pu s\'enregistrer diff --git a/res/values/strings.xml b/res/values/strings.xml index 5a1324090..130cf6a77 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,15 +1,15 @@ - Orange Secure Phone - Orange Secure Phone Service + Mobile Security Intense + Mobile Security Intense Service Linphone - Orange Secure Phone + Mobile Security Intense Starting up Registered to %s Fails to register to %s - Orange Secure Phone Version %s - Orange Secure Phone Core %s + Mobile Security Intense Version %s + Mobile Security Intense Core %s GNU General Public License V2\n © 2010-2016 Belledonne Communications www.linphone.org diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 51fd04985..de57faa1b 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -866,7 +866,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { for(AvatarWithPresenceImage listener : listeners){ if(listener.isThisFriend(lf)){ - Log.e("===>> LinphoneManager : notifyPresenceReceived : "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType()); + //Log.e("===>> LinphoneManager : notifyPresenceReceived : "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType()); listener.updatePresenceIcon(lc, lf); } }