Merge lp:~renatofilho/address-book-app/fix-1306798 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Avoid show online account welcome screen if the app is running with arguments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/223
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4573
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5144
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5144/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/513/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

* Are there any related MPs required for this MP to build/function as expected? NO
* 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 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

[Tiago Salem Herrmann (tiagosh)]

Looks good to me.

-----

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.
Yes

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

review: Approve

[lp:~renatofilho/address-book-app/fix-1306798]

168. By Renato Araujo Oliveira Filho on 2014-05-02

Merged trunk.

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2014-04-07 14:01:26 +0000
+++ src/app/addressbookapp.cpp	2014-05-02 18:15:23 +0000
@@ -91,7 +91,8 @@
       m_contentComm(0),
       m_syncMonitor(0),
       m_pickingMode(false),
-      m_testMode(false)
+      m_testMode(false),
+      m_withArgs(false)
 {
     setOrganizationName("com.ubuntu.address-book");
     setApplicationName("AddressBookApp");
@@ -163,6 +164,8 @@
         }
     }
 
+    m_withArgs = arguments.size() > 1;
+
     /* Configure "artwork:" prefix so that any access to a file whose name starts
        with that prefix resolves properly. */
     QDir::addSearchPath("artwork", fullPath("/artwork"));
@@ -237,7 +240,8 @@
 
 bool AddressBookApp::isFirstRun() const
 {
-    if (m_testMode) {
+    // if the app is running on test mode or with arguments we will not show the welcome screen
+    if (m_testMode || m_withArgs) {
         return false;
     } else {
         QSettings settings;

=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2014-04-07 14:01:26 +0000
+++ src/app/addressbookapp.h	2014-05-02 18:15:23 +0000
@@ -67,6 +67,7 @@
     bool m_viewReady;
     bool m_pickingMode;
     bool m_testMode;
+    bool m_withArgs;
 };
 
 #endif