Merge lp:~nik90/ubuntu-clock-app/implement-alarm-status into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixes the looping issue with regards to the alarm status toggling.

Fixes the looping issue with regards to the alarm status toggling.

[lp:~nik90/ubuntu-clock-app/implement-alarm-status]

54. By Nekhelesh Ramananthan on 2014-08-20

Removed left over variable

[Zsombor Egri (zsombi)]

A small comment inline, no more. Good to go.

review: Approve

[lp:~nik90/ubuntu-clock-app/implement-alarm-status]

55. By Nekhelesh Ramananthan on 2014-08-20

Improved comment

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/238/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/86
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/238

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/238/rebuild

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-08-10 17:11:14 +0000
+++ app/alarm/AlarmDelegate.qml	2014-08-20 08:22:44 +0000
@@ -82,14 +82,30 @@
             verticalCenter: parent.verticalCenter
         }
 
-        checked: enabled
+        onCheckedChanged: {
+            if (checked !== model.enabled) {
+                model.enabled = checked
+                model.save()
+            }
+        }
+
+        Connections {
+            target: model
+            onStatusChanged: {
+                /*
+                 Update switch value only when the alarm save() operation
+                 is complete to avoid switching it back.
+                */
+                if (model.status === Alarm.Ready) {
+                    alarmStatus.checked = model.enabled;
+                }
+            }
+        }
 
         /*
-             #TODO: Add the ability to enable/disable alarms using the
-             switch. At the moment it only shows the alarm status.
-             This was postponed since a similar implementation in the
-             old clock app caused it to loop. So if user clicks on the
-             switch, it disables and then re-enables the alarm again.
-            */
+         Assign switch value only once at startup. After this, the switch will
+         be updated after the alarm save() operations only.
+        */
+        Component.onCompleted: alarmStatus.checked = model.enabled
     }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-19 20:25:21 +0000
+++ debian/changelog	2014-08-20 08:22:44 +0000
@@ -13,6 +13,10 @@
   * Added support to play alarm sound preview when selecting them in the alarm
     sound page. (LP: #1355410)
 
+  [Zsombor Egri]
+  * Fixed alarm status toggle being reverted immediately (LP: #1272337)
+  * Deleting an alarm causing the others to activate (if they were disabled) (LP: #1358315)
+
   [David Planella]
   * Added internationalization support (LP: #1354522)