dialer-app

Merge lp:~boiko/dialer-app/dont_show_dialpad_when_dialing into lp:dialer-app

dont_show_dialpad_when_dialing
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2014-04-14

Status:

Merged

Approved by:

Tiago Salem Herrmann on 2014-04-15

Approved revision:

112

Merged at revision:

124

Proposed branch:

lp:~boiko/dialer-app/dont_show_dialpad_when_dialing

Merge into:

lp:dialer-app

Diff against target:

46 lines (+5/-6)

2 files modified

src/dialerapplication.cpp (+1/-5)
src/qml/dialer-app.qml (+4/-1)

To merge this branch:

bzr merge lp:~boiko/dialer-app/dont_show_dialpad_when_dialing

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-04-14	Approve on 2014-04-15
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-15
Review via email: mp+215719@code.launchpad.net

Commit message

Do not wait for the telepathy stuff to get ready to process the command line arguments.
This ensures that the dialpad view is not visible when calling using the argument tel:///<number>

Description of the change

Do not wait for the telepathy stuff to get ready to process the command line arguments.
This ensures that the dialpad view is not visible when calling using the argument tel:///<number>

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes: https://code.launchpad.net/~boiko/telephony-service/fix_call_earlier/+merge/215720

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/219/rebuild

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/dont_show_dialpad_when_dialing updated on 2014-04-14

111. By Gustavo Pichorim Boiko on 2014-04-14: Merge latest changes from trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/220/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/221/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15:

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/222/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-amd64-ci/127/console
    None: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-armhf-ci/129/console
    None: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-i386-ci/127/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4840/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4170/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4977/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4417/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/222/rebuild

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/dont_show_dialpad_when_dialing updated on 2014-04-15

112. By Gustavo Pichorim Boiko on 2014-04-15: Merge latest changes from trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/223/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-04-15:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but it is not related to the change.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Gustavo Pichorim Boiko

Ishan Joshi

Ubuntu Phablet Team

1	=== modified file 'src/dialerapplication.cpp'
2	--- src/dialerapplication.cpp 2014-03-18 18:04:30 +0000
3	+++ src/dialerapplication.cpp 2014-04-15 17:22:29 +0000
4	@@ -167,15 +167,11 @@
5	return;
6	}
7
8	- QQuickItem *mainView = m_view->rootObject();
9	- if (mainView) {
10	- QObject::connect(mainView, SIGNAL(applicationReady()), this, SLOT(onApplicationReady()));
11	- }
12	+ onApplicationReady();
13	}
14
15	void DialerApplication::onApplicationReady()
16	{
17	- QObject::disconnect(QObject::sender(), SIGNAL(applicationReady()), this, SLOT(onApplicationReady()));
18	m_applicationIsReady = true;
19	parseArgument(m_arg);
20	m_arg.clear();
21
22	=== modified file 'src/qml/dialer-app.qml'
23	--- src/qml/dialer-app.qml 2014-04-02 19:41:23 +0000
24	+++ src/qml/dialer-app.qml 2014-04-15 17:22:29 +0000
25	@@ -78,17 +78,20 @@
26	}
27
28	function call(number, accountId) {
29	- if (!telepathyHelper.connected \|\| number === "") {
30	+ if (number === "") {
31	return
32	}
33	+
34	if (checkUSSD(number)) {
35	PopupUtils.open(ussdProgressDialog)
36	ussdManager.initiate(number, accountId)
37	return
38	}
39	+
40	if (pageStack.depth === 1 && !callManager.hasCalls) {
41	pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"))
42	}
43	+
44	if (accountId && telepathyHelper.accountIds.indexOf(accountId) != -1) {
45	callManager.startCall(number, accountId);
46	return