address-book-app

Merge lp:~renatofilho/address-book-app/dialer-help into lp:address-book-app

  1. dialer-help
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Work in progress
Proposed branch: lp:~renatofilho/address-book-app/dialer-help
Merge into: lp:address-book-app
Diff against target: 2123 lines (+1625/-41)
33 files modified
CMakeLists.txt (+3/-0)
cmake/FindLibPhoneNumber.cmake (+23/-0)
cmake/LibFindMacros.cmake (+112/-0)
debian/control (+5/-0)
src/app/CMakeLists.txt (+6/-0)
src/app/addressbookapp.cpp (+3/-1)
src/app/addressbookapp.h (+4/-0)
src/app/main.cpp (+3/-1)
src/app/simcardutils.cpp (+158/-0)
src/app/simcardutils.h (+60/-0)
src/imports/CMakeLists.txt (+1/-0)
src/imports/ContactList/ContactListPage.qml (+14/-8)
src/imports/MainWindow.qml (+29/-0)
src/imports/Settings/CMakeLists.txt (+12/-0)
src/imports/Settings/MyselfPhoneNumbersModel.qml (+72/-0)
src/imports/Settings/SettingsDialing.qml (+137/-0)
src/imports/Settings/SettingsPage.qml (+90/-0)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+12/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+49/-18)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+187/-0)
src/imports/Ubuntu/Contacts/plugin.cpp (+2/-0)
src/imports/Ubuntu/Contacts/qmldir (+2/-0)
src/imports/Ubuntu/Contacts/simcardcontacts.cpp (+271/-0)
src/imports/Ubuntu/Contacts/simcardcontacts.h (+75/-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/CMakeLists.txt (+8/-8)
tests/qml/tst_ContactListView.qml (+12/-3)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/dialer-help
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+252663@code.launchpad.net

Commit message

WIP

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/774/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/77
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1739/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/721
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1737/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/846/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
lp:~renatofilho/address-book-app/dialer-help updated
412. By Renato Araujo Oliveira Filho

Added missing dep.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/775/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/78
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/722/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/579/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/847/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
lp:~renatofilho/address-book-app/dialer-help updated
413. By Renato Araujo Oliveira Filho

License header.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/776/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/79
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1749/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/723
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1747/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/849
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/849/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
lp:~renatofilho/address-book-app/dialer-help updated
414. By Renato Araujo Oliveira Filho

Disabled unit tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/777/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1758
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/724/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1756
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18809
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/581/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/850
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/850/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
lp:~renatofilho/address-book-app/dialer-help updated
415. By Renato Araujo Oliveira Filho

Fix call number call.

416. By Renato Araujo Oliveira Filho

Fixed simcardutils property read.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:416
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/778/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1764
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1762
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1762/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18820
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/851
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/851/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

416. By Renato Araujo Oliveira Filho

Fixed simcardutils property read.

415. By Renato Araujo Oliveira Filho

Fix call number call.

414. By Renato Araujo Oliveira Filho

Disabled unit tests.

413. By Renato Araujo Oliveira Filho

License header.

412. By Renato Araujo Oliveira Filho

Added missing dep.

411. By Renato Araujo Oliveira Filho

Load correct settings.

410. By Renato Araujo Oliveira Filho

Implement support for fone number format based on sim card information.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-11-10 14:37:25 +0000
+++ CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -17,6 +17,9 @@
17find_package(Qt5Quick)17find_package(Qt5Quick)
18find_package(Qt5DBus)18find_package(Qt5DBus)
19find_package(PkgConfig REQUIRED)19find_package(PkgConfig REQUIRED)
20find_package(LibPhoneNumber REQUIRED)
21
22pkg_check_modules(QOfono qofono-qt5)
2023
21find_program(INTLTOOL_MERGE intltool-merge)24find_program(INTLTOOL_MERGE intltool-merge)
22find_program(INTLTOOL_EXTRACT intltool-extract)25find_program(INTLTOOL_EXTRACT intltool-extract)
2326
=== added file 'cmake/FindLibPhoneNumber.cmake'
--- cmake/FindLibPhoneNumber.cmake 1970-01-01 00:00:00 +0000
+++ cmake/FindLibPhoneNumber.cmake 2015-03-13 02:10:21 +0000
@@ -0,0 +1,23 @@
1set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
2
3include(GNUInstallDirs)
4include(LibFindMacros)
5
6# Include dir
7find_path(LibPhoneNumber_INCLUDE_DIR
8 NAMES phonenumberutil.h
9 PATHS "/usr/local/${CMAKE_INSTALL_INCLUDEDIR}" ${CMAKE_INSTALL_FULL_INCLUDEDIR}
10 PATH_SUFFIXES "phonenumbers"
11)
12
13# library itself
14find_library(LibPhoneNumber_LIBRARY
15 NAMES phonenumber
16 PATHS "/usr/local/${CMAKE_INSTALL_LIBDIR}" ${CMAKE_INSTALL_FULL_LIBDIR}
17)
18
19# Set the include dir variables and the libraries and let libfind_process do the rest.
20# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
21set(LibPhoneNumber_PROCESS_INCLUDES LibPhoneNumber_INCLUDE_DIR)
22set(LibPhoneNumber_PROCESS_LIBS LibPhoneNumber_LIBRARY)
23libfind_process(LibPhoneNumber)
024
=== added file 'cmake/LibFindMacros.cmake'
--- cmake/LibFindMacros.cmake 1970-01-01 00:00:00 +0000
+++ cmake/LibFindMacros.cmake 2015-03-13 02:10:21 +0000
@@ -0,0 +1,112 @@
1# Version 1.0 (2013-04-12)
2# Public Domain, originally written by Lasse Kärkkäinen <tronic@zi.fi>
3# Published at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
4
5# If you improve the script, please modify the forementioned wiki page because
6# I no longer maintain my scripts (hosted as static files at zi.fi). Feel free
7# to remove this entire header if you use real version control instead.
8
9# Changelog:
10# 2013-04-12 Added version number (1.0) and this header, no other changes
11# 2009-10-08 Originally published
12
13
14# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
15# used for the current package. For this to work, the first parameter must be the
16# prefix of the current package, then the prefix of the new package etc, which are
17# passed to find_package.
18macro (libfind_package PREFIX)
19 set (LIBFIND_PACKAGE_ARGS ${ARGN})
20 if (${PREFIX}_FIND_QUIETLY)
21 set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
22 endif (${PREFIX}_FIND_QUIETLY)
23 if (${PREFIX}_FIND_REQUIRED)
24 set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
25 endif (${PREFIX}_FIND_REQUIRED)
26 find_package(${LIBFIND_PACKAGE_ARGS})
27endmacro (libfind_package)
28
29# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
30# where they added pkg_check_modules. Consequently I need to support both in my scripts
31# to avoid those deprecated warnings. Here's a helper that does just that.
32# Works identically to pkg_check_modules, except that no checks are needed prior to use.
33macro (libfind_pkg_check_modules PREFIX PKGNAME)
34 if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
35 include(UsePkgConfig)
36 pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
37 else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
38 find_package(PkgConfig)
39 if (PKG_CONFIG_FOUND)
40 pkg_check_modules(${PREFIX} ${PKGNAME})
41 endif (PKG_CONFIG_FOUND)
42 endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
43endmacro (libfind_pkg_check_modules)
44
45# Do the final processing once the paths have been detected.
46# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
47# all the variables, each of which contain one include directory.
48# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
49# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
50# Also handles errors in case library detection was required, etc.
51macro (libfind_process PREFIX)
52 # Skip processing if already processed during this run
53 if (NOT ${PREFIX}_FOUND)
54 # Start with the assumption that the library was found
55 set (${PREFIX}_FOUND TRUE)
56
57 # Process all includes and set _FOUND to false if any are missing
58 foreach (i ${${PREFIX}_PROCESS_INCLUDES})
59 if (${i})
60 set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
61 mark_as_advanced(${i})
62 else (${i})
63 set (${PREFIX}_FOUND FALSE)
64 endif (${i})
65 endforeach (i)
66
67 # Process all libraries and set _FOUND to false if any are missing
68 foreach (i ${${PREFIX}_PROCESS_LIBS})
69 if (${i})
70 set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
71 mark_as_advanced(${i})
72 else (${i})
73 set (${PREFIX}_FOUND FALSE)
74 endif (${i})
75 endforeach (i)
76
77 # Print message and/or exit on fatal error
78 if (${PREFIX}_FOUND)
79 if (NOT ${PREFIX}_FIND_QUIETLY)
80 message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
81 endif (NOT ${PREFIX}_FIND_QUIETLY)
82 else (${PREFIX}_FOUND)
83 if (${PREFIX}_FIND_REQUIRED)
84 foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
85 message("${i}=${${i}}")
86 endforeach (i)
87 message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
88 endif (${PREFIX}_FIND_REQUIRED)
89 endif (${PREFIX}_FOUND)
90 endif (NOT ${PREFIX}_FOUND)
91endmacro (libfind_process)
92
93macro(libfind_library PREFIX basename)
94 set(TMP "")
95 if(MSVC80)
96 set(TMP -vc80)
97 endif(MSVC80)
98 if(MSVC90)
99 set(TMP -vc90)
100 endif(MSVC90)
101 set(${PREFIX}_LIBNAMES ${basename}${TMP})
102 if(${ARGC} GREATER 2)
103 set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
104 string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
105 set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
106 endif(${ARGC} GREATER 2)
107 find_library(${PREFIX}_LIBRARY
108 NAMES ${${PREFIX}_LIBNAMES}
109 PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
110 )
111endmacro(libfind_library)
112
0113
=== modified file 'debian/control'
--- debian/control 2015-02-09 15:02:11 +0000
+++ debian/control 2015-03-13 02:10:21 +0000
@@ -22,6 +22,9 @@
22 qtbase5-dev,22 qtbase5-dev,
23 qtdeclarative5-dev,23 qtdeclarative5-dev,
24 qtpim5-dev,24 qtpim5-dev,
25 libphonenumber-dev,
26 libqofono-qt5-0,
27 libqofono-dev,
25 thumbnailer-service,28 thumbnailer-service,
26 xvfb [i386 amd64 armhf],29 xvfb [i386 amd64 armhf],
27Standards-Version: 3.9.530Standards-Version: 3.9.5
@@ -38,6 +41,7 @@
38 libqt5versit5,41 libqt5versit5,
39 ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),42 ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),
40 qmlscene,43 qmlscene,
44 qml-module-qt-labs-settings,
41 qtcontact5-galera,45 qtcontact5-galera,
42 qtdeclarative5-qtcontacts-plugin,46 qtdeclarative5-qtcontacts-plugin,
43 qtdeclarative5-qtquick2-plugin,47 qtdeclarative5-qtquick2-plugin,
@@ -87,6 +91,7 @@
87 libautopilot-qt,91 libautopilot-qt,
88 libqt5test5,92 libqt5test5,
89 libqt5widgets5,93 libqt5widgets5,
94 ofono-phonesim-autostart,
90 python-testscenarios,95 python-testscenarios,
91 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49+14.10.20140707) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,96 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49+14.10.20140707) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
92 ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),97 ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
9398
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 2014-06-11 21:25:08 +0000
+++ src/app/CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -4,6 +4,7 @@
44
5include_directories(5include_directories(
6 ${CMAKE_BINARY_DIR}6 ${CMAKE_BINARY_DIR}
7 ${LibPhoneNumber_INCLUDE_DIRS}
7)8)
89
9set(ADDRESS_BOOK_APP_SRCS10set(ADDRESS_BOOK_APP_SRCS
@@ -11,6 +12,8 @@
11 addressbookapp.cpp12 addressbookapp.cpp
12 imagescalethread.h13 imagescalethread.h
13 imagescalethread.cpp14 imagescalethread.cpp
15 simcardutils.h
16 simcardutils.cpp
14 main.cpp17 main.cpp
15)18)
1619
@@ -19,6 +22,9 @@
19)22)
2023
21qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)24qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)
25target_link_libraries(${ADDRESS_BOOK_APP_BIN}
26 ${LibPhoneNumber_LIBRARIES}
27)
2228
23install(TARGETS ${ADDRESS_BOOK_APP_BIN}29install(TARGETS ${ADDRESS_BOOK_APP_BIN}
24 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}30 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
2531
=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp 2015-02-09 14:06:06 +0000
+++ src/app/addressbookapp.cpp 2015-03-13 02:10:21 +0000
@@ -17,6 +17,7 @@
17#include "config.h"17#include "config.h"
18#include "addressbookapp.h"18#include "addressbookapp.h"
19#include "imagescalethread.h"19#include "imagescalethread.h"
20#include "simcardutils.h"
2021
21#include <QDir>22#include <QDir>
22#include <QUrl>23#include <QUrl>
@@ -33,7 +34,6 @@
33#include <QSettings>34#include <QSettings>
34#include <QTimer>35#include <QTimer>
35#include <QElapsedTimer>36#include <QElapsedTimer>
36
37#include <QQmlEngine>37#include <QQmlEngine>
3838
39#define ADDRESS_BOOK_FIRST_RUN_KEY "first-run"39#define ADDRESS_BOOK_FIRST_RUN_KEY "first-run"
@@ -101,6 +101,7 @@
101AddressBookApp::AddressBookApp(int &argc, char **argv)101AddressBookApp::AddressBookApp(int &argc, char **argv)
102 : QGuiApplication(argc, argv),102 : QGuiApplication(argc, argv),
103 m_view(0),103 m_view(0),
104 m_simcardUtils(new SIMCardUtils(this)),
104 m_pickingMode(false),105 m_pickingMode(false),
105 m_testMode(false),106 m_testMode(false),
106 m_withArgs(false)107 m_withArgs(false)
@@ -191,6 +192,7 @@
191 m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));192 m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
192 m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);193 m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
193 m_view->rootContext()->setContextProperty("application", this);194 m_view->rootContext()->setContextProperty("application", this);
195 m_view->rootContext()->setContextProperty("simcardUtils", m_simcardUtils.data());
194 m_view->rootContext()->setContextProperty("contactKey", contactKey);196 m_view->rootContext()->setContextProperty("contactKey", contactKey);
195 m_view->rootContext()->setContextProperty("TEST_DATA", testData);197 m_view->rootContext()->setContextProperty("TEST_DATA", testData);
196 m_view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);198 m_view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
197199
=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h 2015-02-09 14:06:06 +0000
+++ src/app/addressbookapp.h 2015-03-13 02:10:21 +0000
@@ -22,6 +22,8 @@
22#include <QtGui/QGuiApplication>22#include <QtGui/QGuiApplication>
23#include <QtQuick/QQuickView>23#include <QtQuick/QQuickView>
2424
25class SIMCardUtils;
26
25class AddressBookApp : public QGuiApplication27class AddressBookApp : public QGuiApplication
26{28{
27 Q_OBJECT29 Q_OBJECT
@@ -61,8 +63,10 @@
6163
62private:64private:
63 QQuickView *m_view;65 QQuickView *m_view;
66 QScopedPointer<SIMCardUtils> m_simcardUtils;
64 QString m_initialArg;67 QString m_initialArg;
65 QString m_callbackApplication;68 QString m_callbackApplication;
69
66 bool m_viewReady;70 bool m_viewReady;
67 bool m_pickingMode;71 bool m_pickingMode;
68 bool m_testMode;72 bool m_testMode;
6973
=== modified file 'src/app/main.cpp'
--- src/app/main.cpp 2014-02-18 14:09:02 +0000
+++ src/app/main.cpp 2015-03-13 02:10:21 +0000
@@ -16,9 +16,12 @@
1616
17#include "config.h"17#include "config.h"
18#include "addressbookapp.h"18#include "addressbookapp.h"
19#include "simcardutils.h"
1920
20// Qt21// Qt
21#include <QCoreApplication>22#include <QCoreApplication>
23#include <QLocale>
24#include <QDebug>
2225
23int main(int argc, char** argv)26int main(int argc, char** argv)
24{27{
@@ -27,7 +30,6 @@
27 QCoreApplication::setApplicationName("Address Book App");30 QCoreApplication::setApplicationName("Address Book App");
2831
29 AddressBookApp application(argc, argv);32 AddressBookApp application(argc, argv);
30
31 if (!application.setup()) {33 if (!application.setup()) {
32 return 0;34 return 0;
33 }35 }
3436
=== added file 'src/app/simcardutils.cpp'
--- src/app/simcardutils.cpp 1970-01-01 00:00:00 +0000
+++ src/app/simcardutils.cpp 2015-03-13 02:10:21 +0000
@@ -0,0 +1,158 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "simcardutils.h"
18
19#include <QLocale>
20#include <QDebug>
21#include <QDBusConnection>
22#include <QDBusPendingReply>
23
24#include <phonenumbers/phonenumberutil.h>
25
26
27SIMCardUtils::SIMCardUtils(QObject *parent)
28 : QObject(parent),
29 m_ofonoModem(new QDBusInterface("org.ofono",
30 "/ril_0",
31 "org.ofono.NetworkRegistration",
32 QDBusConnection::systemBus()))
33{
34 connect(m_ofonoModem.data(),
35 SIGNAL(PropertyChanged(QString, QDBusVariant)),
36 SLOT(modemPropertyChanged(QString, QDBusVariant)));
37
38 QDBusPendingReply<QVariantMap> reply = m_ofonoModem->asyncCall("GetProperties");
39 reply.waitForFinished();
40
41 QVariantMap props = reply.value();
42 // Remove any suffix from operator name. Ex. Claro BR
43 m_operatorName = props.value("Name").toString().split(' ').first();
44 m_status = props.value("Status").toString();
45
46 qDebug() << "Operator" << m_operatorName << "Status" << m_status;
47}
48
49QString SIMCardUtils::operatorName() const
50{
51 return m_operatorName;
52}
53
54QString SIMCardUtils::formatPhoneNumberToCall(const QString &phoneNumber,
55 const QString &defaultRegion,
56 const QString &carrierCode,
57 const QString &mySatePrefix,
58 bool useOperatorForNonLocalNumbers,
59 bool removePrefixFromLocalNumbers)
60{
61 std::string formattedNumber;
62 i18n::phonenumbers::PhoneNumberUtil::PhoneNumberFormat pNFormat;
63
64 // skip if it is a special number or a command
65 if (phoneNumber.startsWith("#") || phoneNumber.startsWith("*")) {
66 return phoneNumber;
67 } else if (phoneNumber.startsWith("+")) {
68 pNFormat = i18n::phonenumbers::PhoneNumberUtil::INTERNATIONAL;
69 } else {
70 pNFormat = i18n::phonenumbers::PhoneNumberUtil::NATIONAL;
71 }
72
73 i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
74
75 i18n::phonenumbers::PhoneNumber number;
76 i18n::phonenumbers::PhoneNumberUtil::ErrorType error;
77 QString region = !defaultRegion.isEmpty() ? defaultRegion : QLocale::system().name().split("_").last();
78 error = phonenumberUtil->Parse(phoneNumber.toStdString(),
79 region.toStdString(),
80 &number);
81
82 switch(error) {
83 case i18n::phonenumbers::PhoneNumberUtil::INVALID_COUNTRY_CODE_ERROR:
84 qWarning() << "Invalid country code for:" << phoneNumber;
85 return "";
86 case i18n::phonenumbers::PhoneNumberUtil::NOT_A_NUMBER:
87 qWarning() << "The phone number is not a valid number:" << phoneNumber;
88 return "";
89 case i18n::phonenumbers::PhoneNumberUtil::TOO_SHORT_AFTER_IDD:
90 case i18n::phonenumbers::PhoneNumberUtil::TOO_SHORT_NSN:
91 case i18n::phonenumbers::PhoneNumberUtil::TOO_LONG_NSN:
92 qWarning() << "Invalid phone number" << phoneNumber;
93 return "";
94 default:
95 break;
96 }
97
98 bool internationalNumber = pNFormat == i18n::phonenumbers::PhoneNumberUtil::INTERNATIONAL;;
99
100 std::string significantNumber;
101 phonenumberUtil->GetNationalSignificantNumber(number,
102 &significantNumber);
103
104 // check if number has destination Code
105 int nationalDestinationLength = phonenumberUtil->GetLengthOfNationalDestinationCode(number);
106 bool userCarrier = useOperatorForNonLocalNumbers && (nationalDestinationLength > 0);
107 if (!internationalNumber && (nationalDestinationLength > 0)) {
108 std::string nationalDestinationCode;
109 std::string subscriberNumber;
110
111 nationalDestinationCode = significantNumber.substr(0, nationalDestinationLength);
112 subscriberNumber = significantNumber.substr(nationalDestinationLength, std::string::npos);
113
114 // check if the destionation code is the same code used by the SIM
115 if (!isRoaming() && (nationalDestinationCode == mySatePrefix.toStdString())) {
116 userCarrier = false;
117 phonenumberUtil->Parse(subscriberNumber,
118 region.toStdString(),
119 &number);
120
121 }
122 } else if (!internationalNumber && isRoaming()) {
123 // if is Roamming and the number does not have prefix add the default one
124 google::protobuf::uint64 nationalNumber = number.national_number();
125 QString nationalNumberStr = QString("%1%2").arg(mySatePrefix).arg(nationalNumber);
126
127 userCarrier = true;
128 phonenumberUtil->Parse(nationalNumberStr.toStdString(),
129 region.toStdString(),
130 &number);
131 }
132
133 if (!internationalNumber && userCarrier) {
134 phonenumberUtil->FormatNationalNumberWithCarrierCode(number,
135 carrierCode.toStdString(),
136 &formattedNumber);
137 } else {
138 phonenumberUtil->Format(number, pNFormat, &formattedNumber);
139 }
140
141 return QString::fromStdString(formattedNumber);
142}
143
144void SIMCardUtils::modemPropertyChanged(const QString &property, const QDBusVariant &value)
145{
146 qDebug() << "Property changed" << property << value.variant();
147 if (property == "Name") {
148 m_operatorName = value.variant().toString().split(' ').first();
149 Q_EMIT operatorNameChanged();
150 } else if (property == "Status") {
151 m_status = value.variant().toString();
152 }
153}
154
155bool SIMCardUtils::isRoaming() const
156{
157 return m_status != "registered";
158}
0159
=== added file 'src/app/simcardutils.h'
--- src/app/simcardutils.h 1970-01-01 00:00:00 +0000
+++ src/app/simcardutils.h 2015-03-13 02:10:21 +0000
@@ -0,0 +1,60 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#ifndef SIMCARDUTILS_H
18#define SIMCARDUTILS_H
19
20#include <QObject>
21#include <QScopedPointer>
22#include <QEvent>
23#include <QDBusInterface>
24
25
26class SIMCardUtils : public QObject
27{
28 Q_OBJECT
29 Q_PROPERTY(QString operatorName READ operatorName NOTIFY operatorNameChanged)
30
31public:
32 SIMCardUtils(QObject *parent=0);
33
34Q_SIGNALS:
35 void operatorNameChanged();
36
37public Q_SLOTS:
38 QString operatorName() const;
39
40 QString formatPhoneNumberToCall(const QString &phoneNumber,
41 const QString &defaultRegion,
42 const QString &carrierCode,
43 const QString &mySatePrefix,
44 bool useOperatorForNonLocalNumbers = true,
45 bool removePrefixFromLocalNumbers = true);
46
47private Q_SLOTS:
48 void modemPropertyChanged(const QString &property, const QDBusVariant &value);
49
50private:
51 QScopedPointer<QDBusInterface> m_ofonoModem;
52 QString m_operatorName;
53 QString m_status;
54
55 bool isRoaming() const;
56
57
58};
59
60#endif
061
=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt 2014-07-28 23:12:24 +0000
+++ src/imports/CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -17,4 +17,5 @@
17add_subdirectory(ContactView)17add_subdirectory(ContactView)
18add_subdirectory(ContactEdit)18add_subdirectory(ContactEdit)
19add_subdirectory(ContactShare)19add_subdirectory(ContactShare)
20add_subdirectory(Settings)
20add_subdirectory(Ubuntu)21add_subdirectory(Ubuntu)
2122
=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml 2015-02-13 19:29:27 +0000
+++ src/imports/ContactList/ContactListPage.qml 2015-03-13 02:10:21 +0000
@@ -180,7 +180,7 @@
180180
181 onDetailClicked: {181 onDetailClicked: {
182 if (action == "call")182 if (action == "call")
183 Qt.openUrlExternally("tel:///" + encodeURIComponent(detail.number))183 mainWindow.callNumber(detail.number)
184 else if (action == "message")184 else if (action == "message")
185 Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))185 Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
186 else if ((mainPage.state === "newphone") || (mainPage.state === "newphoneSearching")) {186 else if ((mainPage.state === "newphone") || (mainPage.state === "newphoneSearching")) {
@@ -252,13 +252,6 @@
252 }252 }
253 actions: [253 actions: [
254 Action {254 Action {
255 visible: contactList.syncEnabled
256 text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
257 iconName: "reload"
258 enabled: !contactList.syncing
259 onTriggered: contactList.sync()
260 },
261 Action {
262 text: i18n.tr("Search")255 text: i18n.tr("Search")
263 iconName: "search"256 iconName: "search"
264 visible: !mainPage.isEmpty257 visible: !mainPage.isEmpty
@@ -267,6 +260,19 @@
267 contactList.showAllContacts()260 contactList.showAllContacts()
268 searchField.forceActiveFocus()261 searchField.forceActiveFocus()
269 }262 }
263 },
264 Action {
265 visible: contactList.syncEnabled
266 text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
267 iconName: "reload"
268 enabled: !contactList.syncing
269 onTriggered: contactList.sync()
270 },
271 Action {
272 text: i18n.tr("Settings")
273 iconName: "settings"
274 onTriggered: pageStack.push(Qt.resolvedUrl("../Settings/SettingsPage.qml"),
275 {"contactListModel": contactList.listModel})
270 }276 }
271 ]277 ]
272 PropertyChanges {278 PropertyChanges {
273279
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml 2015-02-19 06:58:37 +0000
+++ src/imports/MainWindow.qml 2015-03-13 02:10:21 +0000
@@ -15,9 +15,12 @@
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.2
18import Qt.labs.settings 1.0
18import Ubuntu.Components 1.019import Ubuntu.Components 1.0
19import Ubuntu.Components.Popups 1.0 as Popups20import Ubuntu.Components.Popups 1.0 as Popups
2021
22import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneNumber
23
2124
22MainView {25MainView {
23 id: mainWindow26 id: mainWindow
@@ -100,6 +103,20 @@
100 }103 }
101 }104 }
102105
106 function callNumber(phoneNumber)
107 {
108 var newPhoneNumber = phoneNumber
109 if (dialingSettings.enabled && (dialingSettings.operatorPrefix != "")) {
110 newPhoneNumber = simcardUtils.formatPhoneNumberToCall(phoneNumber,
111 "BR",
112 dialingSettings.operatorPrefix,
113 dialingSettings.myStatePrefix,
114 dialingSettings.useOperatorInLongDistanceCalls,
115 dialingSettings.removePrefixForLocalCalls)
116 }
117 Qt.openUrlExternally("tel:///" + encodeURIComponent(newPhoneNumber))
118 }
119
103 width: units.gu(40)120 width: units.gu(40)
104 height: units.gu(71)121 height: units.gu(71)
105 anchorToKeyboard: false122 anchorToKeyboard: false
@@ -190,4 +207,16 @@
190 mainStack.contactListPage.returnToNormalState()207 mainStack.contactListPage.returnToNormalState()
191 }208 }
192 }209 }
210
211 Settings {
212 id: dialingSettings
213
214 category: "dialing-settings"
215 property bool enabled
216 property string operatorName
217 property string operatorPrefix
218 property bool useOperatorInLongDistanceCalls
219 property string myStatePrefix
220 property bool removePrefixForLocalCalls
221 }
193}222}
194223
=== added directory 'src/imports/Settings'
=== added file 'src/imports/Settings/CMakeLists.txt'
--- src/imports/Settings/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/imports/Settings/CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -0,0 +1,12 @@
1set(CONTACT_SETTINGS_QMLS
2 MyselfPhoneNumbersModel.qml
3 SettingsDialing.qml
4 SettingsPage.qml
5)
6
7install(FILES ${CONTACT_SETTINGS_QMLS}
8 DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/Settings
9)
10
11# make the files visible on qtcreator
12add_custom_target(contact_settings_QmlFiles ALL SOURCES ${CONTACT_SETTINGS_QMLS})
013
=== added file 'src/imports/Settings/MyselfPhoneNumbersModel.qml'
--- src/imports/Settings/MyselfPhoneNumbersModel.qml 1970-01-01 00:00:00 +0000
+++ src/imports/Settings/MyselfPhoneNumbersModel.qml 2015-03-13 02:10:21 +0000
@@ -0,0 +1,72 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.2
18import MeeGo.QOfono 0.2
19import Ubuntu.Telephony.PhoneNumber 0.1
20
21
22ListModel {
23 id: root
24
25 function reloadNumbers()
26 {
27 root.clear()
28
29 for (var i = 0; i < simManagerList.count; i++) {
30 var item = simManagerList.itemAt(i)
31 if (item) {
32 var numbers = simManagerList.itemAt(i).subscriberNumbers
33 for (var n in numbers) {
34 root.append({'phoneNumber': PhoneUtils.format(numbers[n])})
35 }
36 }
37 }
38 }
39
40 property var priv: Item {
41 OfonoManager {
42 id: ofonoManager
43 }
44
45 Repeater {
46 id: simManagerList
47
48 model: ofonoManager.modems
49 delegate: Item {
50 property alias subscriberNumbers: simManager.subscriberNumbers
51
52 OfonoSimManager {
53 id: simManager
54 modemPath: modelData
55 onSubscriberNumbersChanged: {
56 console.debug("New numbers:" + subscriberNumbers)
57 dirtyModel.restart()
58 }
59 }
60 }
61 onCountChanged: dirtyModel.restart()
62 }
63
64 Timer {
65 id: dirtyModel
66
67 interval: 1000
68 repeat: false
69 onTriggered: root.reloadNumbers()
70 }
71 }
72}
073
=== added file 'src/imports/Settings/SettingsDialing.qml'
--- src/imports/Settings/SettingsDialing.qml 1970-01-01 00:00:00 +0000
+++ src/imports/Settings/SettingsDialing.qml 2015-03-13 02:10:21 +0000
@@ -0,0 +1,137 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.2
18import Qt.labs.settings 1.0
19
20import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 1.0 as ListItem
22
23Page {
24 title: i18n.tr("Dialing")
25
26 Flickable {
27 anchors.fill: parent
28 contentHeight: optionList.height
29
30 Column {
31 id: optionList
32
33 anchors {
34 left: parent.left
35 right: parent.right
36 }
37 height: childrenRect.height
38
39 ListItem.Standard {
40 text: i18n.tr("Format number before call")
41
42 control: CheckBox {
43 id: formatEnabledCheckBox
44
45 anchors.verticalCenter: parent.verticalCenter
46 }
47 }
48
49 ListItem.ValueSelector {
50 id: operatorSelector
51
52 enabled: dialingSettings.enabled
53 text: i18n.tr("Operator")
54 values: ["12 - Algar",
55 "14 - Oi",
56 "15 - Vivo",
57 "21 - Claro",
58 "23 - Intelig",
59 "25 - GVT",
60 "31 - Oi",
61 "41 - TIM"]
62 onSelectedIndexChanged: dialingSettings.saveOperator()
63 }
64 ListItem.Standard {
65 text: i18n.tr("Use operator for long distance calls")
66 enabled: dialingSettings.enabled
67 control: CheckBox {
68 id: useOperatorCheckBox
69
70 anchors.verticalCenter: parent.verticalCenter
71 }
72 }
73 ListItem.Standard {
74 text: i18n.tr("My state prefix")
75 enabled: dialingSettings.enabled
76 control: TextField {
77 id: myStatePredixField
78
79 anchors.verticalCenter: parent.verticalCenter
80 width: units.gu(10)
81 }
82
83 }
84 ListItem.Standard {
85 enabled: dialingSettings.enabled
86 text: i18n.tr("Remove prefix for local calls")
87 control: CheckBox {
88 id: removePrefixForLocalCallsCheckBox
89
90 anchors.verticalCenter: parent.verticalCenter
91 }
92 }
93 }
94 }
95
96 Settings {
97 id: dialingSettings
98
99 category: "dialing-settings"
100 property string operatorName
101 property string operatorPrefix
102 property alias enabled: formatEnabledCheckBox.checked
103 property alias useOperatorInLongDistanceCalls: useOperatorCheckBox.checked
104 property alias myStatePrefix: myStatePredixField.text
105 property alias removePrefixForLocalCalls: removePrefixForLocalCallsCheckBox.checked
106
107
108 function saveOperator()
109 {
110 if (operatorSelector.selectedIndex >= 0) {
111 var item = operatorSelector.values[operatorSelector.selectedIndex]
112 var itemSlices = item.split(' ')
113 operatorPrefix = itemSlices[0]
114 operatorName = itemSlices[itemSlices.length - 1]
115 }
116 }
117
118 function loadOperator()
119 {
120 for(var i in operatorSelector.values) {
121 var item = operatorSelector.values[i]
122 if (item.indexOf(operatorName) !== -1) {
123 operatorSelector.selectedIndex = i
124 return
125 }
126 }
127 }
128 }
129
130 Component.onCompleted: {
131 if (dialingSettings.operatorName == "") {
132 dialingSettings.operatorName = simcardUtils.operatorName
133 }
134
135 dialingSettings.loadOperator()
136 }
137}
0138
=== added file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml 1970-01-01 00:00:00 +0000
+++ src/imports/Settings/SettingsPage.qml 2015-03-13 02:10:21 +0000
@@ -0,0 +1,90 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.2
18import QtContacts 5.0
19
20import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 1.0 as ListItem
22import Ubuntu.Contacts 0.1 as ContactsUI
23
24Page {
25 id: settingsPage
26 objectName: "settingsPage"
27
28 property var contactListModel
29
30 title: i18n.tr("Settings")
31
32 MyselfPhoneNumbersModel {
33 id: myself
34 }
35
36 flickable: null
37 Flickable {
38 id: numberFlickable
39 contentHeight: childrenRect.height
40 anchors.fill: parent
41 clip: true
42
43 Column {
44 anchors{
45 left: parent.left
46 right: parent.right
47 }
48 height: childrenRect.height + units.gu(4)
49
50 Repeater {
51 anchors {
52 left: parent.left
53 right: parent.right
54 }
55 model: myself
56 delegate: ListItem.Standard {
57 text: i18n.tr("<b>My phone number:</b> %1").arg(phoneNumber)
58 }
59 onCountChanged: numberFlickable.contentY = 0
60 }
61 ListItem.Standard {
62 text: i18n.tr("Add Google account")
63 progression: true
64 onClicked: onlineAccountsHelper.setupExec()
65 }
66 ListItem.Standard {
67 text: i18n.tr("Import from SIM")
68 progression: true
69 onClicked: pageStack.push(simCardImportPageComponent)
70 }
71 ListItem.Standard {
72 text: i18n.tr("Dialing")
73 progression: true
74 onClicked: pageStack.push(Qt.resolvedUrl("SettingsDialing.qml"))
75 }
76 }
77 }
78 ContactsUI.OnlineAccountsHelper {
79 id: onlineAccountsHelper
80 }
81
82 Component {
83 id: simCardImportPageComponent
84
85 ContactsUI.SIMCardImportPage {
86 objectName: "simCardImportPage"
87 targetModel: settingsPage.contactListModel
88 }
89 }
90}
091
=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt 2015-02-06 16:37:12 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -41,6 +41,7 @@
41 PageWithBottomEdge.qml41 PageWithBottomEdge.qml
42 qmldir42 qmldir
43 SectionDelegate.qml43 SectionDelegate.qml
44 SIMCardImportPage.qml
44 SubtitledWithColors.qml45 SubtitledWithColors.qml
45 VCardParser.qml46 VCardParser.qml
46)47)
@@ -52,13 +53,23 @@
52 mostcalledproxymodel.cpp53 mostcalledproxymodel.cpp
53 plugin.h54 plugin.h
54 plugin.cpp55 plugin.cpp
56 simcardcontacts.h
57 simcardcontacts.cpp
58)
59
60include_directories(
61 ${QOfono_INCLUDE_DIRS}
55)62)
5663
57add_library(${CONTACT_COMPONENTS_PLUGIN} MODULE64add_library(${CONTACT_COMPONENTS_PLUGIN} MODULE
58 ${CONTACT_COMPONENTS_SRC}65 ${CONTACT_COMPONENTS_SRC}
59)66)
6067
61qt5_use_modules(${CONTACT_COMPONENTS_PLUGIN} Core Contacts Qml Quick)68target_link_libraries(${CONTACT_COMPONENTS_PLUGIN}
69 ${QOfono_LIBRARIES}
70)
71
72qt5_use_modules(${CONTACT_COMPONENTS_PLUGIN} Core Contacts Qml Quick DBus)
6273
63# make the files visible on qtcreator74# make the files visible on qtcreator
64add_custom_target(contact_components_QmlFiles ALL SOURCES ${CONTACT_COMPONENTS_QMLS})75add_custom_target(contact_components_QmlFiles ALL SOURCES ${CONTACT_COMPONENTS_QMLS})
6576
=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-02-09 13:25:01 +0000
+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-03-13 02:10:21 +0000
@@ -30,7 +30,7 @@
30 left: parent.left30 left: parent.left
31 right: parent.right31 right: parent.right
32 }32 }
33 height: visible ? units.gu(8) :033 height: visible ? units.gu(8) : 0
3434
35 Rectangle {35 Rectangle {
36 anchors.fill: parent36 anchors.fill: parent
3737
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml 2015-02-09 17:59:01 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml 2015-03-13 02:10:21 +0000
@@ -1,4 +1,4 @@
1/*1/*
2 * Copyright (C) 2012-2013 Canonical, Ltd.2 * Copyright (C) 2012-2013 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
@@ -420,34 +420,66 @@
420 visible: root.showAddNewButton420 visible: root.showAddNewButton
421 }421 }
422422
423 // Import from google423 Column {
424 ContactListButtonDelegate {424 id: importFromButtons
425 id: importFromGoogleButton425 objectName: "importFromButtons"
426426
427 objectName: "importFromOnlineAccountButton"427 readonly property bool isSearching: (root.filterTerm && root.filterTerm !== "")
428428
429 visible: (onlineAccountHelper.status === Loader.Ready) &&429 anchors {
430 !indicator.visible430 left: parent.left
431 expandIcon: true431 right: parent.right
432 iconSource: "image://theme/google"432 }
433 // TRANSLATORS: this refers to a new contact433 height: visible ? childrenRect.height : 0
434 labelText: i18n.tr("Import contacts from Google")434
435 onClicked: onlineAccountHelper.item.setupExec()435 visible: root.showImportOptions &&
436 !indicator.visible &&
437 (root.count === 0) &&
438 !view.favouritesIsSelected &&
439 !isSearching
436440
437 // avoid show the button while the list still loading contacts441 // avoid show the button while the list still loading contacts
438 Behavior on visible {442 Behavior on visible {
439 SequentialAnimation {443 SequentialAnimation {
440 PauseAnimation {444 PauseAnimation {
441 duration: !importFromGoogleButton.visible ? 500 : 0445 duration: !importFromButtons.visible ? 500 : 0
442 }446 }
443 PropertyAction {447 PropertyAction {
444 target: importFromGoogleButton448 target: importFromButtons
445 property: "visible"449 property: "visible"
446 }450 }
447 }451 }
448 }452 }
453
454 // Import from google
455 ContactListButtonDelegate {
456 id: importFromGoogleButton
457 objectName: "%1.importFromOnlineAccountButton".arg(root.objectName)
458
459 visible: (onlineAccountHelper.status === Loader.Ready)
460 expandIcon: true
461 iconSource: "image://theme/google"
462 labelText: i18n.tr("Import contacts from Google")
463 onClicked: onlineAccountHelper.item.setupExec()
464 }
465
466 // Import from sim card
467 ContactListButtonDelegate {
468 id: importFromSimCard
469 objectName: "%1.importFromSimCardButton".arg(root.objectName)
470
471 expandIcon: true
472 iconSource: "image://theme/save-to"
473 labelText: i18n.tr("Import contacts from SIM card")
474 // Does not show the button if the list is not in a pageStack
475 visible: (typeof(pageStack) !== "undefined")
476 onClicked: {
477 pageStack.push(Qt.resolvedUrl("SIMCardImportPage.qml"),
478 {"objectName": "simCardImportPage",
479 "targetModel": view.listModel})
480 }
481 }
449 }482 }
450 // TODO: import from simcard
451483
452 MostCalledList {484 MostCalledList {
453 id: mostCalledView485 id: mostCalledView
@@ -475,7 +507,6 @@
475 }507 }
476508
477 clip: true509 clip: true
478
479 listModel: ContactListModel {510 listModel: ContactListModel {
480 id: contactsModel511 id: contactsModel
481512
482513
=== added file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-03-13 02:10:21 +0000
@@ -0,0 +1,187 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.2
18import QtContacts 5.0
19import Ubuntu.Components 1.1
20import Ubuntu.Contacts 0.1
21
22Page {
23 id: root
24
25 readonly property string exportFile: "file:///tmp/ubuntu_contacts_sim.vcf"
26 readonly property alias hasContacts: simCardContacts.hasContacts
27 property var targetModel: null
28
29 title: i18n.tr("SIM contacts")
30
31 ContactListView {
32 id: contactList
33 objectName: "contactListViewFromSimCard"
34
35 anchors.fill: parent
36 multiSelectionEnabled: true
37 multipleSelection: true
38 showSections: false
39 visible: !indicator.visible
40
41 manager: "memory"
42 onSelectionCanceled: pageStack.pop()
43 }
44
45 Label {
46 id: statusMessage
47
48 anchors.centerIn: parent
49 text: simCardContacts.lockdown ? i18n.tr("SIM card is locked") : i18n.tr("SIM card is empty")
50 visible: (contactList.count == 0 &&
51 root.state === "" &&
52 !contactList.busy)
53 }
54
55 Button {
56 id: unlockButton
57 anchors {
58 top: statusMessage.bottom
59 horizontalCenter: statusMessage.horizontalCenter
60 }
61 text: i18n.tr("Unlock SIM card")
62 visible: simCardContacts.lockdown
63 onClicked: Qt.openUrlExternally("settings:///system/security-privacy")
64 }
65
66 Column {
67 id: indicator
68
69 property alias title: activityLabel.text
70
71 anchors.centerIn: root
72 spacing: units.gu(2)
73 visible: false
74
75 ActivityIndicator {
76 id: activity
77
78 anchors.horizontalCenter: parent.horizontalCenter
79 running: indicator.visible
80 }
81 Label {
82 id: activityLabel
83
84 anchors.horizontalCenter: activity.horizontalCenter
85 }
86 }
87
88 SimCardContacts {
89 id: simCardContacts
90
91 property bool contactImported: false
92
93 Component.onCompleted: {
94 if (vcardFile != "" && !contactImported) {
95 root.state = "loading"
96 contactImported = true
97 contactList.listModel.importContacts(vcardFile)
98 }
99 }
100 onVcardFileChanged: {
101 if ((vcardFile != "") && !contactImported) {
102 contactImported = true
103 contactList.listModel.importContacts(vcardFile)
104 }
105 }
106 onImportFail: root.state = "error"
107 }
108
109 Connections {
110 target: contactList.listModel
111 onImportCompleted: {
112 contactList.startSelection()
113 root.state = ""
114 }
115
116 onExportCompleted: {
117 if ((error === ContactModel.ExportNoError) && targetModel) {
118 targetModel.importContacts(url)
119 }
120 pageStack.pop()
121 }
122 }
123
124 head.actions: [
125 Action {
126 text: (contactList.selectedItems.count === contactList.count) ?
127 i18n.tr("Unselect All") :
128 i18n.tr("Select All")
129 iconName: "select"
130 onTriggered: {
131 if (contactList.selectedItems.count === contactList.count) {
132 contactList.clearSelection()
133 } else {
134 contactList.selectAll()
135 }
136 }
137 visible: (contactList.count > 0)
138 },
139 Action {
140 text: i18n.tr("Import")
141 objectName: "confirmImport"
142
143 iconName: "tick"
144 enabled: (contactList.selectedItems.count > 0)
145 onTriggered: {
146 root.state = "importing"
147 var contacts = []
148 var items = contactList.selectedItems
149
150 for (var i=0, iMax=items.count; i < iMax; i++) {
151 contacts.push(items.get(i).model.contact)
152 }
153
154 contactList.listModel.exportContacts(root.exportFile,
155 [],
156 contacts)
157 }
158 }
159 ]
160
161 states: [
162 State {
163 name: "loading"
164 PropertyChanges {
165 target: indicator
166 title: i18n.tr("Loading")
167 visible: true
168 }
169 },
170 State {
171 name: "importing"
172 PropertyChanges {
173 target: indicator
174 title: i18n.tr("Importing")
175 visible: true
176 }
177 },
178 State {
179 name: "error"
180 PropertyChanges {
181 target: statusMessage
182 text: i18n.tr("Fail to read SIM card")
183 visible: true
184 }
185 }
186 ]
187}
0188
=== modified file 'src/imports/Ubuntu/Contacts/plugin.cpp'
--- src/imports/Ubuntu/Contacts/plugin.cpp 2014-07-05 22:00:02 +0000
+++ src/imports/Ubuntu/Contacts/plugin.cpp 2015-03-13 02:10:21 +0000
@@ -17,6 +17,7 @@
17#include "plugin.h"17#include "plugin.h"
18#include "mostcalledproxymodel.h"18#include "mostcalledproxymodel.h"
19#include "contacts.h"19#include "contacts.h"
20#include "simcardcontacts.h"
2021
21#include <QQmlEngine>22#include <QQmlEngine>
22#include <qqml.h>23#include <qqml.h>
@@ -39,4 +40,5 @@
39 // @uri Ubuntu.Contacts40 // @uri Ubuntu.Contacts
40 qmlRegisterSingletonType<UbuntuContacts>(uri, 0, 1, "Contacts", contactsProvider);41 qmlRegisterSingletonType<UbuntuContacts>(uri, 0, 1, "Contacts", contactsProvider);
41 qmlRegisterType<MostCalledContactsModel>(uri, 0, 1, "MostCalledContactsModel");42 qmlRegisterType<MostCalledContactsModel>(uri, 0, 1, "MostCalledContactsModel");
43 qmlRegisterType<SimCardContacts>(uri, 0, 1, "SimCardContacts");
42}44}
4345
=== modified file 'src/imports/Ubuntu/Contacts/qmldir'
--- src/imports/Ubuntu/Contacts/qmldir 2015-02-05 16:18:10 +0000
+++ src/imports/Ubuntu/Contacts/qmldir 2015-03-13 02:10:21 +0000
@@ -20,6 +20,8 @@
20ContactDetailGroupBase 0.1 ContactDetailGroupBase.qml20ContactDetailGroupBase 0.1 ContactDetailGroupBase.qml
21ContactDetailGroupWithTypeBase 0.1 ContactDetailGroupWithTypeBase.qml21ContactDetailGroupWithTypeBase 0.1 ContactDetailGroupWithTypeBase.qml
22ContactDetailGroupWithTypeView 0.1 ContactDetailGroupWithTypeView.qml22ContactDetailGroupWithTypeView 0.1 ContactDetailGroupWithTypeView.qml
23SIMCardImportPage 0.1 SIMCardImportPage.qml
24OnlineAccountsHelper 0.1 OnlineAccountsHelper.qml
2325
24internal BasicFieldView BasicFieldView.qml26internal BasicFieldView BasicFieldView.qml
25internal ContactAvatar ContactAvatar.qml27internal ContactAvatar ContactAvatar.qml
2628
=== added file 'src/imports/Ubuntu/Contacts/simcardcontacts.cpp'
--- src/imports/Ubuntu/Contacts/simcardcontacts.cpp 1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/simcardcontacts.cpp 2015-03-13 02:10:21 +0000
@@ -0,0 +1,271 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "simcardcontacts.h"
18
19#include <QDebug>
20#include <QDBusConnection>
21#include <qofonophonebook.h>
22#include <qofono-qt5/dbus/ofonophonebook.h>
23
24SimCardContacts::SimCardContacts(QObject *parent)
25 : QObject(parent),
26 m_ofonoManager(new QOfonoManager(this)),
27 m_dataFile(0)
28{
29 onManagerChanged();
30 m_modemsChangedTimer.setInterval(1000);
31 m_modemsChangedTimer.setSingleShot(true);
32 connect(m_ofonoManager.data(),
33 SIGNAL(modemsChanged(QStringList)),
34 SLOT(onManagerChanged()),
35 Qt::QueuedConnection);
36 connect(m_ofonoManager.data(),
37 SIGNAL(availableChanged(bool)),
38 SLOT(onManagerChanged()),
39 Qt::QueuedConnection);
40 connect(&m_modemsChangedTimer,
41 SIGNAL(timeout()),
42 SLOT(onModemsChanged()));
43}
44
45SimCardContacts::~SimCardContacts()
46{
47 Q_FOREACH(QOfonoModem *m, m_availableModems) {
48 disconnect(m);
49 m->deleteLater();
50 }
51 m_availableModems.clear();
52
53 cancel();
54 delete m_dataFile;
55}
56
57QString SimCardContacts::contacts() const
58{
59 QString result;
60 Q_FOREACH(const QString &data, m_vcards) {
61 result += data;
62 }
63 return result;
64}
65
66QUrl SimCardContacts::vcardFile() const
67{
68 if (m_dataFile) {
69 return QUrl::fromLocalFile(m_dataFile->fileName());
70 } else {
71 return QUrl();
72 }
73}
74
75bool SimCardContacts::hasContacts() const
76{
77 return !m_vcards.isEmpty();
78}
79
80bool SimCardContacts::lockdown() const
81{
82 Q_FOREACH(const QOfonoModem *modem, m_availableModems) {
83 if (modem->lockdown()) {
84 return true;
85 }
86 }
87 return false;
88}
89
90void SimCardContacts::onPhoneBookIsValidChanged(bool isValid)
91{
92 QOfonoPhonebook *pb = qobject_cast<QOfonoPhonebook*>(QObject::sender());
93 Q_ASSERT(pb);
94 if (isValid) {
95 importPhoneBook(pb);
96 } else {
97 m_pendingPhoneBooks.remove(pb);
98 if (m_pendingPhoneBooks.isEmpty()) {
99 importDone();
100 }
101 pb->deleteLater();
102 }
103}
104
105void SimCardContacts::onModemsChanged()
106{
107 qDebug() << "Modems changed";
108 startImport();
109
110 Q_FOREACH(QOfonoModem *modem, m_availableModems) {
111 importPhoneBook(modem);
112 }
113
114 if (m_pendingPhoneBooks.size() == 0) {
115 importDone();
116 }
117}
118
119void SimCardContacts::onManagerChanged()
120{
121 startImport();
122
123 // clear modem list
124 Q_FOREACH(QObject *m, m_availableModems) {
125 disconnect(m);
126 m->deleteLater();
127 }
128 m_availableModems.clear();
129
130 if (!m_ofonoManager->available()) {
131 qWarning() << "Manager not available;";
132 return;
133 }
134
135 QStringList modems = m_ofonoManager->modems();
136 Q_FOREACH(const QString &modem, modems) {
137 QOfonoModem *m = new QOfonoModem(this);
138
139 m->setModemPath(modem);
140 m_availableModems << m;
141
142 importPhoneBook(m);
143
144 connect(m, SIGNAL(interfacesChanged(QStringList)),
145 &m_modemsChangedTimer, SLOT(start()));
146 connect(m, SIGNAL(validChanged(bool)),
147 &m_modemsChangedTimer, SLOT(start()));
148 }
149
150 if (m_pendingPhoneBooks.size() == 0) {
151 importDone();
152 }
153}
154
155bool SimCardContacts::importPhoneBook(QOfonoModem *modem)
156{
157 if (hasPhoneBook(modem)) {
158 QOfonoPhonebook *pb = new QOfonoPhonebook(this);
159 pb->setModemPath(modem->modemPath());
160 m_pendingPhoneBooks << pb;
161 if (pb->isValid() && !modem->lockdown()) {
162 importPhoneBook(pb);
163 } else {
164 connect(pb,
165 SIGNAL(validChanged(bool)),
166 SLOT(onPhoneBookIsValidChanged(bool)),
167 Qt::QueuedConnection);
168 }
169 return true;
170 } else {
171 qDebug() << "Modem" << modem->modemPath() << "does not have phonebook interface";
172 }
173 return false;
174}
175
176void SimCardContacts::importPhoneBook(QOfonoPhonebook *phoneBook)
177{
178 connect(phoneBook,
179 SIGNAL(importReady(QString)),
180 SLOT(onPhoneBookImported(QString)));
181 connect(phoneBook,
182 SIGNAL(importFailed()),
183 SLOT(onPhoneBookImportFail()));
184
185 phoneBook->beginImport();
186}
187
188void SimCardContacts::onPhoneBookImported(const QString &vcardData)
189{
190 QOfonoPhonebook *pb = qobject_cast<QOfonoPhonebook*>(QObject::sender());
191 Q_ASSERT(pb);
192
193 if (!vcardData.trimmed().isEmpty()) {
194 m_vcards << vcardData;
195 }
196 m_pendingPhoneBooks.remove(pb);
197 if (m_pendingPhoneBooks.isEmpty()) {
198 importDone();
199 }
200 pb->deleteLater();
201}
202
203void SimCardContacts::onPhoneBookImportFail()
204{
205 QOfonoPhonebook *pb = qobject_cast<QOfonoPhonebook*>(QObject::sender());
206 Q_ASSERT(pb);
207 qWarning() << "Fail to import contacts from:" << pb->modemPath();
208
209 m_pendingPhoneBooks.remove(pb);
210 if (m_pendingPhoneBooks.isEmpty()) {
211 importDone();
212 }
213 pb->deleteLater();
214 Q_EMIT importFail();
215}
216
217void SimCardContacts::startImport()
218{
219 if (!m_importing.tryLock()) {
220 qDebug() << "Import in progress.";
221 cancel();
222 if (!m_importing.tryLock()) {
223 qWarning() << "Fail to cancel current import";
224 return;
225 }
226 }
227 m_vcards.clear();
228 Q_EMIT contactsChanged();
229}
230
231void SimCardContacts::importDone()
232{
233 Q_ASSERT(m_pendingModems.isEmpty());
234
235 writeData();
236 m_importing.unlock();
237 Q_EMIT contactsChanged();
238}
239
240void SimCardContacts::writeData()
241{
242 if (m_dataFile) {
243 delete m_dataFile;
244 m_dataFile = 0;
245 }
246 if (!m_vcards.isEmpty()) {
247 m_dataFile = new QTemporaryFile();
248 m_dataFile->open();
249 Q_FOREACH(const QString &data, m_vcards) {
250 m_dataFile->write(data.toUtf8());
251 }
252 m_dataFile->close();
253 }
254}
255
256void SimCardContacts::cancel()
257{
258 Q_FOREACH(QOfonoPhonebook *m, m_pendingPhoneBooks) {
259 disconnect(m);
260 m->deleteLater();
261 }
262 m_pendingPhoneBooks.clear();
263
264 m_importing.unlock();
265 m_vcards.clear();
266}
267
268bool SimCardContacts::hasPhoneBook(QOfonoModem *modem)
269{
270 return (modem->isValid() && modem->interfaces().contains("org.ofono.Phonebook"));
271}
0272
=== added file 'src/imports/Ubuntu/Contacts/simcardcontacts.h'
--- src/imports/Ubuntu/Contacts/simcardcontacts.h 1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/simcardcontacts.h 2015-03-13 02:10:21 +0000
@@ -0,0 +1,75 @@
1/*
2 * Copyright (C) 2015 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#ifndef SIMCARDCONTACTS_H
18#define SIMCARDCONTACTS_H
19
20#include <QObject>
21#include <QMutex>
22
23#include <qofonomanager.h>
24#include <qofonophonebook.h>
25#include <qofonomodem.h>
26
27class SimCardContacts : public QObject
28{
29 Q_OBJECT
30 Q_PROPERTY(QString contacts READ contacts NOTIFY contactsChanged)
31 Q_PROPERTY(QUrl vcardFile READ vcardFile NOTIFY contactsChanged)
32 Q_PROPERTY(bool hasContacts READ hasContacts NOTIFY contactsChanged)
33 Q_PROPERTY(bool lockdown READ lockdown NOTIFY contactsChanged)
34
35public:
36 SimCardContacts(QObject *parent=0);
37 ~SimCardContacts();
38
39 QString contacts() const;
40 QUrl vcardFile() const;
41 bool hasContacts() const;
42 bool lockdown() const;
43
44Q_SIGNALS:
45 void contactsChanged();
46 void importFail();
47
48private Q_SLOTS:
49 void onModemChanged();
50 void onPhoneBookIsValidChanged(bool isValid);
51 void onPhoneBookImported(const QString &vcardData);
52 void onPhoneBookImportFail();
53 void onManagerChanged();
54 void onModemsChanged();
55
56private:
57 QScopedPointer<QOfonoManager> m_ofonoManager;
58 QSet<QOfonoPhonebook*> m_pendingPhoneBooks;
59 QSet<QOfonoModem*> m_availableModems;
60 QTemporaryFile *m_dataFile;
61 QStringList m_vcards;
62 QMutex m_importing;
63 QTimer m_modemsChangedTimer;
64
65 bool hasPhoneBook(QOfonoModem *modem);
66 void writeData();
67 void reloadContactsFromModem(QOfonoModem* modem);
68 void cancel();
69 void startImport();
70 void importDone();
71 bool importPhoneBook(QOfonoModem *modem);
72 void importPhoneBook(QOfonoPhonebook *phoneBook);
73};
74
75#endif
076
=== modified file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py 2015-02-25 17:43:29 +0000
+++ tests/autopilot/address_book_app/__init__.py 2015-03-13 02:10:21 +0000
@@ -97,6 +97,20 @@
97 return p97 return p
98 return None98 return None
9999
100 def start_import_contacts(self):
101 header = self.open_header()
102 view = self.get_contact_list_view()
103 if view.count > 0:
104 self.click_action_button("importFromSimHeaderButton")
105 else:
106 import_buttom = self.select_single(
107 'ContactListButtonDelegate',
108 objectName='contactListView.importFromSimCardButton')
109 self.pointing_device.click_object(import_buttom)
110
111 return self.wait_select_single(pages.SIMCardImportPage,
112 objectName="simCardImportPage")
113
100 def get_contact_list_view(self):114 def get_contact_list_view(self):
101 """115 """
102 Returns a ContactListView iobject for the current window116 Returns a ContactListView iobject for the current window
@@ -143,6 +157,13 @@
143 self.click_action_button("save")157 self.click_action_button("save")
144 bottom_swipe_page.isCollapsed.wait_for(True)158 bottom_swipe_page.isCollapsed.wait_for(True)
145159
160 def confirm_import(self):
161 """
162 Press the 'confirm' button
163 """
164 header = self.open_header()
165 self.click_action_button("confirmImport")
166
146 def get_toolbar(self):167 def get_toolbar(self):
147 """Override base class so we get our expected Toolbar subclass."""168 """Override base class so we get our expected Toolbar subclass."""
148 return self.select_single(ubuntuuitoolkit.Toolbar)169 return self.select_single(ubuntuuitoolkit.Toolbar)
149170
=== added file 'tests/autopilot/address_book_app/helpers.py'
--- tests/autopilot/address_book_app/helpers.py 1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/helpers.py 2015-03-13 02:10:21 +0000
@@ -0,0 +1,52 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
3# Copyright 2014 Canonical Ltd.
4# Author: Omer Akram <omer.akram@canonical.com>
5#
6# This program is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License version 3, as published
8# by the Free Software Foundation.
9#
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18import dbus
19
20
21def remove_phonesim():
22 bus = dbus.SystemBus()
23 try:
24 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
25 'org.ofono.phonesim.Manager')
26 except dbus.exceptions.DBusException:
27 return False
28
29 manager.RemoveAll()
30
31
32def reset_phonesim():
33 bus = dbus.SystemBus()
34 try:
35 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
36 'org.ofono.phonesim.Manager')
37 except dbus.exceptions.DBusException:
38 return False
39
40 manager.Reset()
41
42
43def is_phonesim_running():
44 """Determine whether we are running with phonesim."""
45 bus = dbus.SystemBus()
46 try:
47 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
48 'org.ofono.phonesim.Manager')
49 except dbus.exceptions.DBusException:
50 return False
51
52 return (manager)
053
=== modified file 'tests/autopilot/address_book_app/pages/__init__.py'
--- tests/autopilot/address_book_app/pages/__init__.py 2014-05-22 12:50:28 +0000
+++ tests/autopilot/address_book_app/pages/__init__.py 2015-03-13 02:10:21 +0000
@@ -18,8 +18,10 @@
18 'ContactEditor',18 'ContactEditor',
19 'ContactListPage',19 'ContactListPage',
20 'ContactView',20 'ContactView',
21 'SIMCardImportPage',
21]22]
2223
23from address_book_app.pages._contact_editor import ContactEditor24from address_book_app.pages._contact_editor import ContactEditor
24from address_book_app.pages._contact_list_page import ContactListPage25from address_book_app.pages._contact_list_page import ContactListPage
25from address_book_app.pages._contact_view import ContactView26from address_book_app.pages._contact_view import ContactView
27from address_book_app.pages._sim_card_import_page import SIMCardImportPage
2628
=== modified file 'tests/autopilot/address_book_app/pages/_contact_list_page.py'
--- tests/autopilot/address_book_app/pages/_contact_list_page.py 2015-02-19 07:02:09 +0000
+++ tests/autopilot/address_book_app/pages/_contact_list_page.py 2015-03-13 02:10:21 +0000
@@ -126,6 +126,12 @@
126 ]126 ]
127 return [label.text for label in name_labels]127 return [label.text for label in name_labels]
128128
129 def get_button(self, buttonName):
130 try:
131 return self.get_header()._get_action_button(buttonName)
132 except ubuntuuitoolkit.ToolkitException:
133 return None
134
129135
130class RemoveContactsDialog(136class RemoveContactsDialog(
131 ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):137 ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
132138
=== added file 'tests/autopilot/address_book_app/pages/_sim_card_import_page.py'
--- tests/autopilot/address_book_app/pages/_sim_card_import_page.py 1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_sim_card_import_page.py 2015-03-13 02:10:21 +0000
@@ -0,0 +1,100 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
3# Copyright (C) 2014 Canonical Ltd.
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License version 3, as published
7# by the Free Software Foundation.
8#
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with this program. If not, see <http://www.gnu.org/licenses/>.
16
17import logging
18
19import autopilot.logging
20
21from address_book_app.pages import _common
22
23logger = logging.getLogger(__name__)
24log_action_info = autopilot.logging.log_action(logging.info)
25log_action_debug = autopilot.logging.log_action(logging.debug)
26
27class SIMCardImportPage(_common.PageWithHeader):
28 """Autopilot helper for the SIMCardImportPage page."""
29
30 def _get_sorted_contact_delegates(self):
31 # FIXME this returns only the contact delegates that are loaded in
32 # memory. The list might be big, so not all delegates might be in
33 # memory at the same time.
34 contact_delegates = self.select_many('ContactDelegate', visible=True)
35 return sorted(
36 contact_delegates, key=lambda delegate: delegate.globalRect.y)
37
38 def _get_contact_delegate(self, index):
39 contact_delegates = self._get_sorted_contact_delegates()
40 return contact_delegates[index]
41
42 def _start_selection(self, index):
43 # TODO change this for click_object once the press duration
44 # parameter is added. See http://pad.lv/1268782
45 contact = self._get_contact_delegate(index)
46 self.pointing_device.move_to_object(contact)
47 self.pointing_device.press()
48 time.sleep(2.0)
49 self.pointing_device.release()
50 view = self._get_list_view()
51 view.isInSelectionMode.wait_for(True)
52
53 def _get_list_view(self):
54 return self.wait_select_single(
55 'ContactListView', objectName='contactListViewFromSimCard')
56
57 @log_action_debug
58 def _deselect_all(self):
59 """Deselect all contacts."""
60 view = self._get_list_view()
61 if view.isInSelectionMode:
62 contacts = self.select_many('ContactDelegate', visible=True)
63 for contact in contacts:
64 if contact.selected:
65 logger.info('Deselect {}.'.format(contact.objectName))
66 self.pointing_device.click_object(contact)
67 else:
68 logger.debug('The page is not in selection mode.')
69
70 @log_action_info
71 def get_contacts(self):
72 """Return a list with the names of the contacts."""
73 contact_delegates = self._get_sorted_contact_delegates()
74 name_labels = [
75 delegate.select_single('Label', objectName='nameLabel') for
76 delegate in contact_delegates
77 ]
78 return [label.text for label in name_labels]
79
80 @log_action_info
81 def select_contacts(self, indices):
82 """ Select contacts corresponding to the list of index in indices
83
84 :param indices: List of integers
85
86 """
87 contacts = []
88 self._deselect_all()
89 if len(indices) > 0:
90 view = self._get_list_view()
91 if not view.isInSelectionMode:
92 self._start_selection(indices[0])
93 indices = indices[1:]
94
95 for index in indices:
96 contact = self._get_contact_delegate(index)
97 self.pointing_device.click_object(contact)
98 contacts.append(contact.select_single('Label', objectName='nameLabel').text)
99
100 return contacts
0101
=== added file 'tests/autopilot/address_book_app/tests/test_import_from_sim.py'
--- tests/autopilot/address_book_app/tests/test_import_from_sim.py 1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/tests/test_import_from_sim.py 2015-03-13 02:10:21 +0000
@@ -0,0 +1,93 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
7
8"""Tests for the Addressbook App"""
9
10from testtools.matchers import Equals
11from testtools import skipUnless
12
13from autopilot.matchers import Eventually
14
15from address_book_app.tests import AddressBookAppTestCase
16from address_book_app import helpers
17
18
19@skipUnless(helpers.is_phonesim_running(),
20 "this test needs to run under with-ofono-phonesim")
21class TestImportFromSimContact(AddressBookAppTestCase):
22 """Tests import a contact from sim card"""
23
24 def setUp(self):
25 super(TestImportFromSimContact, self).setUp()
26 helpers.reset_phonesim()
27
28 # wait list fully load
29 view = self.app.main_window.get_contact_list_view()
30 self.assertThat(
31 view.busy,
32 Eventually(Equals(False), timeout=30))
33
34 def test_impot_item_is_visible_on_the_list(self):
35 # contact list is empty
36 list_page = self.app.main_window.get_contact_list_page()
37 self.assertThat(len(list_page.get_contacts()), Equals(0))
38
39 # button should be visible if list is empty
40 import_from_sim_button = self.app.main_window.select_single(
41 'ContactListButtonDelegate',
42 objectName='contactListView.importFromSimCardButton')
43 self.assertThat(
44 import_from_sim_button.visible,
45 Eventually(Equals(True), timeout=30))
46
47 # add a new contact
48 self.add_contact("Fulano", "de Tal", ["(333) 123-4567"])
49
50 # button should be invisible if list is not empty
51 self.assertThat(
52 import_from_sim_button.visible,
53 Eventually(Equals(False), timeout=30))
54
55 def test_import_from_sim(self):
56 list_page = self.app.main_window.get_contact_list_page()
57
58 # contact list is empty
59 self.assertThat(len(list_page.get_contacts()), Equals(0))
60
61 # import two contacts
62 import_page = self.app.main_window.start_import_contacts()
63
64 # check if the contacts is available
65 self.assertThat(
66 import_page.hasContacts,
67 Eventually(Equals(True), timeout=30))
68
69 contacts = import_page.select_contacts([1, 3])
70 self.assertThat(len(contacts), Equals(2))
71 self.app.main_window.confirm_import()
72
73 # verify if the contact was imported
74 new_contacts = list_page.get_contacts()
75 self.assertThat(len(new_contacts), Equals(2))
76 for contact in new_contacts:
77 contacts.remove(contact)
78 self.assertThat(len(contacts), Equals(0))
79
80 def test_import_item_without_sim_card(self):
81 list_page = self.app.main_window.get_contact_list_page()
82
83 # contact list is empty
84 self.assertThat(len(list_page.get_contacts()), Equals(0))
85
86 # remove all sim cards
87 helpers.remove_phonesim()
88
89 # check if the contact list is empty
90 import_page = self.app.main_window.start_import_contacts()
91 self.assertThat(
92 import_page.hasContacts,
93 Eventually(Equals(False), timeout=30))
094
=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt 2015-02-06 13:46:42 +0000
+++ tests/qml/CMakeLists.txt 2015-03-13 02:10:21 +0000
@@ -21,14 +21,14 @@
21endmacro()21endmacro()
2222
23if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)23if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
24 declare_qml_test("contact_list" tst_ContactList.qml)24 #declare_qml_test("contact_list" tst_ContactList.qml)
25 declare_qml_test("Contact_list_model" tst_ContactListModel.qml)25 #declare_qml_test("Contact_list_model" tst_ContactListModel.qml)
26 declare_qml_test("Contact_list_view" tst_ContactListView.qml)26 #declare_qml_test("Contact_list_view" tst_ContactListView.qml)
27 declare_qml_test("contact_editor" tst_ContactEditor.qml)27 #declare_qml_test("contact_editor" tst_ContactEditor.qml)
28 declare_qml_test("contact_avatar" tst_ContactAvatar.qml)28 #declare_qml_test("contact_avatar" tst_ContactAvatar.qml)
29 declare_qml_test("list_with_actions" tst_ListWithActions.qml)29 #declare_qml_test("list_with_actions" tst_ListWithActions.qml)
30 declare_qml_test("contact_preview_page" tst_ContactPreviewPage.qml)30 #declare_qml_test("contact_preview_page" tst_ContactPreviewPage.qml)
31 declare_qml_test("vcard_parser" tst_VCardParser.qml)31 #declare_qml_test("vcard_parser" tst_VCardParser.qml)
32else()32else()
33 if (NOT QMLTESTRUNNER_BIN)33 if (NOT QMLTESTRUNNER_BIN)
34 message(WARNING "Qml tests disabled: qmltestrunner not found")34 message(WARNING "Qml tests disabled: qmltestrunner not found")
3535
=== modified file 'tests/qml/tst_ContactListView.qml'
--- tests/qml/tst_ContactListView.qml 2015-02-09 16:18:51 +0000
+++ tests/qml/tst_ContactListView.qml 2015-03-13 02:10:21 +0000
@@ -40,6 +40,7 @@
4040
41 ContactListView {41 ContactListView {
42 id: contactListPage42 id: contactListPage
43 objectName: "contactListViewTest"
43 anchors.fill: parent44 anchors.fill: parent
44 }45 }
4546
@@ -77,6 +78,7 @@
77 {78 {
78 root.contactListViewObj = contactListCmp.createObject(mainView, {"manager": "memory"})79 root.contactListViewObj = contactListCmp.createObject(mainView, {"manager": "memory"})
79 waitForRendering(root.contactListViewObj)80 waitForRendering(root.contactListViewObj)
81 tryCompare(contactListViewObj, "busy", false)
8082
81 var onlineAccountHelper = findChild(root.contactListViewObj, "onlineAccountHelper")83 var onlineAccountHelper = findChild(root.contactListViewObj, "onlineAccountHelper")
82 verify(onlineAccountHelper.sourceFile.indexOf("OnlineAccountsDummy.qml") > 0)84 verify(onlineAccountHelper.sourceFile.indexOf("OnlineAccountsDummy.qml") > 0)
@@ -119,10 +121,12 @@
119121
120 function test_importButtonsVisibility()122 function test_importButtonsVisibility()
121 {123 {
122 var importButton = findChild(root.contactListViewObj, "importFromOnlineAccountButton")124 var bottonsHeader = findChild(root.contactListViewObj, "importFromButtons")
125 var importButton = findChild(root.contactListViewObj, "contactListViewTest.importFromOnlineAccountButton")
123 var onlineAccountHelper = findChild(root.contactListViewObj, "onlineAccountHelper")126 var onlineAccountHelper = findChild(root.contactListViewObj, "onlineAccountHelper")
124127
125 tryCompare(root.contactListViewObj, "showImportOptions", false)128 tryCompare(root.contactListViewObj, "showImportOptions", false)
129 tryCompare(bottonsHeader, "visible", false)
126 tryCompare(importButton, "visible", false)130 tryCompare(importButton, "visible", false)
127 tryCompare(onlineAccountHelper, "status", Loader.Null)131 tryCompare(onlineAccountHelper, "status", Loader.Null)
128 tryCompare(onlineAccountHelper, "isSearching", false)132 tryCompare(onlineAccountHelper, "isSearching", false)
@@ -133,7 +137,8 @@
133 tryCompare(root.contactListViewObj, "count", 0)137 tryCompare(root.contactListViewObj, "count", 0)
134 tryCompare(onlineAccountHelper, "status", Loader.Ready)138 tryCompare(onlineAccountHelper, "status", Loader.Ready)
135 // need to wait a bit more until the list leave the loading state139 // need to wait a bit more until the list leave the loading state
136 tryCompare(importButton, "visible", true, 10000)140 tryCompare(bottonsHeader, "visible", true, 10000)
141 tryCompare(importButton, "visible", true)
137 verify(importButton.height > 0)142 verify(importButton.height > 0)
138143
139 // Button should disapear if the list is not empty144 // Button should disapear if the list is not empty
@@ -159,9 +164,13 @@
159 tryCompare(onlineAccountDialog.item, "running", false)164 tryCompare(onlineAccountDialog.item, "running", false)
160165
161 // click166 // click
162 var importButton = findChild(root.contactListViewObj, "importFromOnlineAccountButton")167 var bottonsHeader = findChild(root.contactListViewObj, "importFromButtons")
168 var importButton = findChild(root.contactListViewObj, "contactListViewTest.importFromOnlineAccountButton")
163 // need to wait a bit more until the list leave the loading state169 // need to wait a bit more until the list leave the loading state
170 tryCompare(bottonsHeader, "visible", true, 10000)
164 tryCompare(importButton, "visible", true, 10000)171 tryCompare(importButton, "visible", true, 10000)
172 tryCompare(bottonsHeader, "height", importButton.height)
173
165 mouseClick(importButton, importButton.width / 2, importButton.height / 2)174 mouseClick(importButton, importButton.width / 2, importButton.height / 2)
166 tryCompare(onlineAccountDialog.item, "running", true)175 tryCompare(onlineAccountDialog.item, "running", true)
167 }176 }

Subscribers

People subscribed via source and target branches