diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2015-04-08 11:52:14 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2015-04-09 08:45:16 +0200 |
| commit | 78d1697cd63033244304f7794cf9157029e4fdb5 (patch) | |
| tree | 3a1bdbe3d3706c34a8a7841a1790846599a45c8f /app/qml | |
| parent | cbb0039fe542c0d8281601d25c04de487c84fa17 (diff) | |
Implemented firmwareUpgrade in daemon
Diffstat (limited to 'app/qml')
| -rw-r--r-- | app/qml/pages/WatchPage.qml | 11 | ||||
| -rw-r--r-- | app/qml/pebble.qml | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml index 6c24ef0..55f4db0 100644 --- a/app/qml/pages/WatchPage.qml +++ b/app/qml/pages/WatchPage.qml @@ -5,15 +5,7 @@ import Sailfish.Silica 1.0 Page { id: watchPage - property bool firmwareVersionOK: false - - Component.onCompleted: { - pebbled.info.firmware.forEach(function(firmware){ - if (!firmware.recovery) { - firmwareVersionOK = (firmware.version.indexOf("v1.") !== 0) - } - }) - } + property bool firmwareVersionOK: app.firmwareVersion && app.firmwareVersion.indexOf("v1.") !== 0 SilicaFlickable { id: flickable @@ -78,7 +70,6 @@ Page { from: Theme.primaryColor; to: Theme.highlightColor duration: 2500 loops: Animation.Infinite - easing: { type: Easing.InOutQuint } } } diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml index a4b8b1f..380ff7e 100644 --- a/app/qml/pebble.qml +++ b/app/qml/pebble.qml @@ -32,8 +32,8 @@ ApplicationWindow function notifyNewFirmware() { firmwareLatest = pebbleFirmware.latest.friendlyVersion || "" - if (firmwareLatest && firmwareVersion && firmwareVersion !== firmwareLatest) { - pebbled.notifyFirmware(firmwareLatest); + if (firmwareLatest && firmwareVersion) { + pebbled.notifyFirmware(firmwareVersion === firmwareLatest); } } |