Merge lp://staging/~phablet-team/telephony-service/voip_support into lp://staging/telephony-service/staging

Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://staging/~phablet-team/telephony-service/voip_support
Merge into: lp://staging/telephony-service/staging
Diff against target: 1841 lines (+1133/-79) (has conflicts)
32 files modified
CMakeLists.txt (+4/-2)
handler/CMakeLists.txt (+8/-0)
handler/Handler.xml (+21/-0)
handler/TelephonyServiceHandler.client (+9/-0)
handler/callagent.cpp (+118/-0)
handler/callagent.h (+52/-0)
handler/callhandler.cpp (+164/-27)
handler/callhandler.h (+8/-1)
handler/farstreamchannel.cpp (+330/-0)
handler/farstreamchannel.h (+80/-0)
handler/handler.cpp (+23/-4)
handler/handler.h (+1/-0)
handler/main.cpp (+2/-0)
indicator/textchannelobserver.cpp (+6/-0)
libtelephonyservice/accountentry.cpp (+17/-4)
libtelephonyservice/callentry.cpp (+15/-3)
libtelephonyservice/callentry.h (+1/-1)
libtelephonyservice/dbustypes.h (+34/-15)
libtelephonyservice/protocol.cpp (+71/-19)
libtelephonyservice/protocol.h (+6/-0)
libtelephonyservice/protocolmanager.cpp (+26/-0)
libtelephonyservice/tonegenerator.cpp (+11/-0)
libtelephonyservice/tonegenerator.h (+5/-1)
po/ast.po (+10/-0)
po/de.po (+5/-0)
po/hu.po (+5/-0)
protocols/README.protocols (+1/-0)
protocols/ofono.protocol (+1/-0)
protocols/sip.protocol (+7/-0)
snapcraft.yaml (+85/-0)
tests/libtelephonyservice/ProtocolTest.cpp (+6/-2)
tests/libtelephonyservice/testProtocols/foo.protocol (+1/-0)
Text conflict in handler/Handler.xml
Text conflict in libtelephonyservice/dbustypes.h
Text conflict in libtelephonyservice/protocol.cpp
Text conflict in libtelephonyservice/protocolmanager.cpp
Text conflict in po/ast.po
Text conflict in po/de.po
Text conflict in po/hu.po
Text conflict in snapcraft.yaml
To merge this branch: bzr merge lp://staging/~phablet-team/telephony-service/voip_support
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+313701@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2017-01-05.

Commit message

Add VOIP support to telephony-service.

To post a comment you must log in.
974. By Tiago Salem Herrmann

merge parent branch

975. By Tiago Salem Herrmann

merge parent branch

976. By Gustavo Pichorim Boiko

- Fix contact matching
- Extract only the phone number from the SIP URI
- Stop ringing when the call ends
- Iterate over just the phone accounts to set the account name
- Expose the modem name

977. By Gustavo Pichorim Boiko

Remove debugs

978. By Gustavo Pichorim Boiko

Make it possible to enable/disable dialpad sounds

979. By Gustavo Pichorim Boiko

Emit the signal after the identifier has been normalized in contactwatcher

980. By Gustavo Pichorim Boiko

Add a way to read and write account properties

981. By Gustavo Pichorim Boiko

Fix the settings saving and retrieving

982. By Gustavo Pichorim Boiko

Use the phone settings to apply phone number rewriting rules

983. By Gustavo Pichorim Boiko

Prepend the + sign for incoming phone numbers

984. By Gustavo Pichorim Boiko

Close the channel when the call ends

985. By Gustavo Pichorim Boiko

Make the approver do the contact search for other accounts than just phone ones.

986. By Gustavo Pichorim Boiko

Strip whitespace

987. By Gustavo Pichorim Boiko

Set the missed calls correctly for VOIP too.

988. By Gustavo Pichorim Boiko

Request contacts for all accounts, not only phone ones, and add some debug to the messaging menu.

989. By Gustavo Pichorim Boiko

Remove debugs

990. By Gustavo Pichorim Boiko

Do not show the text reply options for protocols that don't have text capabilities

991. By Gustavo Pichorim Boiko

Fix displaying the messaging menu item for VOIP calls, and make them activatable.

992. By Gustavo Pichorim Boiko

Fix OfonoAccountEntry test on vivid.

993. By Gustavo Pichorim Boiko

Fix copyright header dates.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: