Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
d3ab7712
Commit
d3ab7712
authored
Apr 26, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(assets): provide rc files for assistant
parent
3ff2508f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
109 additions
and
2 deletions
+109
-2
CMakeLists.txt
linphone-desktop/CMakeLists.txt
+13
-0
create-linphone-sip-account.rc
...e-desktop/assets/assistant/create-linphone-sip-account.rc
+29
-0
use-linphone-sip-account.rc
...hone-desktop/assets/assistant/use-linphone-sip-account.rc
+30
-0
use-other-sip-account.rc
linphone-desktop/assets/assistant/use-other-sip-account.rc
+26
-0
AssistantModel.cpp
linphone-desktop/src/components/assistant/AssistantModel.cpp
+5
-2
CreateLinphoneSipAccountWithEmail.qml
.../App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml
+2
-0
CreateLinphoneSipAccountWithPhoneNumber.qml
...ain/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml
+2
-0
UseLinphoneSipAccount.qml
...top/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml
+2
-0
No files found.
linphone-desktop/CMakeLists.txt
View file @
d3ab7712
...
...
@@ -281,3 +281,16 @@ install(TARGETS ${TARGET_NAME}
install
(
FILES
"
${
ASSETS_DIR
}
/linphonerc-factory"
DESTINATION
"
${
CMAKE_INSTALL_DATADIR
}
/linphone"
)
set
(
ASSETS_ASSISTANT_DIR
"
${
ASSETS_DIR
}
/assistant"
)
set
(
ASSISTANT_INSTALL_DATADIR
"
${
CMAKE_INSTALL_DATADIR
}
/assistant"
)
install
(
FILES
"
${
ASSETS_ASSISTANT_DIR
}
/use-other-sip-account.rc"
DESTINATION
"
${
ASSISTANT_INSTALL_DATADIR
}
/use-other-sip-account.rc"
)
install
(
FILES
"
${
ASSETS_ASSISTANT_DIR
}
/create-linphone-sip-account.rc"
DESTINATION
"
${
ASSISTANT_INSTALL_DATADIR
}
/create-linphone-sip-account.rc"
)
install
(
FILES
"
${
ASSETS_ASSISTANT_DIR
}
/use-linphone-sip-account.rc"
DESTINATION
"
${
ASSISTANT_INSTALL_DATADIR
}
/use-linphone-sip-account.rc"
)
linphone-desktop/assets/assistant/create-linphone-sip-account.rc
0 → 100644
View file @
d3ab7712
<?xml version="1.0" encoding="UTF-8"?>
<config
xmlns=
"http://www.linphone.org/xsds/lpconfig.xsd"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd"
>
<section
name=
"proxy_default_values"
>
<entry
name=
"avpf"
overwrite=
"true"
>
1
</entry>
<entry
name=
"dial_escape_plus"
overwrite=
"true"
>
0
</entry>
<entry
name=
"publish"
overwrite=
"true"
>
0
</entry>
<entry
name=
"quality_reporting_collector"
overwrite=
"true"
>
sip:voip-metrics@sip.linphone.org;transport=tls
</entry>
<entry
name=
"quality_reporting_enabled"
overwrite=
"true"
>
1
</entry>
<entry
name=
"quality_reporting_interval"
overwrite=
"true"
>
180
</entry>
<entry
name=
"reg_expires"
overwrite=
"true"
>
31536000
</entry>
<entry
name=
"reg_identity"
overwrite=
"true"
>
sip:?@sip.linphone.org
</entry>
<entry
name=
"reg_proxy"
overwrite=
"true"
>
<
sip:sip.linphone.org;transport=tls
>
</entry>
<entry
name=
"reg_sendregister"
overwrite=
"true"
>
1
</entry>
<entry
name=
"refkey"
overwrite=
"true"
>
push_notification
</entry>
<entry
name=
"realm"
overwrite=
"true"
>
sip.linphone.org
</entry>
</section>
<section
name=
"sip"
>
<entry
name=
"rls_uri"
overwrite=
"true"
>
sips:rls@sip.linphone.org
</entry>
</section>
<section
name=
"assistant"
>
<entry
name=
"domain"
overwrite=
"true"
>
sip.linphone.org
</entry>
<entry
name=
"password_max_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"password_min_length"
overwrite=
"true"
>
1
</entry>
<entry
name=
"username_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"username_max_length"
overwrite=
"true"
>
64
</entry>
<entry
name=
"username_min_length"
overwrite=
"true"
>
1
</entry>
<entry
name=
"username_regex"
overwrite=
"true"
>
^[a-z0-9+_.\-]*$
</entry>
</section>
</config>
linphone-desktop/assets/assistant/use-linphone-sip-account.rc
0 → 100644
View file @
d3ab7712
<?xml version="1.0" encoding="UTF-8"?>
<config
xmlns=
"http://www.linphone.org/xsds/lpconfig.xsd"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd"
>
<section
name=
"proxy_default_values"
>
<entry
name=
"avpf"
overwrite=
"true"
>
1
</entry>
<entry
name=
"dial_escape_plus"
overwrite=
"true"
>
0
</entry>
<entry
name=
"publish"
overwrite=
"true"
>
0
</entry>
<entry
name=
"quality_reporting_collector"
overwrite=
"true"
>
sip:voip-metrics@sip.linphone.org;transport=tls
</entry>
<entry
name=
"quality_reporting_enabled"
overwrite=
"true"
>
1
</entry>
<entry
name=
"quality_reporting_interval"
overwrite=
"true"
>
180
</entry>
<entry
name=
"reg_expires"
overwrite=
"true"
>
31536000
</entry>
<entry
name=
"reg_identity"
overwrite=
"true"
>
sip:?@sip.linphone.org
</entry>
<entry
name=
"reg_proxy"
overwrite=
"true"
>
<
sip:sip.linphone.org;transport=tls
>
</entry>
<entry
name=
"reg_sendregister"
overwrite=
"true"
>
1
</entry>
<entry
name=
"refkey"
overwrite=
"true"
>
push_notification
</entry>
<entry
name=
"realm"
overwrite=
"true"
>
sip.linphone.org
</entry>
</section>
<section
name=
"sip"
>
<entry
name=
"rls_uri"
overwrite=
"true"
>
sips:rls@sip.linphone.org
</entry>
</section>
<section
name=
"assistant"
>
<entry
name=
"domain"
overwrite=
"true"
>
sip.linphone.org
</entry>
<entry
name=
"password_max_length"
overwrite=
"true"
>
34
</entry>
<entry
name=
"password_min_length"
overwrite=
"true"
>
1
</entry>
<entry
name=
"username_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"username_max_length"
overwrite=
"true"
>
64
</entry>
<entry
name=
"username_min_length"
overwrite=
"true"
>
1
</entry>
<entry
name=
"username_regex"
overwrite=
"true"
>
^[a-z0-9+_.\-]*$
</entry>
<entry
name=
"xmlrpc_url"
overwrite=
"true"
>
https://subscribe.linphone.org:444/wizard.php
</entry>
</section>
</config>
linphone-desktop/assets/assistant/use-other-sip-account.rc
0 → 100644
View file @
d3ab7712
<?xml version="1.0" encoding="UTF-8"?>
<config
xmlns=
"http://www.linphone.org/xsds/lpconfig.xsd"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd"
>
<section
name=
"proxy_default_values"
>
<entry
name=
"dial_escape_plus"
overwrite=
"true"
>
0
</entry>
<entry
name=
"publish"
overwrite=
"true"
>
0
</entry>
<entry
name=
"reg_expires"
overwrite=
"true"
>
3600
</entry>
<entry
name=
"reg_identity"
overwrite=
"true"
></entry>
<entry
name=
"reg_proxy"
overwrite=
"true"
></entry>
<entry
name=
"reg_route"
overwrite=
"true"
></entry>
<entry
name=
"reg_sendregister"
overwrite=
"true"
>
1
</entry>
<entry
name=
"refkey"
overwrite=
"true"
></entry>
<entry
name=
"realm"
overwrite=
"true"
></entry>
</section>
<section
name=
"sip"
>
<entry
name=
"use_rls_presence"
overwrite=
"true"
></entry>
</section>
<section
name=
"assistant"
>
<entry
name=
"domain"
overwrite=
"true"
></entry>
<entry
name=
"password_max_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"password_min_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"username_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"username_max_length"
overwrite=
"true"
>
-1
</entry>
<entry
name=
"username_min_length"
overwrite=
"true"
>
1
</entry>
<entry
name=
"username_regex"
overwrite=
"true"
>
.*
</entry>
</section>
</config>
linphone-desktop/src/components/assistant/AssistantModel.cpp
View file @
d3ab7712
...
...
@@ -62,7 +62,9 @@ private:
const
string
&
)
override
{
if
(
status
==
linphone
::
AccountCreatorStatusAccountExist
||
status
==
linphone
::
AccountCreatorStatusAccountExistWithAlias
)
{
CoreManager
::
getInstance
()
->
getCore
()
->
addProxyConfig
(
creator
->
configure
());
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
Q_ASSERT
(
proxyConfig
!=
nullptr
);
emit
mAssistant
->
loginStatusChanged
(
""
);
}
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
...
...
@@ -96,7 +98,8 @@ private:
const
string
&
)
override
{
if
(
status
==
linphone
::
AccountCreatorStatusAccountActivated
)
{
CoreManager
::
getInstance
()
->
getAccountSettingsModel
()
->
addOrUpdateProxyConfig
(
creator
->
configure
());
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
Q_ASSERT
(
proxyConfig
!=
nullptr
);
emit
mAssistant
->
activateStatusChanged
(
""
);
}
else
{
...
...
linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml
View file @
d3ab7712
...
...
@@ -115,6 +115,8 @@ AssistantAbstractView {
AssistantModel
{
id
:
assistantModel
configFilename
:
'
create-linphone-sip-account.rc
'
onEmailChanged
:
emailError
=
error
onPasswordChanged
:
passwordError
=
error
onUsernameChanged
:
usernameError
=
error
...
...
linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml
View file @
d3ab7712
...
...
@@ -68,6 +68,8 @@ AssistantAbstractView {
AssistantModel
{
id
:
assistantModel
configFilename
:
'
create-linphone-sip-account.rc
'
onUsernameChanged
:
usernameError
=
error
onCreateStatusChanged
:
{
...
...
linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml
View file @
d3ab7712
...
...
@@ -58,6 +58,8 @@ AssistantAbstractView {
AssistantModel
{
id
:
assistantModel
configFilename
:
'
use-linphone-sip-account.rc
'
onPasswordChanged
:
{
if
(
checkBox
.
checked
)
{
loader
.
item
.
passwordError
=
error
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment