Network Menu

Merge lp:~unity-api-team/indicator-network/flight-mode-toggle-crash into lp:indicator-network/15.04

  1. flight-mode-toggle-crash
  2. Merge into trunk.15.04
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 482
Merged at revision: 481
Proposed branch: lp:~unity-api-team/indicator-network/flight-mode-toggle-crash
Merge into: lp:indicator-network/15.04
Diff against target: 182 lines (+49/-13)
8 files modified
src/indicator/nmofono/kill-switch-impl.cpp (+9/-1)
src/indicator/nmofono/wifi/access-point-impl.cpp (+2/-2)
src/indicator/nmofono/wifi/access-point-impl.h (+2/-2)
src/indicator/nmofono/wifi/access-point.h (+1/-1)
src/indicator/nmofono/wifi/grouped-access-point-impl.cpp (+27/-2)
src/indicator/nmofono/wifi/grouped-access-point-impl.h (+2/-2)
src/indicator/root-state.cpp (+4/-0)
tests/unit/indicator/menuitems/test-access-point-item.cpp (+2/-3)
To merge this branch: bzr merge lp:~unity-api-team/indicator-network/flight-mode-toggle-crash
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+255356@code.launchpad.net

Commit message

Handle exceptions from flight mode toggle

Description of the change

Handle exceptions from flight mode toggle

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/109/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/320/rebuild

review: Approve (continuous-integration)
lp:~unity-api-team/indicator-network/flight-mode-toggle-crash updated
482. By Pete Woods

Make GroupedAccessPoint getters handle an empty list

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/110/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/321/rebuild

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

Looks good. Just an indentation fail :P

63 - virtual const QString& ssid() const = 0;
64 + virtual QString ssid() const = 0;
65 virtual bool secured() const = 0;
66 virtual bool adhoc() const = 0;

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/indicator/nmofono/kill-switch-impl.cpp'
--- src/indicator/nmofono/kill-switch-impl.cpp 2015-03-24 12:45:06 +0000
+++ src/indicator/nmofono/kill-switch-impl.cpp 2015-04-07 16:19:19 +0000
@@ -133,7 +133,15 @@
133 return true;133 return true;
134 }134 }
135135
136 return utils::getOrThrow(d->urfkill->FlightMode(enable));136 try
137 {
138 return utils::getOrThrow(d->urfkill->FlightMode(enable));
139 }
140 catch (std::runtime_error& e)
141 {
142 qWarning() << __PRETTY_FUNCTION__ << ": " << QString::fromStdString(e.what());
143 return false;
144 }
137}145}
138146
139bool KillSwitch::isFlightMode()147bool KillSwitch::isFlightMode()
140148
=== modified file 'src/indicator/nmofono/wifi/access-point-impl.cpp'
--- src/indicator/nmofono/wifi/access-point-impl.cpp 2015-03-13 15:08:29 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.cpp 2015-04-07 16:19:19 +0000
@@ -101,12 +101,12 @@
101 return m_lastConnected;101 return m_lastConnected;
102}102}
103103
104const QString& AccessPoint::ssid() const104QString AccessPoint::ssid() const
105{105{
106 return m_ssid;106 return m_ssid;
107}107}
108108
109const QByteArray& AccessPoint::raw_ssid() const109QByteArray AccessPoint::raw_ssid() const
110{110{
111 return m_raw_ssid;111 return m_raw_ssid;
112}112}
113113
=== modified file 'src/indicator/nmofono/wifi/access-point-impl.h'
--- src/indicator/nmofono/wifi/access-point-impl.h 2015-03-13 15:08:29 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.h 2015-04-07 16:19:19 +0000
@@ -91,8 +91,8 @@
91 Q_PROPERTY(std::chrono::system_clock::time_point lastConnected READ lastConnected NOTIFY lastConnectedUpdated)91 Q_PROPERTY(std::chrono::system_clock::time_point lastConnected READ lastConnected NOTIFY lastConnectedUpdated)
92 std::chrono::system_clock::time_point lastConnected() const;92 std::chrono::system_clock::time_point lastConnected() const;
9393
94 const QString& ssid() const override;94 QString ssid() const override;
95 const QByteArray& raw_ssid() const;95 QByteArray raw_ssid() const;
9696
97 bool secured() const override;97 bool secured() const override;
9898
9999
=== modified file 'src/indicator/nmofono/wifi/access-point.h'
--- src/indicator/nmofono/wifi/access-point.h 2015-03-13 15:08:29 +0000
+++ src/indicator/nmofono/wifi/access-point.h 2015-04-07 16:19:19 +0000
@@ -50,7 +50,7 @@
50 Q_PROPERTY(double strength READ strength NOTIFY strengthUpdated)50 Q_PROPERTY(double strength READ strength NOTIFY strengthUpdated)
51 virtual double strength() const = 0;51 virtual double strength() const = 0;
5252
53 virtual const QString& ssid() const = 0;53 virtual QString ssid() const = 0;
54 virtual bool secured() const = 0;54 virtual bool secured() const = 0;
55 virtual bool adhoc() const = 0;55 virtual bool adhoc() const = 0;
5656
5757
=== modified file 'src/indicator/nmofono/wifi/grouped-access-point-impl.cpp'
--- src/indicator/nmofono/wifi/grouped-access-point-impl.cpp 2015-03-19 12:54:23 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point-impl.cpp 2015-04-07 16:19:19 +0000
@@ -147,6 +147,11 @@
147}147}
148148
149QDBusObjectPath GroupedAccessPoint::object_path() const {149QDBusObjectPath GroupedAccessPoint::object_path() const {
150 if (p->aplist.empty())
151 {
152 return QDBusObjectPath("/");
153 }
154
150 return p->aplist.at(0)->object_path();155 return p->aplist.at(0)->object_path();
151}156}
152157
@@ -160,23 +165,43 @@
160 return p->m_lastTime;165 return p->m_lastTime;
161}166}
162167
163const QString& GroupedAccessPoint::ssid() const168QString GroupedAccessPoint::ssid() const
164{169{
170 if (p->aplist.empty())
171 {
172 return QString();
173 }
174
165 return p->aplist.at(0)->ssid();175 return p->aplist.at(0)->ssid();
166}176}
167177
168const QByteArray& GroupedAccessPoint::raw_ssid() const178QByteArray GroupedAccessPoint::raw_ssid() const
169{179{
180 if (p->aplist.empty())
181 {
182 return QByteArray();
183 }
184
170 return p->aplist.at(0)->raw_ssid();185 return p->aplist.at(0)->raw_ssid();
171}186}
172187
173bool GroupedAccessPoint::secured() const188bool GroupedAccessPoint::secured() const
174{189{
190 if (p->aplist.empty())
191 {
192 return false;
193 }
194
175 return p->aplist.at(0)->secured();195 return p->aplist.at(0)->secured();
176}196}
177197
178bool GroupedAccessPoint::adhoc() const198bool GroupedAccessPoint::adhoc() const
179{199{
200 if (p->aplist.empty())
201 {
202 return false;
203 }
204
180 return p->aplist.at(0)->adhoc();205 return p->aplist.at(0)->adhoc();
181}206}
182207
183208
=== modified file 'src/indicator/nmofono/wifi/grouped-access-point-impl.h'
--- src/indicator/nmofono/wifi/grouped-access-point-impl.h 2015-03-13 15:08:29 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point-impl.h 2015-04-07 16:19:19 +0000
@@ -51,8 +51,8 @@
51 Q_PROPERTY(std::chrono::system_clock::time_point lastConnected READ lastConnected NOTIFY lastConnectedUpdated)51 Q_PROPERTY(std::chrono::system_clock::time_point lastConnected READ lastConnected NOTIFY lastConnectedUpdated)
52 std::chrono::system_clock::time_point lastConnected() const;52 std::chrono::system_clock::time_point lastConnected() const;
5353
54 const QString& ssid() const override;54 QString ssid() const override;
55 const QByteArray& raw_ssid() const;55 QByteArray raw_ssid() const;
5656
57 bool secured() const override;57 bool secured() const override;
5858
5959
=== modified file 'src/indicator/root-state.cpp'
--- src/indicator/root-state.cpp 2015-03-27 08:34:44 +0000
+++ src/indicator/root-state.cpp 2015-04-07 16:19:19 +0000
@@ -213,6 +213,10 @@
213 &networking::wifi::AccessPoint::strengthUpdated,213 &networking::wifi::AccessPoint::strengthUpdated,
214 this,214 this,
215 &Private::updateNetworkingIcon);215 &Private::updateNetworkingIcon);
216 if (m_activeAP_conn)
217 {
218 disconnect(*m_activeAP_conn);
219 }
216 m_activeAP_conn.reset(new QMetaObject::Connection(c));220 m_activeAP_conn.reset(new QMetaObject::Connection(c));
217 }221 }
218 else222 else
219223
=== modified file 'tests/unit/indicator/menuitems/test-access-point-item.cpp'
--- tests/unit/indicator/menuitems/test-access-point-item.cpp 2015-03-24 15:28:58 +0000
+++ tests/unit/indicator/menuitems/test-access-point-item.cpp 2015-04-07 16:19:19 +0000
@@ -38,7 +38,7 @@
38class MockAccessPoint : public networking::wifi::AccessPoint38class MockAccessPoint : public networking::wifi::AccessPoint
39{39{
40public:40public:
41 MOCK_CONST_METHOD0(ssid, const QString&());41 MOCK_CONST_METHOD0(ssid, QString());
4242
43 MOCK_CONST_METHOD0(secured, bool());43 MOCK_CONST_METHOD0(secured, bool());
4444
@@ -57,8 +57,7 @@
57{57{
58 shared_ptr<MockAccessPoint> accessPoint = make_shared<58 shared_ptr<MockAccessPoint> accessPoint = make_shared<
59 NiceMock<MockAccessPoint>>();59 NiceMock<MockAccessPoint>>();
60 static QString ssidtext("the ssid");60 ON_CALL(*accessPoint, ssid()).WillByDefault(Return(QString("the ssid")));
61 ON_CALL(*accessPoint, ssid()).WillByDefault(ReturnRef(ssidtext));
62 ON_CALL(*accessPoint, secured()).WillByDefault(Return(true));61 ON_CALL(*accessPoint, secured()).WillByDefault(Return(true));
63 ON_CALL(*accessPoint, adhoc()).WillByDefault(Return(false));62 ON_CALL(*accessPoint, adhoc()).WillByDefault(Return(false));
64 ON_CALL(*accessPoint, strength()).WillByDefault(Return(70.0));63 ON_CALL(*accessPoint, strength()).WillByDefault(Return(70.0));

Subscribers

People subscribed via source and target branches