Merge lp:~mterry/unity8/oobe-revert-geonames into lp:unity8

[Michał Sawicz]

Revert the use of geonames back to libtimezonemap in the wizard until we can fix a bug with it.

Revert the use of geonames back to libtimezonemap. These changes aren't perfect. It's just going back to an earlier version of the code.

To be fixed up later again to geonames once we fix a mystery freeze.

[Lukáš Tinkl (lukas-kde)]

The changes in qml/Wizard/Pages/passcode-confirm.qml and qml/Wizard/Pages/passcode-set.qml are unrelated and undesired here.

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2159
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/787/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/437
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/437
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/437
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1031
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1046
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1046
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1044/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1044/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1044/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1044/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1044/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1044
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1044/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/787/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

No need after all.

review: Disapprove

Unmerged revisions

2159. By Michael Terry on 2016-03-22

Revert use of geonames

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-22 09:09:22 +0000
+++ CMakeLists.txt	2016-03-03 18:41:20 +0000
@@ -58,7 +58,6 @@
 find_package(Qt5Sql 5.4 REQUIRED)
 
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
-pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
 
=== modified file 'debian/control'
--- debian/control	2016-03-22 09:09:22 +0000
+++ debian/control	2016-03-22 09:09:23 +0000
@@ -15,7 +15,6 @@
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
                libconnectivity-qt1-dev (>= 0.7.1),
                libevdev-dev,
-               libgeonames-dev (>= 0.2),
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],
@@ -29,6 +28,7 @@
                libqt5svg5-dev,
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
+               libtimezonemap1-dev,
                libudev-dev,
                libunity-api-dev (>= 7.107),
                libusermetricsoutput1-dev,
 
=== modified file 'plugins/Wizard/CMakeLists.txt'
--- plugins/Wizard/CMakeLists.txt	2016-03-22 09:09:22 +0000
+++ plugins/Wizard/CMakeLists.txt	2016-03-22 09:09:23 +0000
@@ -1,4 +1,6 @@
-include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
+pkg_search_module(TIMEZONEMAP REQUIRED timezonemap)
+
+include_directories(${GLIB_INCLUDE_DIRS} ${TIMEZONEMAP_INCLUDE_DIRS})
 
 add_library(Wizard-qml MODULE
     plugin.cpp
@@ -10,7 +12,7 @@
 )
 
 qt5_use_modules(Wizard-qml DBus Qml Concurrent)
-target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
+target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${TIMEZONEMAP_LDFLAGS})
 add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
 
 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
 
=== modified file 'plugins/Wizard/plugin.cpp'
--- plugins/Wizard/plugin.cpp	2016-03-22 09:09:22 +0000
+++ plugins/Wizard/plugin.cpp	2016-03-22 09:09:23 +0000
@@ -30,5 +30,6 @@
     qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
     qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
     qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
+    qmlRegisterType<TimeZoneFilterModel>(uri, 0, 1, "TimeZoneFilterModel");
     qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
 }
 
=== modified file 'plugins/Wizard/timezonemodel.cpp'
--- plugins/Wizard/timezonemodel.cpp	2016-03-22 09:09:22 +0000
+++ plugins/Wizard/timezonemodel.cpp	2016-03-22 09:09:23 +0000
@@ -18,15 +18,17 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <timezonemap/tz.h>
 
 #include "LocalePlugin.h"
 #include "timezonemodel.h"
 
 TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
     QAbstractListModel(parent),
-    m_listUpdating(false),
-    m_cancellable(nullptr)
+    m_workerThread(new TimeZonePopulateWorker())
 {
+    qRegisterMetaType<TzLocationWizard>();
+
     m_roleNames[Qt::DisplayRole] = "displayName";
     m_roleNames[TimeZoneRole] = "timeZone";
     m_roleNames[CityRole] = "city";
@@ -34,52 +36,78 @@
     m_roleNames[OffsetRole] = "offset";
     m_roleNames[LatitudeRole] = "latitude";
     m_roleNames[LongitudeRole] = "longitude";
+
+    QObject::connect(m_workerThread,
+                     &TimeZonePopulateWorker::resultReady,
+                     this,
+                     &TimeZoneLocationModel::processModelResult);
+    QObject::connect(m_workerThread,
+                     &TimeZonePopulateWorker::finished,
+                     this,
+                     &TimeZoneLocationModel::store);
+    QObject::connect(m_workerThread,
+                     &TimeZonePopulateWorker::finished,
+                     m_workerThread,
+                     &QObject::deleteLater);
+
+    init();
+}
+
+void TimeZoneLocationModel::init()
+{
+    beginResetModel();
+    m_workerThread->start();
+}
+
+void TimeZoneLocationModel::store()
+{
+    m_workerThread = nullptr;
+    endResetModel();
+}
+
+void TimeZoneLocationModel::processModelResult(const TzLocationWizard &location)
+{
+    m_locations.append(location);
 }
 
 int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
 {
-    if (parent.isValid()) {
+    if (parent.isValid())
         return 0;
-    } else if (m_filter.isEmpty()) {
-        return m_countryLocations.count();
-    } else {
-        return m_locations.count();
-    }
+    return m_locations.count();
 }
 
 QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
 {
-    GeonamesCity *city;
-    if (m_filter.isEmpty()) {
-        city = m_countryLocations.value(index.row());
-    } else {
-        city = m_locations.value(index.row());
-    }
-    if (!city)
+    if (index.row() >= m_locations.count() || index.row() < 0)
         return QVariant();
 
+    const TzLocationWizard tz = m_locations.at(index.row());
+
+    const QString country(tz.full_country.isEmpty() ? tz.country : tz.full_country);
+
     switch (role) {
     case Qt::DisplayRole:
-        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
-                                           .arg(geonames_city_get_state(city))
-                                           .arg(geonames_city_get_country(city));
+        if (!tz.state.isEmpty())
+            return QStringLiteral("%1, %2, %3").arg(tz.city).arg(tz.state).arg(country);
+        else
+            return QStringLiteral("%1, %2").arg(tz.city).arg(country);
     case SimpleRole:
-        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
-                                       .arg(geonames_city_get_country(city));
+        return QStringLiteral("%1, %2").arg(tz.city).arg(country);
     case TimeZoneRole:
-        return geonames_city_get_timezone(city);
+        return tz.timezone;
     case CountryRole:
-        return geonames_city_get_country(city);
+        return tz.country;
     case CityRole:
-        return geonames_city_get_name(city);
+        return tz.city;
     case OffsetRole: {
-        QTimeZone tmp(geonames_city_get_timezone(city));
+        QTimeZone tmp(tz.timezone.toLatin1());
         return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
     }
     case LatitudeRole:
-        return geonames_city_get_latitude(city);
+        return tz.latitude;
     case LongitudeRole:
-        return geonames_city_get_longitude(city);
+        return tz.longitude;
     default:
         qWarning() << Q_FUNC_INFO << "Unknown role";
         return QVariant();
@@ -91,154 +119,110 @@
     return m_roleNames;
 }
 
-void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
-{
-    beginResetModel();
-
-    Q_FOREACH(GeonamesCity *city, m_locations) {
-        geonames_city_free(city);
-    }
-
-    m_locations = locations;
-    endResetModel();
-}
-
-void TimeZoneLocationModel::filterFinished(GObject      *source_object,
-                                           GAsyncResult *res,
-                                           gpointer      user_data)
-{
-    Q_UNUSED(source_object);
-
-    g_autofree gint *cities = nullptr;
-    guint cities_len = 0;
-    g_autoptr(GError) error = nullptr;
-
-    cities = geonames_query_cities_finish(res, &cities_len, &error);
-    if (error) {
-        if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-            TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
-            g_clear_object(&model->m_cancellable);
-            model->setListUpdating(false);
-            qWarning() << "Could not filter timezones:" << error->message;
-        }
-        return;
-    }
-
-    QList<GeonamesCity *> locations;
-
-    for (guint i = 0; i < cities_len; ++i) {
-        GeonamesCity *city = geonames_get_city(cities[i]);
-        if (city) {
-            locations.append(city);
-        }
-    }
-
-    TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
-
-    g_clear_object(&model->m_cancellable);
-
-    model->setModel(locations);
-    model->setListUpdating(false);
-}
-
-bool TimeZoneLocationModel::listUpdating() const
-{
-    return m_listUpdating;
-}
-
-void TimeZoneLocationModel::setListUpdating(bool listUpdating)
-{
-    if (m_listUpdating != listUpdating) {
-        m_listUpdating = listUpdating;
-        Q_EMIT listUpdatingChanged();
-    }
-}
-
-QString TimeZoneLocationModel::filter() const
+void TimeZonePopulateWorker::run()
+{
+    buildCityMap();
+}
+
+void TimeZonePopulateWorker::buildCityMap()
+{
+    TzDB *tzdb = tz_load_db();
+    GPtrArray *tz_locations = tz_get_locations(tzdb);
+
+    TimeZoneLocationModel::TzLocationWizard tmpTz;
+
+    for (guint i = 0; i < tz_locations->len; ++i) {
+        auto tmp = static_cast<CcTimezoneLocation *>(g_ptr_array_index(tz_locations, i));
+        gchar *en_name, *country, *zone, *state, *full_country;
+        gdouble latitude;
+        gdouble longitude;
+        g_object_get (tmp, "en_name", &en_name,
+                      "country", &country,
+                      "zone", &zone,
+                      "state", &state,
+                      "full_country", &full_country,
+                      "latitude", &latitude,
+                      "longitude", &longitude,
+                      nullptr);
+        // There are empty entries in the DB
+        if (g_strcmp0(en_name, "") != 0) {
+            tmpTz.city = en_name;
+            tmpTz.country = country;
+            tmpTz.timezone = zone;
+            tmpTz.state = state;
+            tmpTz.full_country = full_country;
+            tmpTz.latitude = latitude;
+            tmpTz.longitude = longitude;
+
+            Q_EMIT (resultReady(tmpTz));
+        }
+        g_free (en_name);
+        g_free (country);
+        g_free (zone);
+        g_free (state);
+        g_free (full_country);
+    }
+
+    g_ptr_array_free (tz_locations, TRUE);
+    tz_db_free(tzdb);
+}
+
+
+TimeZoneFilterModel::TimeZoneFilterModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    setDynamicSortFilter(false);
+    setSortLocaleAware(true);
+    setSortRole(TimeZoneLocationModel::CityRole);
+    m_stringMatcher.setCaseSensitivity(Qt::CaseInsensitive);
+    sort(0);
+}
+
+bool TimeZoneFilterModel::filterAcceptsRow(int row, const QModelIndex &parentIndex) const
+{
+    if (!sourceModel()) {
+        return true;
+    }
+
+    if (!m_filter.isEmpty()) { // filtering by freeform text input, cf setFilter(QString)
+        const QString city = sourceModel()->index(row, 0, parentIndex).data(TimeZoneLocationModel::CityRole).toString();
+
+        if (m_stringMatcher.indexIn(city) == 0) { // match at the beginning of the city name
+            return true;
+        }
+    } else if (!m_country.isEmpty()) { // filter by country code
+        const QString countryCode = sourceModel()->index(row, 0, parentIndex).data(TimeZoneLocationModel::CountryRole).toString();
+        return m_country.compare(countryCode, Qt::CaseInsensitive) == 0;
+    }
+
+    return false;
+}
+
+QString TimeZoneFilterModel::filter() const
 {
     return m_filter;
 }
 
-void TimeZoneLocationModel::setFilter(const QString &filter)
+void TimeZoneFilterModel::setFilter(const QString &filter)
 {
     if (filter != m_filter) {
         m_filter = filter;
+        m_stringMatcher.setPattern(m_filter);
         Q_EMIT filterChanged();
-    }
-
-    setListUpdating(true);
-
-    if (m_cancellable) {
-        g_cancellable_cancel(m_cancellable);
-        g_clear_object(&m_cancellable);
-    }
-
-    setModel(QList<GeonamesCity *>());
-
-    if (filter.isEmpty()) {
-        setListUpdating(false);
-        return;
-    }
-
-    m_cancellable = g_cancellable_new();
-    geonames_query_cities(filter.toUtf8().data(),
-                          GEONAMES_QUERY_DEFAULT,
-                          m_cancellable,
-                          filterFinished,
-                          this);
+        invalidate();
+    }
 }
 
-QString TimeZoneLocationModel::country() const
+QString TimeZoneFilterModel::country() const
 {
     return m_country;
 }
 
-static bool citycmp(GeonamesCity *a, GeonamesCity *b)
-{
-    return geonames_city_get_population(b) < geonames_city_get_population(a);
-}
-
-void TimeZoneLocationModel::setCountry(const QString &country)
+void TimeZoneFilterModel::setCountry(const QString &country)
 {
     if (m_country == country)
         return;
 
-    beginResetModel();
-
     m_country = country;
-
-    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
-        geonames_city_free(city);
-    }
-    m_countryLocations.clear();
-
-    gint num_cities = geonames_get_n_cities();
-    for (gint i = 0; i < num_cities; i++) {
-        GeonamesCity *city = geonames_get_city(i);
-        if (city && m_country == geonames_city_get_country_code(city)) {
-            m_countryLocations.append(city);
-        }
-    }
-
-    std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
-
-    endResetModel();
-
     Q_EMIT countryChanged(country);
 }
-
-TimeZoneLocationModel::~TimeZoneLocationModel()
-{
-    if (m_cancellable) {
-        g_cancellable_cancel(m_cancellable);
-        g_clear_object(&m_cancellable);
-    }
-
-    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
-        geonames_city_free(city);
-    }
-
-    Q_FOREACH(GeonamesCity *city, m_locations) {
-        geonames_city_free(city);
-    }
-}
 
=== modified file 'plugins/Wizard/timezonemodel.h'
--- plugins/Wizard/timezonemodel.h	2016-03-22 09:09:22 +0000
+++ plugins/Wizard/timezonemodel.h	2016-03-22 09:09:23 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,21 +17,21 @@
 #ifndef TIMEZONEMODEL_H
 #define TIMEZONEMODEL_H
 
-#include <geonames.h>
-#include <glib.h>
 #include <QAbstractListModel>
+#include <QSortFilterProxyModel>
+#include <QThread>
+#include <QtConcurrent>
+#include <QtGui/QImage>
+
+class TimeZonePopulateWorker;
 
 class TimeZoneLocationModel: public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
-    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
-    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
     Q_ENUMS(Roles)
-
 public:
     explicit TimeZoneLocationModel(QObject *parent = nullptr);
-    ~TimeZoneLocationModel();
+    ~TimeZoneLocationModel() = default;
 
     enum Roles {
         TimeZoneRole = Qt::UserRole + 1,
@@ -43,11 +43,56 @@
         LongitudeRole
     };
 
+    struct TzLocationWizard {
+        QString city;
+        QString country;
+        QString timezone;
+        QString state;
+        QString full_country;
+        double latitude;
+        double longitude;
+    };
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    bool listUpdating() const;
+private Q_SLOTS:
+    void processModelResult(const TzLocationWizard &location);
+    void store();
+
+private:
+    void init();
+    QHash<int, QByteArray> m_roleNames;
+    QList<TzLocationWizard> m_locations;
+    TimeZonePopulateWorker *m_workerThread;
+};
+
+Q_DECLARE_METATYPE (TimeZoneLocationModel::TzLocationWizard)
+
+class TimeZonePopulateWorker: public QThread
+{
+    Q_OBJECT
+public:
+    void run() override;
+
+Q_SIGNALS:
+    void resultReady(const TimeZoneLocationModel::TzLocationWizard &tz);
+
+private:
+    void buildCityMap();
+};
+
+class TimeZoneFilterModel: public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
+    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
+
+public:
+    explicit TimeZoneFilterModel(QObject *parent = nullptr);
+    ~TimeZoneFilterModel() = default;
+    bool filterAcceptsRow(int row, const QModelIndex &parentIndex) const override;
 
     QString filter() const;
     void setFilter(const QString &filter);
@@ -56,25 +101,13 @@
     void setCountry(const QString &country);
 
 Q_SIGNALS:
-    void listUpdatingChanged();
     void filterChanged();
     void countryChanged(const QString &country);
 
 private:
-    void setModel(const QList<GeonamesCity *> &locations);
-    void setListUpdating(bool listUpdating);
-    static void filterFinished(GObject      *source_object,
-                               GAsyncResult *res,
-                               gpointer      user_data);
-
-
-    bool m_listUpdating;
     QString m_filter;
+    QStringMatcher m_stringMatcher;
     QString m_country;
-    GCancellable *m_cancellable;
-    QHash<int, QByteArray> m_roleNames;
-    QList<GeonamesCity *> m_locations;
-    QList<GeonamesCity *> m_countryLocations;
 };
 
 #endif
 
=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2016-03-22 09:09:22 +0000
+++ qml/Wizard/Pages.qml	2016-03-22 09:09:23 +0000
@@ -34,12 +34,23 @@
     property int passwordMethod: UbuntuSecurityPrivacyPanel.Passphrase
     property string password: ""
 
+    property string countryCode: "US" // default country (for the timezone page)
     property bool seenSIMPage: false // we want to see the SIM page at most once
 
     property alias modemManager: modemManager
     property alias simManager0: simManager0
     property alias simManager1: simManager1
 
+    TimeZoneModel { // preload the heavy models
+        id: tzModel
+    }
+
+    TimeZoneFilterModel {
+        id: tzFilterModel
+        sourceModel: tzModel
+        country: countryCode
+    }
+
     theme: ThemeSettings {
         name: "Ubuntu.Components.Themes.Ambiance"
     }
 
=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2016-03-22 09:09:22 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2016-03-22 09:09:23 +0000
@@ -157,6 +157,7 @@
                     System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
                 }
                 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
+                root.countryCode = plugin.languageCodes[plugin.currentLanguage].split('_')[1].split('.')[0]; // extract the country code, save it for the timezone page
 
                 if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
                         (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
 
=== modified file 'qml/Wizard/Pages/50-timezone.qml'
--- qml/Wizard/Pages/50-timezone.qml	2016-03-22 09:09:22 +0000
+++ qml/Wizard/Pages/50-timezone.qml	2016-03-22 09:09:23 +0000
@@ -87,6 +87,8 @@
             }
 
             resetViews();
+            tzFilterModel.filter = Qt.binding(function() { return searchField.text; });
+            tzFilterModel.invalidate();
             searchField.forceActiveFocus();
         }
     }
@@ -188,21 +190,9 @@
             anchors.left: parent.left
             anchors.right: parent.right
             currentIndex: -1
-            model: TimeZoneModel {
-                id: timeZoneModel
-                filter: searchField.text
-                country: i18n.language.split('_')[1].split('.')[0]
-            }
+            model: tzFilterModel
             delegate: tzComponent
         }
-
-        ActivityIndicator {
-            anchors.centerIn: tzList
-            running: tzList.count == 0 &&
-                     searchField.length > 0 &&
-                     timeZoneModel.listUpdating
-            visible: running
-        }
     }
 
     Item {
 
=== modified file 'qml/Wizard/Pages/passcode-confirm.qml'
--- qml/Wizard/Pages/passcode-confirm.qml	2016-03-22 09:09:22 +0000
+++ qml/Wizard/Pages/passcode-confirm.qml	2016-03-22 09:09:23 +0000
@@ -37,7 +37,8 @@
     UnityComponents.Lockscreen {
         id: lockscreen
         anchors {
-            fill: content
+            fill: parent
+            topMargin: customMargin
         }
 
         infoText: i18n.tr("Confirm passcode")
 
=== modified file 'qml/Wizard/Pages/passcode-set.qml'
--- qml/Wizard/Pages/passcode-set.qml	2016-03-22 09:09:22 +0000
+++ qml/Wizard/Pages/passcode-set.qml	2016-03-22 09:09:23 +0000
@@ -48,7 +48,8 @@
     UnityComponents.Lockscreen {
         id: lockscreen
         anchors {
-            fill: content
+            fill: parent
+            topMargin: customMargin
         }
 
         infoText: i18n.tr("Choose passcode")
 
=== modified file 'tests/mocks/Wizard/CMakeLists.txt'
--- tests/mocks/Wizard/CMakeLists.txt	2016-03-22 09:09:22 +0000
+++ tests/mocks/Wizard/CMakeLists.txt	2016-03-22 09:09:23 +0000
@@ -1,5 +1,7 @@
+pkg_search_module(TIMEZONEMAP REQUIRED timezonemap)
+
 include_directories(
-    ${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS} ${TIMEZONEMAP_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/plugins/Wizard
 )
 
@@ -13,5 +15,5 @@
 )
 
 qt5_use_modules(MockWizard-qml DBus Qml Concurrent)
-target_link_libraries(MockWizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
+target_link_libraries(MockWizard-qml ${GLIB_LDFLAGS} ${TIMEZONEMAP_LDFLAGS})
 add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)
 
=== modified file 'tests/mocks/Wizard/mockplugin.cpp'
--- tests/mocks/Wizard/mockplugin.cpp	2016-03-22 09:09:22 +0000
+++ tests/mocks/Wizard/mockplugin.cpp	2016-03-22 09:09:23 +0000
@@ -30,5 +30,6 @@
     qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new MockSystem; });
     qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
     qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
+    qmlRegisterType<TimeZoneFilterModel>(uri, 0, 1, "TimeZoneFilterModel");
     qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
 }