address-book-app

Merge lp:~renatofilho/address-book-app/save-state into lp:address-book-app

save-state
Merge into trunk

Proposed by Bill Filler on 2014-02-13

Status:	Work in progress
Proposed branch:	lp:~renatofilho/address-book-app/save-state
Merge into:	lp:address-book-app
Diff against target:	962 lines (+457/-54) 20 files modified debian/control (+1/-0) src/app/addressbookapp.cpp (+12/-0) src/app/addressbookapp.h (+1/-0) src/imports/Common/CMakeLists.txt (+1/-0) src/imports/Common/ContactPage.qml (+34/-0) src/imports/ContactEdit/CMakeLists.txt (+1/-1) src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml (+21/-6) src/imports/ContactEdit/ContactDetailNameEditor.qml (+4/-7) src/imports/ContactEdit/ContactDetailWithTypeEditor.qml (+7/-16) src/imports/ContactEdit/ContactEditPage.qml (+91/-5) src/imports/ContactEdit/TextInputDetail.qml (+9/-0) src/imports/ContactEdit/ValueSelector.qml (+7/-1) src/imports/ContactList/ContactListPage.qml (+34/-6) src/imports/ContactView/CMakeLists.txt (+1/-1) src/imports/ContactView/ContactViewPage.qml (+22/-5) src/imports/MainWindow.qml (+3/-1) src/imports/Ubuntu/Contacts/ContactFetch.qml (+2/-0) tests/autopilot/address_book_app/emulators/main_window.py (+2/-2) tests/autopilot/address_book_app/tests/__init__.py (+43/-3) tests/autopilot/address_book_app/tests/test_save_state.py (+161/-0)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/save-state
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-02-13	Needs Fixing on 2014-02-13
Bill Filler			Pending
Review via email: mp+206083@code.launchpad.net

This proposal supersedes a proposal from 2014-01-09.

Commit message

save state

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-01-13: Posted in a previous version of this proposal

Did some testing, found some issues:

1) Add new contact and then quit app before filling in any fields. When restore app, the focused is given to the Home address field and the view is scrolled down to there. Focus should either be at the first name field at the top or should be with whatever field last had focus

2) If I edit a contact, and put cursor in email field then quit the app I get the main list when restore, not the edited contact. Seems this only happens when a contact doesn't have any phone numbers.

3) edit a contact and restore, focus always put in the phone number field even if that's not what last had focus. If no phone number the contact is not displayed.

4) scroll position in the main list is not maintained after restore. is this a known bug in state saver? if so, what is bug number.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-13:

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

122. By Renato Araujo Oliveira Filho on 2014-01-13: Removed debug messages.
121. By Renato Araujo Oliveira Filho on 2014-01-13: Move focust to name field after restore the state on edit mode.
120. By Renato Araujo Oliveira Filho on 2014-01-13: Removed debug messages.
119. By Renato Araujo Oliveira Filho on 2014-01-13: Fixed name detail save.
118. By Renato Araujo Oliveira Filho on 2014-01-09: Created test to save state on create contact state.
117. By Renato Araujo Oliveira Filho on 2014-01-09: Fixed autopilot test with the new component type.
116. By Renato Araujo Oliveira Filho on 2014-01-09: Save state implementation.

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:

Renato Araujo Oliveira Filho

Rufus

Ubuntu Phablet Team

 === modified file 'debian/control'
 --- debian/control	2013-12-11 15:03:32 +0000
 +++ debian/control	2014-02-13 02:55:34 +0000
@@ -69,5 +69,6 @@
           libqt5widgets5,
           ubuntu-ui-toolkit-autopilot,
           address-book-app (>= ${binary:Version}),
++         unity8-autopilot,
  Description: Test package for address-book-app
   Autopilot tests for the address-book-app package
 === modified file 'src/app/addressbookapp.cpp'
 --- src/app/addressbookapp.cpp	2014-01-10 15:07:11 +0000
 +++ src/app/addressbookapp.cpp	2014-02-13 02:55:34 +0000
@@ -225,6 +225,18 @@
+     }
+ }
++QUrl AddressBookApp::tempFile(const QString &templateName)
++{
++    // Create the temporary file
++    QTemporaryFile tmpFile(templateName);
++    tmpFile.setAutoRemove(false);
++    if (tmpFile.open()) {
++        return QUrl::fromLocalFile(tmpFile.fileName());
++    }
++    qWarning()  << "Fail to create temp file for:" << templateName;
++    return QUrl();
++}
++
  void AddressBookApp::parseUrl(const QString &arg)
+ {
      QUrl url = QUrl::fromPercentEncoding(arg.toUtf8());
 === modified file 'src/app/addressbookapp.h'
 --- src/app/addressbookapp.h	2013-12-12 15:55:19 +0000
 +++ src/app/addressbookapp.h	2014-02-13 02:55:34 +0000
@@ -39,6 +39,7 @@
      void parseUrl(const QString &arg);
      void onViewStatusChanged(QQuickView::Status status);
      void returnVcard(const QUrl &url);
++    QUrl tempFile(const QString &baseName);
  private:
      void callQMLMethod(const QString name, QStringList args);
 === modified file 'src/imports/Common/CMakeLists.txt'
 --- src/imports/Common/CMakeLists.txt	2013-07-31 19:36:55 +0000
 +++ src/imports/Common/CMakeLists.txt	2014-02-13 02:55:34 +0000
@@ -3,6 +3,7 @@
      ContactDetailItem.qml
      ContactDetailGroupBase.qml
      ContactDetailGroupWithTypeBase.qml
++    ContactPage.qml
+ )
  install(FILES ${CONTACT_COMMON_QMLS}
 === added file 'src/imports/Common/ContactPage.qml'
 --- src/imports/Common/ContactPage.qml	1970-01-01 00:00:00 +0000
 +++ src/imports/Common/ContactPage.qml	2014-02-13 02:55:34 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2012-2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++Page {
++    property string pageName
++
++    Component.onCompleted: {
++        if (pageStack && pageName) {
++            pageStack.currentStack += ";" + pageName
++        }
++    }
++
++    Component.onDestruction: {
++        if (pageStack && pageName) {
++            pageStack.currentStack = pageStack.currentStack.replace(";" + pageName, "")
++        }
++    }
++}
 === modified file 'src/imports/ContactEdit/CMakeLists.txt'
 --- src/imports/ContactEdit/CMakeLists.txt	2013-09-24 15:07:46 +0000
 +++ src/imports/ContactEdit/CMakeLists.txt	2014-02-13 02:55:34 +0000
@@ -8,7 +8,7 @@
      ContactDetailOrganizationsEditor.qml
      ContactDetailPhoneNumbersEditor.qml
      ContactDetailWithTypeEditor.qml
--    ContactEditor.qml
++    ContactEditPage.qml
      ContactFetchError.qml
      EditToolbar.qml
      KeyboardRectangle.qml
 === modified file 'src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml'
 --- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-01-14 20:43:59 +0000
 +++ src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-02-13 02:55:34 +0000
@@ -38,8 +38,22 @@
          root.newDetails = []
+     }
++    function updateType() {
++        for(var i=0; i < detailDelegates.length; i++) {
++            var delegate = detailDelegates[i]
++            // Get item from Loader
++            if (delegate.item) {
++                delegate = delegate.item
++            }
++            if (delegate.save) {
++                return updateDetail(delegate.detail, delegate.selectedTypeIndex)
++            }
++        }
++        return false
++    }
++
      function save() {
--        var changed = false
++        var changed = updateType()
          for(var i=0; i < detailDelegates.length; i++) {
              var delegate = detailDelegates[i]
@@ -49,11 +63,6 @@
+             }
              if (delegate.save) {
--                // save type
--                if (updateDetail(delegate.detail, delegate.selectedTypeIndex)) {
--                    changed = true
--                }
--
                  // save fields
                  if (delegate.save()) {
                      changed = true
@@ -63,6 +72,12 @@
          return changed
+     }
++    onActiveFocusChanged: {
++        if (!activeFocus) {
++            updateType()
++        }
++    }
++
      focus: true
      minimumHeight: units.gu(5)
      headerDelegate: ListItem.Empty {
 === modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
 --- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-01-23 01:09:04 +0000
 +++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-02-13 02:55:34 +0000
@@ -27,9 +27,9 @@
      property variant emptyFields: []
      function save() {
--        var changed = false;
++        var detailChanged  = false
--        for(var i=0; i < fieldDelegates.length; i++) {
++        for (var i=0; i < fieldDelegates.length; i++) {
              var delegate = fieldDelegates[i]
              // Get item from Loader
@@ -38,14 +38,11 @@
+             }
              if (delegate.detail && (delegate.field >= 0)) {
--                if (delegate.text != delegate.detail.value(delegate.field)) {
--                    delegate.detail.setValue(delegate.field, delegate.text)
--                    changed  = true;
--                }
++                detailChanged = detailChanged || delegate.changed
+             }
+         }
--        return changed
++        return detailChanged
+     }
      detail: root.contact ? root.contact.name : null
 === modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
 --- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2013-11-22 01:05:52 +0000
 +++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-02-13 02:55:34 +0000
@@ -37,26 +37,18 @@
+     }
      function save() {
--        var detailchanged  = false
--
--        // save field values
++        var detailChanged  = detailTypeSelector.changed
          var isEmpty = true
++
          for (var i=0; i < fieldValues.children.length; i++) {
              var input = fieldValues.children[i]
              if (input.detail && (input.field >= 0)) {
--                var originalValue = input.detail.value(input.field)
--                originalValue = originalValue ? String(originalValue) : ""
--                if (input.text !== "") {
--                    isEmpty = false
--                }
--
--                if (originalValue !== input.text) {
--                    input.detail.setValue(input.field, input.text)
--                    detailchanged  = true
--                }
++                isEmpty = isEmpty && input.isEmpty
++                detailChanged = detailChanged || input.changed
+             }
+         }
++        // remove empty detail
          if (isEmpty) {
              // unfavorite the contact if the favorite number was removed
              if (contact.isPreferredDetail("TEL", detail)) {
@@ -64,8 +56,7 @@
+             }
              contact.removeDetail(input.detail)
+         }
--
--        return detailchanged
++        return detailChanged
+     }
      focus: true
@@ -91,7 +82,7 @@
          height: visible ? (root.active ? units.gu(4) : units.gu(3)) : 0
          onExpandedChanged: {
--            // Make sure that the inputfield get focus when clicking on type selector
++            // Make sure that the input field get focus when clicking on type selector
              if (expanded) {
                  root.forceActiveFocus()
+             }
 === renamed file 'src/imports/ContactEdit/ContactEditor.qml' => 'src/imports/ContactEdit/ContactEditPage.qml'
 --- src/imports/ContactEdit/ContactEditor.qml	2013-11-21 12:14:04 +0000
 +++ src/imports/ContactEdit/ContactEditPage.qml	2014-02-13 02:55:34 +0000
@@ -19,14 +19,22 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Components.Popups 0.1
++import "../Common"
--Page {
++ContactPage {
      id: contactEditor
      objectName: "contactEditorPage"
      property QtObject contact: null
      property QtObject model: null
++    // state saver control
++    property string persistentContactId: ""
++    property string persistentContactVCardFile: ""
++
++    readonly property bool appActive: Qt.application.active
++    property QtObject pendingContact: null
++
      // this is used to add a phone number to a existing contact
      property int currentFetchOperation: -1
      property string contactId: ""
@@ -34,6 +42,9 @@
      property QtObject activeItem: null
++    pageName: "contactEditPage"
++    StateSaver.properties: "persistentContactVCardFile, persistentContactId"
++
      // we use a custom toolbar in this view
      tools: ToolbarItems {
          locked: true
@@ -110,6 +121,63 @@
          scrollArea.returnToBounds()
+     }
++    function saveState() {
++        var fileName = "savedContact_XXXXXX.vcf"
++        fileName = application.tempFile(fileName);
++        if (fileName != "") {
++            // save current contact info
++            model.exportContacts(fileName, ["Sync", "Backup"], [contact])
++            persistentContactVCardFile = fileName
++        }
++        if (contact.contactId != "qtcontacts:::") {
++            persistentContactId = contact.contactId
++        } else {
++            persistentContactId = ""
++        }
++        pendingContact = null
++    }
++
++    function restoreState() {
++        // if was editing a contact load the contact first
++        if (persistentContactId != "") {
++            contactEditor.contactId = persistentContactId
++        } else if (persistentContactVCardFile != "") {
++            importerModel.importContacts(persistentContactVCardFile, ["Sync", "Backup"])
++        }
++    }
++
++    onAppActiveChanged: if (!appActive) saveState();
++
++    ContactModel {
++        id: importerModel
++
++        manager: "memory"
++        onContactsChanged: {
++            var contact = importerModel.contacts[0]
++            var newContact = null
++
++            if (contactEditor.pendingContact) {
++                newContact = contactEditor.pendingContact
++                newContact.clearDetails()
++            } else {
++                // is a new contact we need to remove the contactId
++                newContact = Qt.createQmlObject("import QtContacts 5.0; Contact{}", contactEditor)
++            }
++
++            var details = contact.contactDetails
++            for(var index in details) {
++                newContact.addDetail(details[index])
++            }
++
++            contactEditor.contact = newContact
++            contactEditor.pendingContact = null
++            contactEditor.persistentContactVCardFile = ""
++
++            // move focus to first field until SDK implement a way to save it
++            nameEditor.forceActiveFocus()
++        }
++    }
++
      ContactFetchError {
          id: fetchErrorDialog
+     }
@@ -119,16 +187,26 @@
          onContactsFetched: {
              if (requestId == currentFetchOperation) {
                  currentFetchOperation = -1
++
                  // this fetch request can only return one contact
                  if(fetchedContacts.length !== 1) {
                      PopupUtils.open(fetchErrorDialog, null)
+                 }
--                contact = fetchedContacts[0]
++
++                if (persistentContactVCardFile != "") {
++                    // we need to merge the contact information with the saved state vcard
++                    contactEditor.pendingContact = fetchedContacts[0]
++                    persistentContactId = ""
++                    // go to second step of state save restore
++                    contactEditor.restoreState()
++                } else {
++                    contact = fetchedContacts[0]
++                }
+             }
+         }
+     }
--    onContactIdChanged:  {
++    onContactIdChanged: {
          if (contactId) {
              currentFetchOperation = model.fetchContacts(contactId)
+         }
@@ -286,8 +364,6 @@
+         }
+     }
--    Component.onCompleted: nameEditor.forceActiveFocus()
--
      ActivityIndicator {
          id: busyIndicator
@@ -358,4 +434,14 @@
+             }
+         }
+     }
++
++    Component.onCompleted: {
++        nameEditor.forceActiveFocus()
++        contactEditor.restoreState()
++    }
++
++    Component.onDestruction: {
++        contactEditor.persistentContactId = ""
++        contactEditor.persistentContactVCardFile = ""
++    }
+ }
 === modified file 'src/imports/ContactEdit/TextInputDetail.qml'
 --- src/imports/ContactEdit/TextInputDetail.qml	2013-10-08 12:58:44 +0000
 +++ src/imports/ContactEdit/TextInputDetail.qml	2014-02-13 02:55:34 +0000
@@ -26,10 +26,13 @@
      property QtObject detail
      property int field: -1
      property variant originalValue: root.detail && (root.field >= 0) ? root.detail.value(root.field) : null
++    property bool changed: false
++    readonly property bool isEmpty: (text == "")
      signal removeClicked()
      Component.onCompleted: makeMeVisible(root)
++    StateSaver.properties: "cursorPosition"
      focus: true
      text: originalValue ? originalValue : ""
@@ -41,6 +44,12 @@
      onActiveFocusChanged: {
          if (activeFocus) {
              makeMeVisible(root)
++        } else if (root.detail) {
++            var value = root.detail.value(root.field)
++            if (String(value) != root.text) {
++                root.changed = true
++                root.detail.setValue(root.field, root.text)
++            }
+         }
+     }
 === modified file 'src/imports/ContactEdit/ValueSelector.qml'
 --- src/imports/ContactEdit/ValueSelector.qml	2013-11-22 00:47:10 +0000
 +++ src/imports/ContactEdit/ValueSelector.qml	2014-02-13 02:55:34 +0000
@@ -21,6 +21,7 @@
      id: root
      property bool active: false
++    property bool changed: false
      property alias values: listView.model
      property alias currentIndex: listView.currentIndex
      readonly property bool expanded: (state === "expanded") && listView.opacity == 1.0
@@ -161,7 +162,12 @@
                      width: parent.width + units.gu(0.5)
                      height: parent.height + units.gu(0.5)
                      anchors.centerIn: parent
--                    onClicked: currentIndex = index
++                    onClicked: {
++                        if (currentIndex != index) {
++                            root.changed = true
++                            currentIndex = index
++                        }
++                    }
+                 }
+             }
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2013-12-17 23:47:28 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2014-02-13 02:55:34 +0000
@@ -21,7 +21,9 @@
  import Ubuntu.Contacts 0.1 as ContactsUI
  import QtContacts 5.0
--Page {
++import "../Common"
++
++ContactPage {
      id: mainPage
      objectName: "contactListPage"
@@ -48,7 +50,24 @@
          return newContact
+     }
++    function restoreState()
++    {
++        // store current page before load contact list because this will overwrite it
++        var stack = pageStack.currentStack.split(";")
++        pageStack.currentStack = ""
++        for (var index in stack) {
++            var page = stack[index]
++            // load previous state/page
++            if (page == "contactEditPage") {
++                pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditPage.qml"),
++                               {model: contactList.listModel})
++            } else if (page == "contactViewPage") {
++                pageStack.push(Qt.resolvedUrl("../ContactView/ContactViewPage.qml"),
++                               {model: contactList.listModel})
++            }
++        }
++    }
      title: i18n.tr("Contacts")
      Component {
@@ -97,7 +116,7 @@
+         }
          onContactClicked: {
--            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
++            pageStack.push(Qt.resolvedUrl("../ContactView/ContactViewPage.qml"),
                             {model: contactList.listModel, contactId: contact.contactId})
+         }
@@ -118,6 +137,7 @@
                  contactList.listModel.removeContacts(ids)
+             }
+         }
++
          onSelectionCanceled: {
              if (pickMode) {
                  if (contactContentHub) {
@@ -154,7 +174,7 @@
                  iconSource: "artwork:/add.png"
                  onTriggered: {
                      var newContact = mainPage.createEmptyContact("")
--                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
++                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditPage.qml"),
                                     {model: contactList.listModel, contact: newContact})
+                 }
+             }
@@ -164,16 +184,16 @@
      Connections {
          target: pageStack
          onContactRequested: {
--            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
++            pageStack.push(Qt.resolvedUrl("../ContactView/ContactViewPage.qml"),
                             {model: contactList.listModel, contactId: contactId})
+         }
          onCreateContactRequested: {
              var newContact = mainPage.createEmptyContact(phoneNumber)
--            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
++            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditPage.qml"),
                             {model: contactList.listModel, contact: newContact})
+         }
          onEditContatRequested: {
--            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
++            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditPage.qml"),
                             {model: contactList.listModel, contactId: contactId, newPhoneNumber: phoneNumber })
+         }
          onContactCreated: {
@@ -206,4 +226,12 @@
              contactList.listModel.importContacts("file://" + TEST_DATA)
+         }
+     }
++
++    // WORKAROUND: Page stack fails to push page using Component.onCompleted. Check bug #1262224
++    Timer {
++        interval: 500
++        running: true
++        repeat: false
++        onTriggered: restoreState()
++    }
+ }
 === modified file 'src/imports/ContactView/CMakeLists.txt'
 --- src/imports/ContactView/CMakeLists.txt	2013-10-21 19:25:51 +0000
 +++ src/imports/ContactView/CMakeLists.txt	2014-02-13 02:55:34 +0000
@@ -13,7 +13,7 @@
      ContactDetailPhoneNumberView.qml
      ContactDetailWithTypeView.qml
      ContactHeaderView.qml
--    ContactView.qml
++    ContactViewPage.qml
+ )
  install(FILES ${CONTACT_VIEW_QMLS}
 === renamed file 'src/imports/ContactView/ContactView.qml' => 'src/imports/ContactView/ContactViewPage.qml'
 --- src/imports/ContactView/ContactView.qml	2013-11-14 17:48:48 +0000
 +++ src/imports/ContactView/ContactViewPage.qml	2014-02-13 02:55:34 +0000
@@ -19,13 +19,15 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Contacts 0.1 as ContactsUI
++import "../Common"
--Page {
++ContactPage {
      id: root
      objectName: "contactViewPage"
      readonly property alias contact: contactFetch.contact
--    property variant contactId: null
++    property string contactId: ""
++    property string savedContactId: ""
      property alias model: contactFetch.model
      function formatNameToDisplay(contact) {
@@ -43,12 +45,21 @@
+         }
+     }
++    onSavedContactIdChanged: {
++        if (root.contactId == "") {
++            root.contactId = savedContactId
++            contactFetch.fetchContact(savedContactId)
++        }
++    }
++    pageName: "contactViewPage"
++    StateSaver.properties: "savedContactId"
      title: formatNameToDisplay(contact)
      onActiveChanged: {
          if (active) {
--            contactFetch.fetchContact(root.contactId)
--
++            if (root.contactId != "") {
++                contactFetch.fetchContact(root.contactId)
++            }
              //WORKAROUND: to correct scroll back the page
              flickable.contentY = -100
              flickable.returnToBounds()
@@ -147,6 +158,7 @@
          id: contactFetch
          onContactRemoved: pageStack.pop()
++        onContactFetched: root.savedContactId = contact.contactId
+     }
      tools: ToolbarItems {
@@ -169,10 +181,15 @@
                  text: i18n.tr("Edit")
                  iconSource: "artwork:/edit.png"
                  onTriggered: {
--                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
++                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditPage.qml"),
                                     { model: root.model, contact: root.contact})
+                 }
+             }
+         }
+     }
++
++    Component.onDestruction: {
++        // avoid save contact Id by stateSave
++        savedContactId = ""
++    }
+ }
 === modified file 'src/imports/MainWindow.qml'
 --- src/imports/MainWindow.qml	2013-12-17 14:57:28 +0000
 +++ src/imports/MainWindow.qml	2014-02-13 02:55:34 +0000
@@ -49,6 +49,8 @@
          id: mainStack
          property string newPhoneNumber: ""
++        property string currentStack
++        StateSaver.properties: "currentStack"
          signal contactRequested(string contactId)
          signal createContactRequested(string phoneNumber)
@@ -68,7 +70,7 @@
      Component.onCompleted: {
          Theme.name = "Ubuntu.Components.Themes.SuruGradient"
--        mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"))
++        mainStack.push(Qt.resolvedUrl("ContactList/ContactListPage.qml"))
          mainWindow.applicationReady()
+     }
 === modified file 'src/imports/Ubuntu/Contacts/ContactFetch.qml'
 --- src/imports/Ubuntu/Contacts/ContactFetch.qml	2013-11-04 14:56:40 +0000
 +++ src/imports/Ubuntu/Contacts/ContactFetch.qml	2014-02-13 02:55:34 +0000
@@ -23,6 +23,7 @@
      property bool running: false
      property QtObject contact: null
      property bool contactIsDirty: false
++    property string contactId: ""
      property string _pendingId: ""
      property bool _ready: false
@@ -31,6 +32,7 @@
      signal contactRemoved()
      function fetchContact(contactId) {
++        root.contactId = contactId
          if (root._ready) {
              root._fetchContact(contactId)
          } else {
 === modified file 'tests/autopilot/address_book_app/emulators/main_window.py'
 --- tests/autopilot/address_book_app/emulators/main_window.py	2013-12-12 15:55:57 +0000
 +++ tests/autopilot/address_book_app/emulators/main_window.py	2014-02-13 02:55:34 +0000
@@ -16,11 +16,11 @@
                                          objectName="contactListPage")
      def get_contact_edit_page(self):
--        return self.wait_select_single("ContactEditor",
++        return self.wait_select_single("ContactEditPage",
                                         objectName="contactEditorPage")
      def get_contact_view_page(self):
--        return self.wait_select_single("ContactView",
++        return self.wait_select_single("ContactViewPage",
                                         objectName="contactViewPage")
      def get_contact_list_pick_page(self):
 === modified file 'tests/autopilot/address_book_app/tests/__init__.py'
 --- tests/autopilot/address_book_app/tests/__init__.py	2014-01-14 20:44:25 +0000
 +++ tests/autopilot/address_book_app/tests/__init__.py	2014-02-13 02:55:34 +0000
@@ -11,10 +11,13 @@
  import os
  import time
  import subprocess
++import signal
  from autopilot.testcase import AutopilotTestCase
  from autopilot.matchers import Eventually
  from autopilot.platform import model
++from autopilot.introspection import get_proxy_object_for_existing_process
++
  from testtools.matchers import Equals
  from address_book_app.emulators.main_window import MainWindow
@@ -30,6 +33,11 @@
      ARGS = []
      PRELOAD_VCARD = False
++    def do_reset_config(self):
++        config = os.path.expanduser(os.path.join("~", ".config", "AddressBookApp.conf"))
++        if os.path.exists(config):
++            os.remove(config)
++
      def setUp(self):
          self.pointing_device = toolkit_emulators.get_pointing_device()
          super(AddressBookAppTestCase, self).setUp()
@@ -43,7 +51,13 @@
          else:
              self.app_bin = AddressBookAppTestCase.DEFAULT_DEV_LOCATION
++        self.do_reset_config()
++        self.start_app()
++
++
++    def start_app(self):
          print "Running from: %s" % (self.app_bin)
++
          os.environ['QTCONTACTS_MANAGER_OVERRIDE'] = 'memory'
          if AddressBookAppTestCase.PRELOAD_VCARD:
              os.environ["ADDRESS_BOOK_TEST_DATA"] = "/usr/share/address-book-app/vcards/vcard.vcf"
@@ -57,13 +71,13 @@
          else:
              self.launch_click_installed()
++    def tearDown(self):
++        super(AddressBookAppTestCase, self).tearDown()
++
          AddressBookAppTestCase.ARGS = []
          AddressBookAppTestCase.PRELOAD_VCARD = False
          self.main_window.visible.wait_for(True)
--    def tearDown(self):
--        super(AddressBookAppTestCase, self).tearDown()
--
          # start the vkb
          if model() != "Desktop":
              subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
@@ -290,3 +304,29 @@
          # wait for contact list to be visible again
          list_page = self.main_window.get_contact_list_page()
          self.assertThat(list_page.visible, Eventually(Equals(True)))
++
++    def ensure_app_has_quit(self):
++        """Terminate as gracefully as possible the application and ensure
++           that it has fully quit before returning"""
++
++        if model() == "Desktop":
++            # make the app lost focus (this will save all info)
++            self.keyboard.press_and_release("Alt+Tab")
++            # kill the app
++            self.app.process.send_signal(signal.SIGTERM)
++        else:
++            # On unity8 at the moment we have no clean way to close the app.
++            # So we ask the shell first to show the home, unfocusing our app, which will
++            # save its state. Then we simply send it a SIGTERM to force it to quit.
++            # See bug https://bugs.launchpad.net/unity8/+bug/1261720 for more details.
++            from unity8 import process_helpers
++            pid = process_helpers._get_unity_pid()
++            unity8 = get_proxy_object_for_existing_process(pid)
++            shell = unity8.select_single("Shell")
++            shell.slots.showHome()
++            self.assertThat(shell.currentFocusedAppId, Eventually(NotEquals("address-book-app")))
++            self.app.process.send_signal(signal.SIGTERM)
++
++        # Either way, we wait for the underlying process to be fully finished.
++        self.app.process.wait()
++        self.assertIsNotNone(self.app.process.returncode)
 === added file 'tests/autopilot/address_book_app/tests/test_save_state.py'
 --- tests/autopilot/address_book_app/tests/test_save_state.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/address_book_app/tests/test_save_state.py	2014-02-13 02:55:34 +0000
@@ -0,0 +1,161 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2013 Canonical
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++
++"""Tests for the Addressbook App"""
++
++from __future__ import absolute_import
++
++from testtools.matchers import Equals
++from autopilot.matchers import Eventually
++
++from address_book_app.tests import AddressBookAppTestCase
++
++
++class TestStateSave(AddressBookAppTestCase):
++    """ Tests the Save State functionality """
++
++    def test_create_contact_state(self):
++        # execute add new contact
++        self.main_window.open_toolbar().click_button("Add")
++
++        # fill name
++        firstNameField = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="firstName")
++        lastNameField = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="lastName")
++        self.type_on_field(firstNameField, "Sherlock")
++        self.type_on_field(lastNameField, "Holmes")
++
++        # fill phone number
++        phone_number_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="phoneNumber_0")
++        self.type_on_field(phone_number_0, "81 8777 7755")
++
++        # fill email
++        email_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="emailAddress_0")
++        self.type_on_field(email_0, "holmes.sherlock.uk")
++
++        # fill im
++        im_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="imUri_0")
++        self.type_on_field(im_0, "sh.im.com.br")
++
++        # Change Im type
++        im_value_selector = self.main_window.select_single(
++            "ValueSelector",
++            objectName="type_onlineAccount_0")
++        self.pointing_device.click_object(im_value_selector)
++        self.assertThat(im_value_selector.expanded, Eventually(Equals(True)))
++
++        im_address_0 = self.main_window.select_single(
++            "TextInputDetail",
++            objectName="imUri_0")
++
++        # select the type with index = 0
++        self.select_a_value(im_address_0, im_value_selector, 0)
++
++        # fill address
++        street_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="streetAddress_0")
++        self.type_on_field(street_0, "221B Baker Street")
++        locality_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="localityAddress_0")
++        self.type_on_field(locality_0, "West End")
++        region_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="regionAddress_0")
++        self.type_on_field(region_0, "London")
++        postcode_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="postcodeAddress_0")
++        self.type_on_field(postcode_0, "7777")
++        country_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="countryAddress_0")
++        self.type_on_field(country_0, "united kingdom")
++
++        # kill the app while in the create mode
++        self.ensure_app_has_quit()
++
++        # start app again
++        self.start_app()
++
++        # wait for edit page to appear
++        edit_page = self.main_window.get_contact_edit_page()
++        self.assertThat(edit_page.visible, Eventually(Equals(True)))
++
++        # check for the contact data displayed correct
++
++        # Name
++        firstNameField = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="firstName")
++        lastNameField = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="lastName")
++
++        self.assertThat(firstNameField.text, Eventually(Equals("Sherlock")))
++        self.assertThat(lastNameField.text, Eventually(Equals("Holmes")))
++
++        # Phone number
++        phone_number_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="phoneNumber_0")
++        self.assertThat(phone_number_0.text, Eventually(Equals("81 8777 7755")))
++
++        # Email
++        email_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="emailAddress_0")
++        self.assertThat(email_0.text, Eventually(Equals("holmes.sherlock.uk")))
++
++        # Im
++        im_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="imUri_0")
++        self.assertThat(im_0.text, Eventually(Equals("sh.im.com.br")))
++
++        # Im type
++        im_value_selector = self.main_window.select_single(
++            "ValueSelector",
++            objectName="type_onlineAccount_0")
++        self.assertThat(im_value_selector.currentIndex, Eventually(Equals(0)))
++
++        # Address
++        street_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="streetAddress_0")
++        self.assertThat(street_0.text, Eventually(Equals("221B Baker Street")))
++
++        locality_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="localityAddress_0")
++        self.assertThat(locality_0.text, Eventually(Equals("West End")))
++
++        region_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="regionAddress_0")
++        self.assertThat(region_0.text, Eventually(Equals("London")))
++
++        postcode_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="postcodeAddress_0")
++        self.assertThat(postcode_0.text, Eventually(Equals("7777")))
++
++        country_0 = self.main_window.wait_select_single(
++            "TextInputDetail",
++            objectName="countryAddress_0")
++        self.assertThat(country_0.text, Eventually(Equals("united kingdom")))
++

address-book-app

Merge lp:~renatofilho/address-book-app/save-state into lp:address-book-app

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers