Network Menu

Merge lp://staging/~unity-api-team/indicator-network/data_usage_indication into lp://staging/indicator-network

  1. data_usage_indication
  2. Merge into trunk
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 647
Merged at revision: 640
Proposed branch: lp://staging/~unity-api-team/indicator-network/data_usage_indication
Merge into: lp://staging/indicator-network
Diff against target: 1857 lines (+1001/-84)
35 files modified
data/com.canonical.indicator.network.gschema.xml (+5/-12)
data/nm-device-statistics.xml (+12/-0)
src/CMakeLists.txt (+6/-2)
src/connectivity-api/connectivity-qt/CMakeLists.txt (+1/-10)
src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp (+8/-8)
src/connectivity-api/connectivity-qt/connectivityqt/internal/modems-list-model-parameters.h (+2/-3)
src/connectivity-api/connectivity-qt/connectivityqt/internal/sims-list-model-parameters.h (+2/-2)
src/connectivity-api/connectivity-qt/connectivityqt/internal/vpn-connection-list-model-parameters.h (+2/-2)
src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp (+6/-5)
src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp (+2/-2)
src/connectivity-api/connectivity-qt/connectivityqt/openvpn-connection.cpp (+4/-4)
src/connectivity-api/connectivity-qt/connectivityqt/pptp-connection.cpp (+4/-4)
src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp (+4/-4)
src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp (+2/-2)
src/connectivity-api/connectivity-qt/connectivityqt/vpn-connection.cpp (+4/-4)
src/connectivity-api/connectivity-qt/connectivityqt/vpn-connections-list-model.cpp (+2/-2)
src/indicator/CMakeLists.txt (+1/-4)
src/indicator/nmofono/manager-impl.cpp (+65/-2)
src/indicator/nmofono/manager-impl.h (+4/-0)
src/indicator/nmofono/manager.h (+11/-0)
src/indicator/nmofono/nm-device-statistics-monitor.cpp (+363/-0)
src/indicator/nmofono/nm-device-statistics-monitor.h (+62/-0)
src/indicator/nmofono/wifi/wifi-link-impl.cpp (+2/-1)
src/indicator/nmofono/wwan/modem.cpp (+15/-0)
src/indicator/nmofono/wwan/modem.h (+3/-0)
src/indicator/root-state.cpp (+18/-0)
src/qdbus-stubs/CMakeLists.txt (+14/-0)
src/util/CMakeLists.txt (+5/-2)
src/util/dbus-property-cache.cpp (+2/-5)
src/util/dbus-property-cache.h (+1/-4)
tests/data/networkmanager.py (+71/-0)
tests/integration/CMakeLists.txt (+21/-0)
tests/integration/indicator-network-test-base.cpp (+105/-0)
tests/integration/indicator-network-test-base.h (+15/-0)
tests/integration/test-indicator.cpp (+157/-0)
To merge this branch: bzr merge lp://staging/~unity-api-team/indicator-network/data_usage_indication
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+309640@code.staging.launchpad.net

Commit message

Show network data usage indication.

This feature is disabled by default, but can be enabled through gsettings/dconf.

This is a CTA Level 3 requirement.

Follows WiFi and modem data usage utilizing the new org.freedesktop.NetworkManager.Device.Statistics interface.

com.canonical.indicator.network.gschema.xml:
 - remove unused keys
 - add data-usage-indication key

Refactor connectivityqt::internal::DBusPropertyCache to util::DBusPropertyCache.

Under testing uses GKeyfileSettingsBackend to enable the feature.

Gets information from com.canonical.Unity.Screen (repowerd) and stops battery consuming updates when the screen if off.

Description of the change

.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:644
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/30/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/916/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/923
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/726/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/726/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/726/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/726/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/726/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/726/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/726/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/726
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/726/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/726/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/30/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~unity-api-team/indicator-network/data_usage_indication updated
645. By Antti Kaijanmäki

remove debug from debian/rules

646. By Antti Kaijanmäki

remove unused device_udi

647. By Antti Kaijanmäki

remove useless comment

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:645
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/31/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/917/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/924
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/727/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/727/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/727/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/31/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:647
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/918
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/925
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/728/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/728
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/728/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Apart from having to run the DataUsageIndication_enabled test outside of CI at the moment (which we really should fix: Bug #1638024), looks good.

Also, tested on the unity8 desktop session and looks to be working. Nice.

review: Approve
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Well... To be clear, what I was referring to by "looks good" is the diff and the outcome that was intended by it.

What doesn't look good is the icon popping up and disappearing between indicators. I think this is fine for a first iteration on this feature, but some serious design considerations need to be made. E.g. (I realise that we're currently limited to displaying icons only within our icon group, but) clearly what would look better is for the activity icon to appear in the left-most position as to avoid shifting indicators around each time it's shown.

Anyway, point is, I anticipate that there's still be some work to be done here, but as for building an MVP, looks good :)

Thanks Antti!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches