mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-02-07 14:58:24 +00:00
1b207c8dc1
Conflicts: AndroidManifest.xml res/drawable-xhdpi/topbar_avatar.png res/drawable/assistant_button.xml res/layout-land/call.xml res/layout-land/call_incoming.xml res/layout-land/call_outgoing.xml res/layout-land/chatlist_cell.xml res/layout-land/main.xml res/layout/about.xml res/layout/assistant_account_creation.xml res/layout/assistant_linphone_login.xml res/layout/assistant_remote_provisioning_login.xml res/layout/assistant_topbar.xml res/layout/call.xml res/layout/call_incoming.xml res/layout/call_outgoing.xml res/layout/chat.xml res/layout/chatlist.xml res/layout/chatlist_cell.xml res/layout/conference_paused_row.xml res/layout/contact.xml res/layout/contact_edit.xml res/layout/contacts_list.xml res/layout/dialog.xml res/layout/edit_list.xml res/layout/history.xml res/layout/history_detail.xml res/layout/main.xml res/layout/side_menu_account_cell.xml res/mipmap-hdpi/ic_launcher.png res/mipmap-mdpi/ic_launcher.png res/mipmap-xhdpi/ic_launcher.png res/mipmap-xxhdpi/ic_launcher.png res/mipmap-xxxhdpi/ic_launcher.png res/values-ar/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-fr/custom.xml res/values-fr/strings.xml res/values-he/strings.xml res/values-ja/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-tr/strings.xml res/values/custom.xml res/values/non_localizable_custom.xml res/values/strings.xml res/values/styles.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ChatListFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/ContactsListFragment.java src/org/linphone/HistoryDetailFragment.java src/org/linphone/HistoryListFragment.java src/org/linphone/LinphoneActivity.java src/org/linphone/LinphoneManager.java src/org/linphone/LinphoneService.java src/org/linphone/assistant/RemoteProvisioningActivity.java
44 lines
865 B
Text
44 lines
865 B
Text
|
|
#
|
|
#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]
|
|
mtu=1300
|
|
|
|
[app]
|
|
animations=0
|
|
show_login_view=1
|
|
debug_popup_magic=#1234
|
|
debug=1
|
|
server_url=http://85.233.205.218:443/xmlrpc
|
|
|
|
[sip]
|
|
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
|
|
|
|
[rtp]
|
|
audio_rtp_port=7076
|
|
video_rtp_port=9078
|
|
audio_jitt_comp=60
|
|
video_jitt_comp=60
|
|
nortp_timeout=30
|
|
disable_upnp=1
|
|
|
|
[sound]
|
|
playback_dev_id=
|
|
ringer_dev_id=
|
|
capture_dev_id=
|
|
dtmf_player_amp=0.1
|
|
|
|
#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
|
|
|