Merge lp:~zsombi/ubuntu-ui-toolkit/expose-alarm-id into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Exposing Alarm.identifier and AlarmModel.find(identifier) API. Introduces alarm data versioning, introducing the version 1.1, all previous data being of version 1.0. Handles alarm data upgrades.

Exposing Alarm.identifier and AlarmModel.find(identifier) API. Introduces alarm data versioning, introducing the version 1.1, all previous data being of version 1.0. Handles alarm data upgrades.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1431
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1604/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/334
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2003
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2003/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19225

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1604/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

442 UCAlarm::~UCAlarm()
443 {
444 + if (!objectName().isEmpty()) {
445 + qDebug() << "DESTROYING" << objectName();
446 + }

Forgotten debug line? Or if this was intentional it should be a critical.

review: Approve

[Zsombor Egri (zsombi)]

> 442 UCAlarm::~UCAlarm()
> 443 {
> 444 + if (!objectName().isEmpty()) {
> 445 + qDebug() << "DESTROYING" << objectName();
> 446 + }
>
> Forgotten debug line? Or if this was intentional it should be a critical.

Fixed. Thanks!

[Cris Dywan (kalikiana)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1433
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1622/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/352
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/349
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2077
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2077/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19346

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1622/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1626/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/356
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2085
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19356

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1626/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1680/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/410
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2304
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19738

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1680/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/979/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/287/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/286/console

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/expose-alarm-id]

1436. By Zsombor Egri on 2015-07-27

staging sync

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2054/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/784
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/784/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/781

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2054/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

What's up with this?

review: Needs Information

Unmerged revisions

1436. By Zsombor Egri on 2015-07-27

staging sync

1435. By Zsombor Egri on 2015-04-17

staging sync

1434. By Zsombor Egri on 2015-04-01

rogue debug removed

1433. By Zsombor Egri on 2015-04-01

staging merge

1432. By Zsombor Egri on 2015-04-01

alarms returned by get() and find() invokables are hashed to avoid OOM situation

1431. By Zsombor Egri on 2015-03-27

tests

1430. By Zsombor Egri on 2015-03-26

move JSON conversions into AlarmDataAdapter; data version handling added

1429. By Zsombor Egri on 2015-03-26

moving common code in separate functions

1428. By Zsombor Egri on 2015-03-26

store alarm ID as separate extended detail from activation URL; use private getter fro identifier, should be applied for the entire property set to simplify the code

1427. By Zsombor Egri on 2015-03-26

AlarmModel.find added

=== modified file 'components.api'
--- components.api	2015-07-24 13:31:03 +0000
+++ components.api	2015-07-27 08:49:11 +0000
@@ -81,11 +81,12 @@
 Ubuntu.Components.ActivityIndicator 1.3: AnimatedItem
     property bool onScreen
     property bool running
-Ubuntu.Components.Alarm 1.0 0.1: QtObject
+Ubuntu.Components.Alarm 1.2 1.0 0.1: QtObject
     property QDateTime date
     property DaysOfWeek daysOfWeek
     property bool enabled
     readonly property int error
+    readonly property string identifier 1.2
     property string message
     function save()
     function cancel()
@@ -134,10 +135,11 @@
     Fail
     InProgress
     Ready
-Ubuntu.Components.AlarmModel 1.0 0.1: QAbstractListModel
+Ubuntu.Components.AlarmModel 1.2 1.0 0.1: QAbstractListModel
     readonly property int count
-    function refresh() 1.0
+    function refresh() 1.2
     function UCAlarm* get(int index)
+    function UCAlarm* find(string alarmId) 1.2
 Ubuntu.Components.Argument 1.0 0.1: QtObject
     property string help
     function var at(int i)

=== modified file 'src/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-03-24 16:51:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-07-27 08:49:11 +0000
@@ -29,6 +29,8 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
+#include <QtCore/QUuid>
+#include <QtCore/QUrlQuery>
 #include <QtCore/QDebug>
 
 #define ALARM_DATABASE          "%1/alarms.json"
@@ -43,11 +45,46 @@
 #define ALARM_COLLECTION        "Alarms"
 
 // special tags used as workaround for bug #1361702
-const char *tagAlarmService = "x-canonical-alarm";
-const char *tagDisabledAlarm = "x-canonical-disabled";
+const char *tagAlarmService     = "x-canonical-alarm";
+const char *tagDisabledAlarm    = "x-canonical-disabled";
+const char *tagAlarmVersion     = "x-canonical-alarm-version";
+const char *tagAlarmId          = "x-canonical-alarm-id";
+const char *tagActivationUrl    = "x-canonical-activation-url";
+
+const char *currentAlarmsVersion= "1.1";
 
 QTORGANIZER_USE_NAMESPACE
 
+QString getEventDetail(const QOrganizerItem &item, const char *detailTag)
+{
+    QList<QOrganizerItemDetail> details = item.details(QOrganizerItemDetail::TypeExtendedDetail);
+    for (int i = 0; i < details.count(); i++) {
+        QOrganizerItemDetail detail = details[i];
+        if (detail.value(QOrganizerItemExtendedDetail::FieldName).toString() == QLatin1String(detailTag)) {
+            return detail.value(QOrganizerItemExtendedDetail::FieldData).toString();
+        }
+    }
+    return QString();
+}
+
+void setEventDetail(QOrganizerItem &item, const char *detailTag, const QString &data)
+{
+    // remove all previous identifiers from event
+    QList<QOrganizerItemDetail> details = item.details(QOrganizerItemDetail::TypeExtendedDetail);
+    for (int i = 0; i < details.count(); i++) {
+        QOrganizerItemDetail detail = details[i];
+        if (detail.value(QOrganizerItemExtendedDetail::FieldName).toString() == QLatin1String(detailTag)) {
+            item.removeDetail(&detail);
+            break;
+        }
+    }
+    // save the new detail
+    QOrganizerItemExtendedDetail exData;
+    exData.setName(detailTag);
+    exData.setData(data);
+    item.saveDetail(&exData);
+}
+
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarm Data.
  */
@@ -171,6 +208,43 @@
     return true;
 }
 
+// retrieve the identifier
+QString AlarmDataAdapter::identifier()
+{
+    QString alarmId = getEventDetail(event, tagAlarmId);
+    return alarmId;
+}
+
+// creates a new identifier and sets it to the event
+void AlarmDataAdapter::resetIdentifier(const QString &savedId)
+{
+    QString alarmId = savedId.isNull() ? QUuid::createUuid().toString() : savedId;
+    setEventDetail(event, tagAlarmId, alarmId);
+    changes |= AlarmManager::Identifier;
+
+    // update activation url as well
+    QUrl url("alarm://open");
+    QUrlQuery query;
+    query.addQueryItem("alarmId", alarmId);
+    url.setQuery(query);
+    setEventDetail(event, tagActivationUrl, url.toString());
+}
+
+// upgrade alarm data to the current version; returns true if upgare was needed
+bool AlarmDataAdapter::upgradeAlarmData()
+{
+    QString version = getEventDetail(event, tagAlarmVersion);
+    if (version.isEmpty() || version == QStringLiteral("1.0")) {
+        // version 1.0, upgrade
+        resetIdentifier();
+        // finally upgare to the current version
+        setEventDetail(event, tagAlarmVersion, currentAlarmsVersion);
+        return true;
+    }
+    return false;
+}
+
+
 QVariant AlarmDataAdapter::cookie() const
 {
     return QVariant::fromValue(event.id());
@@ -214,6 +288,12 @@
     if (event.id().managerUri().isEmpty()) {
         changes = AlarmManager::AllFields;
     }
+
+    // make sure the alarm has an identifier set
+    if (identifier().isEmpty()) {
+        resetIdentifier();
+    }
+
     QOrganizerItemSaveRequest *saveRequest = new QOrganizerItemSaveRequest(q_ptr);
     saveRequest->setItem(event);
     request = saveRequest;
@@ -375,6 +455,37 @@
     }
 }
 
+void AlarmDataAdapter::eventFromJson(const QJsonObject &object)
+{
+    q_ptr->setMessage(object["message"].toString());
+    q_ptr->setDate(QDateTime::fromString(object["date"].toString()));
+    q_ptr->setSound(object["sound"].toString());
+    q_ptr->setType(static_cast<UCAlarm::AlarmType>(object["type"].toInt()));
+    q_ptr->setDaysOfWeek(static_cast<UCAlarm::DaysOfWeek>(object["days"].toInt()));
+    q_ptr->setEnabled(object["enabled"].toBool());
+    setEventDetail(event, tagAlarmId, object[tagAlarmId].toString());
+    setEventDetail(event, tagActivationUrl, object[tagActivationUrl].toString());
+    setEventDetail(event, tagAlarmVersion, object[tagAlarmVersion].toString());
+    // call checkAlarm to complete field checks (i.e. type vs daysOfWeek, kick date, etc)
+    checkAlarm();
+}
+
+QJsonObject AlarmDataAdapter::eventToJson()
+{
+    QJsonObject object;
+    object[tagAlarmVersion] = QJsonValue(currentAlarmsVersion);
+    object["message"] = message();
+    object["date"] = date().toString();
+    object["sound"] = sound().toString();
+    object["type"] = QJsonValue(type());
+    object["days"] = QJsonValue(daysOfWeek());
+    object["enabled"] = QJsonValue(enabled());
+    object[tagAlarmId] = QJsonValue(identifier());
+    object[tagActivationUrl] = QJsonValue(getEventDetail(event, tagActivationUrl));
+    return object;
+}
+
+
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarms.
  */
@@ -475,6 +586,9 @@
     if (!file.open(QFile::ReadOnly)) {
         return;
     }
+    // block the manager signals till we load the alarm data into memory
+    manager->blockSignals(true);
+
     QByteArray data = file.readAll();
     QJsonDocument document(QJsonDocument::fromJson(data));
     QJsonArray array = document.array();
@@ -483,20 +597,14 @@
 
         // use UCAlarm to save store JSON data
         UCAlarm alarm;
-        alarm.setMessage(object["message"].toString());
-        alarm.setDate(QDateTime::fromString(object["date"].toString()));
-        alarm.setSound(object["sound"].toString());
-        alarm.setType(static_cast<UCAlarm::AlarmType>(object["type"].toInt()));
-        alarm.setDaysOfWeek(static_cast<UCAlarm::DaysOfWeek>(object["days"].toInt()));
-        alarm.setEnabled(object["enabled"].toBool());
-
         AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
-        // call checkAlarm to complete field checks (i.e. type vs daysOfWeek, kick date, etc)
-        pAlarm->checkAlarm();
+        pAlarm->eventFromJson(object);
         QOrganizerTodo event = pAlarm->data();
         manager->saveItem(&event);
     }
     file.close();
+    // unblock signals
+    manager->blockSignals(false);
 }
 
 // save fallback manager data only
@@ -517,13 +625,8 @@
     for(int i = 0; i < alarmList.count(); i++) {
         // create an UCAlarm and set its event to ease conversions
         const UCAlarm *alarm = alarmList[i];
-        QJsonObject object;
-        object["message"] = alarm->message();
-        object["date"] = alarm->date().toString();
-        object["sound"] = alarm->sound().toString();
-        object["type"] = QJsonValue(alarm->type());
-        object["days"] = QJsonValue(alarm->daysOfWeek());
-        object["enabled"] = QJsonValue(alarm->enabled());
+        AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(alarm));
+        QJsonObject object = pAlarm->eventToJson();
         data.append(object);
 
     }
@@ -662,6 +765,12 @@
     return false;
 }
 
+UCAlarm *AlarmsAdapter::findAlarm(const QString &alarmId) const
+{
+    Q_ASSERT(!alarmId.isEmpty());
+    return const_cast<UCAlarm*>(alarmList.find(alarmId));
+}
+
 // returns a todo event from an ID, which can be an occurence
 QOrganizerTodo AlarmsAdapter::todoItem(const QOrganizerItemId &id)
 {
@@ -756,6 +865,12 @@
 
     QSet<QOrganizerItemId> parentId;
     QOrganizerTodo event;
+    bool upgraded = false;
+
+    // disable manager signals till we fetch the alarms so in case we must upgrade
+    // an alarm we won't get update signals
+    manager->blockSignals(true);
+
     Q_FOREACH(const QOrganizerItem &item, fetchRequest->items()) {
         // repeating alarms may be fetched as occurences, therefore check their parent event
         if (item.type() == QOrganizerItemType::TypeTodoOccurrence) {
@@ -776,10 +891,26 @@
         UCAlarm alarm;
         AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
         pAlarm->setData(event);
+        // check if we need to upgrade the event to the current version
+        if (pAlarm->upgradeAlarmData()) {
+            // use synchronous save so we omit async signal replies
+            event = pAlarm->data();
+            manager->saveItem(&event);
+            saveAlarms();
+            upgraded = true;
+        }
         adjustAlarmOccurrence(*pAlarm);
         alarmList.insert(alarm);
     }
 
+    // save upgrades
+    if (upgraded) {
+        saveAlarms();
+    }
+
+    // re-enable manager signals
+    manager->blockSignals(false);
+
     completed = true;
     Q_EMIT q_ptr->alarmsRefreshed();
 }

=== modified file 'src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-03-24 16:51:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-07-27 08:49:11 +0000
@@ -49,6 +49,8 @@
     bool setDaysOfWeek(UCAlarm::DaysOfWeek days);
     QUrl sound() const;
     bool setSound(const QUrl &sound);
+    QString identifier();
+    void resetIdentifier(const QString &savedId = QString());
     QVariant cookie() const;
     UCAlarm::Error checkAlarm();
 
@@ -62,6 +64,7 @@
 
 // adaptation specific data
     void adjustDowSettings(UCAlarm::AlarmType type, UCAlarm::DaysOfWeek days);
+    bool upgradeAlarmData();
     static QSet<Qt::DayOfWeek> daysToSet(int days);
     static UCAlarm::DaysOfWeek daysFromSet(const QSet<Qt::DayOfWeek> &set);
 
@@ -71,6 +74,9 @@
     }
     void setData(const QOrganizerTodo &data);
 
+    void eventFromJson(const QJsonObject &object);
+    QJsonObject eventToJson();
+
 protected:
     QOrganizerTodo event;
     UCAlarm::AlarmType alarmType;
@@ -140,6 +146,18 @@
         UCAlarm *alarm = takeAt(index);
         delete alarm;
     }
+    // find an alarm from its ID
+    const UCAlarm *find(const QString &alarmId) const
+    {
+        QMapIterator< QPair<QDateTime, QOrganizerItemId>, UCAlarm* > i(data);
+        while (i.hasNext()) {
+            i.next();
+            if (UCAlarmPrivate::get(i.value())->identifier() == alarmId) {
+                return i.value();
+            }
+        }
+        return NULL;
+    }
 
 protected:
     // removes alarm data at index and returns the alarm pointer
@@ -183,6 +201,7 @@
     int alarmCount();
     UCAlarm *getAlarmAt(int index) const;
     bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const;
+    UCAlarm *findAlarm(const QString &alarmId) const;
     void adjustAlarmOccurrence(AlarmDataAdapter &alarm);
 
     void loadAlarms();

=== modified file 'src/Ubuntu/Components/plugin/alarmmanager_p.cpp'
--- src/Ubuntu/Components/plugin/alarmmanager_p.cpp	2015-02-26 15:09:23 +0000
+++ src/Ubuntu/Components/plugin/alarmmanager_p.cpp	2015-07-27 08:49:11 +0000
@@ -78,6 +78,11 @@
     return &alarm;
 }
 
+UCAlarm *AlarmManager::findAlarm(const QString &alarmId) const
+{
+    return d_ptr->findAlarm(alarmId);
+}
+
 bool AlarmManager::verifyChange(UCAlarm *alarm, Change change, const QVariant &newData)
 {
     return d_ptr->verifyChange(alarm, change, newData);

=== modified file 'src/Ubuntu/Components/plugin/alarmmanager_p.h'
--- src/Ubuntu/Components/plugin/alarmmanager_p.h	2015-02-26 10:27:56 +0000
+++ src/Ubuntu/Components/plugin/alarmmanager_p.h	2015-07-27 08:49:11 +0000
@@ -89,6 +89,7 @@
         Sound       = 0x0008,
         Type        = 0x0010,
         Days        = 0x0020,
+        Identifier  = 0x0040,
         AllFields   = 0x00FF
     };
 
@@ -100,6 +101,7 @@
     int alarmCount();
     UCAlarm *alarmAt(int index);
     UCAlarm *findAlarm(const QVariant &cookie) const;
+    UCAlarm *findAlarm(const QString &alarmId) const;
 
     bool verifyChange(UCAlarm *alarm, Change change, const QVariant &newData);
     static UCAlarmPrivate *createAlarmData(UCAlarm *alarm);

=== modified file 'src/Ubuntu/Components/plugin/alarmmanager_p_p.h'
--- src/Ubuntu/Components/plugin/alarmmanager_p_p.h	2015-02-26 15:09:23 +0000
+++ src/Ubuntu/Components/plugin/alarmmanager_p_p.h	2015-07-27 08:49:11 +0000
@@ -47,6 +47,7 @@
     virtual int alarmCount() = 0;
     virtual UCAlarm *getAlarmAt(int index) const = 0;
     virtual bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const = 0;
+    virtual UCAlarm *findAlarm(const QString &alarmId) const = 0;
 
     // function to verify whether the given alarm property has a given value set
     // used for testing purposes

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-07-19 17:44:46 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-07-27 08:49:11 +0000
@@ -197,6 +197,8 @@
     qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
 
     // register 1.2 only API
+    qmlRegisterType<UCAlarm, 1>(uri, 1, 2, "Alarm");
+    qmlRegisterType<UCAlarmModel, 1>(uri, 1, 2, "AlarmModel");
     qmlRegisterType<UCListItem>(uri, 1, 2, "ListItem");
     qmlRegisterType<UCListItemDivider>();
     qmlRegisterUncreatableType<UCSwipeEvent>(uri, 1, 2, "SwipeEvent", "This is an event object.");

=== modified file 'src/Ubuntu/Components/plugin/ucalarm.cpp'
--- src/Ubuntu/Components/plugin/ucalarm.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/ucalarm.cpp	2015-07-27 08:49:11 +0000
@@ -41,6 +41,7 @@
     setMessage(UbuntuI18n::instance().tr("Alarm"));
     setType(UCAlarm::OneTime);
     setDaysOfWeek(UCAlarm::AutoDetect);
+    resetIdentifier();
 }
 
 void UCAlarmPrivate::_q_syncStatus(int operation, int status, int error) {
@@ -64,6 +65,8 @@
                 Q_EMIT q->typeChanged();
             if (changes & AlarmManager::Days)
                 Q_EMIT q->daysOfWeekChanged();
+            if (changes & AlarmManager::Identifier)
+                Q_EMIT q->identifierChanged();
             changes = 0;
         }
 
@@ -482,7 +485,7 @@
  * The property holds the alarm's sound to be played when the alarm is triggered.
  * An empty url will mean to play the default sound.
  *
- * The defaul tvalue is an empty url.
+ * The default value is an empty url.
  */
 QUrl UCAlarm::sound() const
 {
@@ -497,6 +500,14 @@
 }
 
 /*!
+ * \qmlproperty string Alarm::identifier
+ * \readonly
+ * \since Ubuntu.Components 1.2
+ * The property specifies the unique identifier of the alarm. The identifier is
+ * set when created or when \l reset.
+ */
+
+/*!
  * \qmlproperty Error Alarm::error
  * The property holds the error code occurred during the last performed operation.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucalarm.h'
--- src/Ubuntu/Components/plugin/ucalarm.h	2014-10-09 13:02:27 +0000
+++ src/Ubuntu/Components/plugin/ucalarm.h	2015-07-27 08:49:11 +0000
@@ -37,6 +37,7 @@
 
     Q_PROPERTY(int error READ error NOTIFY errorChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PRIVATE_PROPERTY(d_ptr, QString identifier READ identifier NOTIFY identifierChanged REVISION 1)
 
     Q_ENUMS(Status Operation Error AlarmType DayOfWeek)
     Q_FLAGS(DaysOfWeek)
@@ -121,6 +122,8 @@
     void errorChanged();
     void statusChanged(Operation operation);
 
+    Q_REVISION(1) void identifierChanged();
+
 public Q_SLOTS:
     void save();
     void cancel();

=== modified file 'src/Ubuntu/Components/plugin/ucalarm_p.h'
--- src/Ubuntu/Components/plugin/ucalarm_p.h	2015-03-24 16:51:39 +0000
+++ src/Ubuntu/Components/plugin/ucalarm_p.h	2015-07-27 08:49:11 +0000
@@ -51,6 +51,8 @@
     virtual bool setDaysOfWeek(UCAlarm::DaysOfWeek days) = 0;
     virtual QUrl sound() const = 0;
     virtual bool setSound(const QUrl &sound) = 0;
+    virtual QString identifier() = 0;
+    virtual void resetIdentifier(const QString &savedId = QString()) = 0;
     virtual QVariant cookie() const = 0;
     virtual UCAlarm::Error checkAlarm() = 0;
 

=== modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- src/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-06-16 13:15:41 +0000
+++ src/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-07-27 08:49:11 +0000
@@ -22,7 +22,6 @@
 #include "alarmmanager_p.h"
 #include <QtQml/QQmlPropertyMap>
 #include <QtQml/QQmlInfo>
-#include <QtQml/QQmlEngine>
 
 /*!
  * \qmltype AlarmModel
@@ -156,6 +155,19 @@
     refresh();
 }
 
+UCAlarm *UCAlarmModel::hashedAlarm(UCAlarm *alarm)
+{
+    UCAlarm *result = 0;
+    const QString &id = UCAlarmPrivate::get(alarm)->identifier();
+    result = alarmHash.value(id).data();
+    if (!result) {
+        result = new UCAlarm(this);
+        UCAlarmPrivate::get(result)->copyAlarmData(*alarm);
+        alarmHash.insert(id, QPointer<UCAlarm>(result));
+    }
+    return result;
+}
+
 int UCAlarmModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
@@ -215,14 +227,18 @@
  */
 UCAlarm* UCAlarmModel::get(int index)
 {
-    UCAlarm *alarm = AlarmManager::instance().alarmAt(index);
-    if (alarm) {
-        UCAlarm *tempAlarm = new UCAlarm(this);
-        UCAlarmPrivate::get(tempAlarm)->copyAlarmData(*alarm);
-        alarm = tempAlarm;
-        QQmlEngine::setObjectOwnership(tempAlarm, QQmlEngine::JavaScriptOwnership);
-    }
-    return alarm;
+    return hashedAlarm(AlarmManager::instance().alarmAt(index));
+}
+
+/*!
+ * \qmlmethod Alarm AlarmModel::find(string alarmId)
+ * \since Ubuntu.Components 1.2
+ * The function returns the alarm identified by the \c alarmId. The \c alarmId
+ * cannot be an empty string. Returns null on error.
+ */
+UCAlarm *UCAlarmModel::find(const QString &alarmId)
+{
+    return hashedAlarm(AlarmManager::instance().findAlarm(alarmId));
 }
 
 /*!

=== modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.h'
--- src/Ubuntu/Components/plugin/ucalarmmodel.h	2015-06-16 11:34:02 +0000
+++ src/Ubuntu/Components/plugin/ucalarmmodel.h	2015-07-27 08:49:11 +0000
@@ -43,6 +43,7 @@
 
     // invokables
     Q_INVOKABLE UCAlarm *get(int index);
+    Q_REVISION(1) Q_INVOKABLE UCAlarm *find(const QString &alarmId);
 
     // property getters
     int count() const;
@@ -65,7 +66,10 @@
     void moveFinished();
 
 private:
+    QHash<QString, QPointer<UCAlarm> > alarmHash;
     bool m_moved:1;
+
+    UCAlarm *hashedAlarm(UCAlarm *alarm);
 };
 
 #endif // UCALARMSMODEL_H

=== modified file 'tests/resources/alarm/Alarms.qml'
--- tests/resources/alarm/Alarms.qml	2015-03-03 13:20:06 +0000
+++ tests/resources/alarm/Alarms.qml	2015-07-27 08:49:11 +0000
@@ -26,6 +26,8 @@
     height: units.gu(71)
     objectName: "mainView"
 
+    applicationName: "com.canonical.alarmtest"
+
     AlarmModel{
         id: alarmModel
     }

=== modified file 'tests/unit/tst_alarms/tst_alarms.cpp'
--- tests/unit/tst_alarms/tst_alarms.cpp	2014-11-20 06:36:45 +0000
+++ tests/unit/tst_alarms/tst_alarms.cpp	2015-07-27 08:49:11 +0000
@@ -103,6 +103,15 @@
         return false;
     }
 
+    QString createOneTime(const QString &message)
+    {
+        UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::AutoDetect, "test_" + message);
+        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Bliss.ogg"));
+        alarm.save();
+        waitForInsert();
+        return UCAlarmPrivate::get(&alarm)->identifier();
+    }
+
 private Q_SLOTS:
 
     void initTestCase()
@@ -583,6 +592,34 @@
         // check the tags
         QVERIFY(AlarmManager::instance().verifyChange(&alarm, AlarmManager::Enabled, enabled));
     }
+
+    void test_alarm_identifier()
+    {
+        UCAlarm alarm;
+        QVERIFY(!UCAlarmPrivate::get(&alarm)->identifier().isEmpty());
+    }
+
+    void test_alarm_identifier_differs_on_reset()
+    {
+        UCAlarm alarm;
+        QString id = UCAlarmPrivate::get(&alarm)->identifier();
+        alarm.reset();
+        QVERIFY(!UCAlarmPrivate::get(&alarm)->identifier().isEmpty());
+        QVERIFY(UCAlarmPrivate::get(&alarm)->identifier() != id);
+    }
+
+    void test_find_alarm_by_id()
+    {
+        QStringList ids;
+        for (int i = 0; i < 5; i++) {
+            ids << createOneTime(QString("find_alarm_by_id_%1").arg(i));
+        }
+
+        UCAlarmModel model;
+        for (int i = 0; i < ids.count(); i++) {
+            QVERIFY(model.find(ids[i]));
+        }
+    }
 };
 
 QTEST_MAIN(tst_UCAlarms)