Merge lp://staging/~renatofilho/address-book-app/sim-card-import into lp://staging/address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 425
Merged at revision: 403
Proposed branch: lp://staging/~renatofilho/address-book-app/sim-card-import
Merge into: lp://staging/address-book-app
Diff against target: 2032 lines (+1425/-55)
28 files modified
CMakeLists.txt (+2/-0)
debian/control (+8/-0)
po/address-book-app.pot (+74/-19)
src/imports/CMakeLists.txt (+1/-0)
src/imports/ContactList/ContactListPage.qml (+13/-7)
src/imports/Settings/CMakeLists.txt (+11/-0)
src/imports/Settings/MyselfPhoneNumbersModel.qml (+82/-0)
src/imports/Settings/SettingsPage.qml (+92/-0)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+14/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+68/-22)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+0/-1)
src/imports/Ubuntu/Contacts/Ofono.qml (+36/-0)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+252/-0)
src/imports/Ubuntu/Contacts/SIMList.qml (+81/-0)
src/imports/Ubuntu/Contacts/contacts.cpp (+12/-0)
src/imports/Ubuntu/Contacts/contacts.h (+5/-0)
src/imports/Ubuntu/Contacts/plugin.cpp (+2/-0)
src/imports/Ubuntu/Contacts/qmldir (+4/-0)
src/imports/Ubuntu/Contacts/simcardcontacts.cpp (+300/-0)
src/imports/Ubuntu/Contacts/simcardcontacts.h (+80/-0)
tests/autopilot/address_book_app/__init__.py (+21/-0)
tests/autopilot/address_book_app/helpers.py (+52/-0)
tests/autopilot/address_book_app/pages/__init__.py (+2/-0)
tests/autopilot/address_book_app/pages/_contact_list_page.py (+6/-0)
tests/autopilot/address_book_app/pages/_sim_card_import_page.py (+100/-0)
tests/autopilot/address_book_app/tests/test_import_from_sim.py (+93/-0)
tests/qml/tst_ContactListView.qml (+13/-4)
To merge this branch: bzr merge lp://staging/~renatofilho/address-book-app/sim-card-import
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Tiago Salem Herrmann (community) Approve
Bill Filler (community) Needs Fixing
Review via email: mp+248562@code.staging.launchpad.net

Commit message

Implemented simcard import feature.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
367. By Renato Araujo Oliveira Filho

-show an active indicator while contacts is exported
-Fixed some problems during the sim card reader

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
368. By Renato Araujo Oliveira Filho

Wait for async modems interfaces.

369. By Renato Araujo Oliveira Filho

Check for modem interface before create the phonebook object.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
370. By Renato Araujo Oliveira Filho

Trunk Merged.

371. By Renato Araujo Oliveira Filho

Show Import from sim on contact list.

372. By Renato Araujo Oliveira Filho

Changed the buttom order on address-book-app header.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
373. By Renato Araujo Oliveira Filho

Updated test to work with the new visual.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
374. By Renato Araujo Oliveira Filho

Renamed Contact list used in SimCard import page.

375. By Renato Araujo Oliveira Filho

Move search button as first action to avid it to get hide if the app is called from dialer app.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
376. By Renato Araujo Oliveira Filho

Change the importFrom buttons header invisilbe if the list is not empty.

377. By Renato Araujo Oliveira Filho

Avoid import contacts from sim twice.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
378. By Renato Araujo Oliveira Filho

Implemented autopilo test.

379. By Renato Araujo Oliveira Filho

Trunk merged.

380. By Renato Araujo Oliveira Filho

Fixed autopilot tests.

381. By Renato Araujo Oliveira Filho

Fixed autopilot tests.

382. By Renato Araujo Oliveira Filho

only run import_from_sim test if ofono 'phonesim' emulator is running.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
383. By Renato Araujo Oliveira Filho

Updated unit test.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
384. By Renato Araujo Oliveira Filho

Import missing library.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
385. By Renato Araujo Oliveira Filho

Improve test.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
386. By Renato Araujo Oliveira Filho

Check for modem interface changes during the contact import.

387. By Renato Araujo Oliveira Filho

Create unit test for removing sim card during the contact import.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
388. By Renato Araujo Oliveira Filho

Fixed contacts import from a real sim.

389. By Renato Araujo Oliveira Filho

Removed extra debug messages.

390. By Renato Araujo Oliveira Filho

Renamed m_pendingModems

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
391. By Renato Araujo Oliveira Filho

Update python code syntax.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
392. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

A few issues:

1) The label on contact list page should say "Import contacts from SIM card" not "Import contacts from sim card"
2) There is currently a toolbar button (with arrow) on the first time contact list page (i.e. the page that displays "Import from Google", "Import from SIM card"). We should not show the toolbar button here as there is already an option in the list
3) The header title when doing import from sim should say "Import SIM Contacts" I think, as there is no indication where these are coming from
4) What happens in the dual-sim case if you have contacts on both sims? Does the view show all of them combined? (I would expect it to)
5) Is there a better icon we could get perhaps? This one looks like a Download/Save button to me
6) Wondering if we should always have the toolbar icon in a drawer? Whether it's by itself or with a sync button. This way we have text to describe what the action is and the icon becomes less import. Once we have settings we'll need a drawer probably anyay

review: Needs Fixing
393. By Renato Araujo Oliveira Filho

Avoid import empty string as contact.

394. By Renato Araujo Oliveira Filho

Does not show the "import from sim" if the list is empty.

395. By Renato Araujo Oliveira Filho

Fixed "Import contacts from SIM card" label.

396. By Renato Araujo Oliveira Filho

Update page title.

397. By Renato Araujo Oliveira Filho

Create a autopilot test for the new header behaviour.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> A few issues:
>
> 1) The label on contact list page should say "Import contacts from SIM card"
> not "Import contacts from sim card"
Fixed on rev. 397

> 2) There is currently a toolbar button (with arrow) on the first time contact
> list page (i.e. the page that displays "Import from Google", "Import from SIM
> card"). We should not show the toolbar button here as there is already an
> option in the list
Fixed on rev. 394

> 3) The header title when doing import from sim should say "Import SIM
> Contacts" I think, as there is no indication where these are coming from
Fixed on rev. 395

> 4) What happens in the dual-sim case if you have contacts on both sims? Does
> the view show all of them combined? (I would expect it to)
Yes both contact list is showed as one list.

> 5) Is there a better icon we could get perhaps? This one looks like a
> Download/Save button to me
I am no happy with this icon, but I did not find any better icon.
I reported a bug some time ago about that: https://bugs.launchpad.net/ubuntu-themes/+bug/1424819

> 6) Wondering if we should always have the toolbar icon in a drawer? Whether
> it's by itself or with a sync button. This way we have text to describe what
> the action is and the icon becomes less import. Once we have settings we'll
> need a drawer probably anyay
this is a SDK component, the drawer appears automatically if we have more then 4 buttons (back on the left, more 3 on the right) this is not an application property.
And Olga told me that the import functionality is going to be moved to application settings, because this is an action that the user will do once.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
398. By Renato Araujo Oliveira Filho

Load contacts after a timeout to avoid multiple load during modem interface change.
Show a message if the contact list is empty.

399. By Renato Araujo Oliveira Filho

Update page title "SIM contacts".

400. By Renato Araujo Oliveira Filho

Does not show empty message if the contact list is busy.

401. By Renato Araujo Oliveira Filho

Show a error message if the import from sim fails.

402. By Renato Araujo Oliveira Filho

Make import from sim button always visible.

403. By Renato Araujo Oliveira Filho

Update autopilot tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
404. By Renato Araujo Oliveira Filho

Implement initial settings page.

405. By Renato Araujo Oliveira Filho

Updated autopilot tests.

406. By Renato Araujo Oliveira Filho

Fixed failing test.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
407. By Renato Araujo Oliveira Filho

Update unit tests.

408. By Renato Araujo Oliveira Filho

Used capital letters for Google.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

2 things need to be fixed:

1) I discussed with Olga about the "ME" avatar. Since we don't have a good translation story, for now we should switch this to use a label instead. The label should say "My phone number:" with the phone number listed to the right of it

2) We need to check if the SIM is locked and display a message to the user, similar to how dialer and messaging-app do it. They display a dialog with a message and a link to unlock. We should do the same thing when the user clicks "Import contacts from SIM card" on the settings or empty list page. Currently we just show the message "SIM card is empty" which is misleading.

review: Needs Fixing
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> 2 things need to be fixed:
>
> 1) I discussed with Olga about the "ME" avatar. Since we don't have a good
> translation story, for now we should switch this to use a label instead. The
> label should say "My phone number:" with the phone number listed to the right
> of it
What should be appear when I have more then one sim? Should I show different entries for each SIM? Or show a phone number list in the same entry?

>
> 2) We need to check if the SIM is locked and display a message to the user,
> similar to how dialer and messaging-app do it. They display a dialog with a
> message and a link to unlock. We should do the same thing when the user clicks
> "Import contacts from SIM card" on the settings or empty list page. Currently
> we just show the message "SIM card is empty" which is misleading.

What should be the behavior if only one of the SIM card is blocked? Should I show the contacts for the unlocked ones? Or should I show the message to unlock the SIM?

409. By Renato Araujo Oliveira Filho

Replaced "me" card with a item with the label "My phone number"

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

> > 2 things need to be fixed:
> >
> > 1) I discussed with Olga about the "ME" avatar. Since we don't have a good
> > translation story, for now we should switch this to use a label instead. The
> > label should say "My phone number:" with the phone number listed to the
> right
> > of it
> What should be appear when I have more then one sim? Should I show different
> entries for each SIM? Or show a phone number list in the same entry?

I would show multiple entries if there are more than one SIM like:
My phone number (SIM1): xxx-xxx-xxx-xxx
My phone number (SIM2): xxx-xxx-xxx-xxx-

If only one sim, then don't show the SIM1 label but just:
My phone number: xxx-xxx-xxx

>
> >
> > 2) We need to check if the SIM is locked and display a message to the user,
> > similar to how dialer and messaging-app do it. They display a dialog with a
> > message and a link to unlock. We should do the same thing when the user
> clicks
> > "Import contacts from SIM card" on the settings or empty list page.
> Currently
> > we just show the message "SIM card is empty" which is misleading.
>
> What should be the behavior if only one of the SIM card is blocked? Should I
> show the contacts for the unlocked ones? Or should I show the message to
> unlock the SIM?

You should show the unlocked ones and also show a message indicating that one of the sims is locked.

Revision history for this message
Bill Filler (bfiller) wrote :

also make sure to add the new strings to the pot file

410. By Renato Araujo Oliveira Filho

Display network name for each SIM card.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
411. By Renato Araujo Oliveira Filho

Show information about locked sims.

412. By Renato Araujo Oliveira Filho

Use sim card labels in import page .

413. By Renato Araujo Oliveira Filho

Call sim card unlock page instead of open system settings when hitting unlock button.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
414. By Renato Araujo Oliveira Filho

Added dbus as build dep.

415. By Renato Araujo Oliveira Filho

Fixed clenup function for contact list view test.

416. By Renato Araujo Oliveira Filho

Show loding message while unlocking a SIM card.

417. By Renato Araujo Oliveira Filho

Trunk Merged.

418. By Renato Araujo Oliveira Filho

Updated pot file.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
419. By Renato Araujo Oliveira Filho

Does not show loading message if all sim cards are locked.

420. By Renato Araujo Oliveira Filho

Fixed "loading..." message visibility.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? 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? YES

If you changed UI labels, did you update the pot file? YES

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
421. By Renato Araujo Oliveira Filho

Show "Unlocking.." message after the sim card be unlocked and "PhoneBook" interface is unavailable.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
422. By Renato Araujo Oliveira Filho

Disable "Import from sim" option if no sim is present.

423. By Renato Araujo Oliveira Filho

Disable "import from sim" button on contact list if no sim is present.

424. By Renato Araujo Oliveira Filho

added missing dep.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) :
review: Needs Information
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
425. By Renato Araujo Oliveira Filho

Use the temporary path returned by Qt to store the sim card import contacts.
Make sure that the imported contacts temporary file get deleted by the app.

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

Looks good to me now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Seems approved.

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