Network Menu

Merge lp:~unity-api-team/indicator-network/dont-expect-preferred-languages into lp:indicator-network

  1. dont-expect-preferred-languages
  2. Merge into trunk
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Charles Kerr
Approved revision: 610
Merged at revision: 612
Proposed branch: lp:~unity-api-team/indicator-network/dont-expect-preferred-languages
Merge into: lp:indicator-network
Diff against target: 245 lines (+36/-36)
9 files modified
src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp (+3/-0)
src/connectivity-api/connectivity-qt/connectivityqt/sim.h (+2/-1)
src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp (+7/-0)
src/indicator/connectivity-service/dbus-sim.cpp (+6/-0)
src/indicator/connectivity-service/dbus-sim.h (+1/-0)
src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp (+1/-32)
src/indicator/nmofono/wwan/qofono-sim-wrapper.h (+0/-1)
src/indicator/nmofono/wwan/sim.cpp (+13/-1)
src/indicator/nmofono/wwan/sim.h (+3/-1)
To merge this branch: bzr merge lp:~unity-api-team/indicator-network/dont-expect-preferred-languages
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+300884@code.launchpad.net

Commit message

Don't expect to have PreferredLanguages on a SIM.

Description of the change

-

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp'
2--- src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp 2016-06-14 16:43:28 +0000
3+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp 2016-07-22 13:12:07 +0000
4@@ -56,6 +56,9 @@
5 } else if (name == "PrimaryPhoneNumber")
6 {
7 Q_EMIT p.primaryPhoneNumberChanged(value.toString());
8+ } else if (name == "PreferredLanguages")
9+ {
10+ Q_EMIT p.preferredLanguagesChanged();
11 } else {
12 qWarning() << "connectivityqt::Sim::Priv::propertyChanged(): "
13 << "Unexpected property: " << name;
14
15=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.h'
16--- src/connectivity-api/connectivity-qt/connectivityqt/sim.h 2016-06-22 09:40:58 +0000
17+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.h 2016-07-22 13:12:07 +0000
18@@ -63,7 +63,7 @@
19 Q_PROPERTY(QString Mnc READ mnc NOTIFY mncChanged)
20 QString mnc() const;
21
22- Q_PROPERTY(QList<QString> PreferredLanguages READ preferredLanguages CONSTANT)
23+ Q_PROPERTY(QList<QString> PreferredLanguages READ preferredLanguages NOTIFY preferredLanguagesChanged)
24 QList<QString> preferredLanguages() const;
25
26 Q_PROPERTY(bool DataRoamingEnabled READ dataRoamingEnabled WRITE setDataRoamingEnabled NOTIFY dataRoamingEnabledChanged)
27@@ -82,6 +82,7 @@
28 void primaryPhoneNumberChanged(const QString &value);
29 void mccChanged(const QString &value);
30 void mncChanged(const QString &value);
31+ void preferredLanguagesChanged();
32
33 protected:
34 class Priv;
35
36=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp'
37--- src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp 2016-06-22 09:40:58 +0000
38+++ src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp 2016-07-22 13:12:07 +0000
39@@ -86,6 +86,7 @@
40 connect(sim.get(), &Sim::primaryPhoneNumberChanged, this, &Priv::primaryPhoneNumberChanged);
41 connect(sim.get(), &Sim::mccChanged, this, &Priv::mccChanged);
42 connect(sim.get(), &Sim::mncChanged, this, &Priv::mncChanged);
43+ connect(sim.get(), &Sim::preferredLanguagesChanged, this, &Priv::preferredLanguagesChanged);
44 }
45 p.endInsertRows();
46 }
47@@ -144,6 +145,12 @@
48 p.dataChanged(idx, idx, {SimsListModel::Roles::RoleMnc});
49 }
50
51+ void preferredLanguagesChanged()
52+ {
53+ auto idx = findSim(sender());
54+ p.dataChanged(idx, idx, {SimsListModel::Roles::RolePreferredLanguages});
55+ }
56+
57 void propertyChanged(const QString& name, const QVariant& value)
58 {
59 if (name == "Sims")
60
61=== modified file 'src/indicator/connectivity-service/dbus-sim.cpp'
62--- src/indicator/connectivity-service/dbus-sim.cpp 2016-06-22 09:40:58 +0000
63+++ src/indicator/connectivity-service/dbus-sim.cpp 2016-07-22 13:12:07 +0000
64@@ -48,6 +48,7 @@
65 connect(sim.get(), &Sim::primaryPhoneNumberChanged, this, &DBusSim::primaryPhoneNumberChanged);
66 connect(sim.get(), &Sim::mccChanged, this, &DBusSim::mccChanged);
67 connect(sim.get(), &Sim::mncChanged, this, &DBusSim::mncChanged);
68+ connect(sim.get(), &Sim::preferredLanguagesChanged, this, &DBusSim::preferredLanguagesChanged);
69 }
70
71 DBusSim::~DBusSim()
72@@ -168,6 +169,11 @@
73 notifyProperties({"Mnc"});
74 }
75
76+void DBusSim::preferredLanguagesChanged()
77+{
78+ notifyProperties({"PreferredLanguages"});
79+}
80+
81 nmofono::wwan::Sim::Ptr DBusSim::sim() const
82 {
83 return m_sim;
84
85=== modified file 'src/indicator/connectivity-service/dbus-sim.h'
86--- src/indicator/connectivity-service/dbus-sim.h 2016-06-22 09:40:58 +0000
87+++ src/indicator/connectivity-service/dbus-sim.h 2016-07-22 13:12:07 +0000
88@@ -93,6 +93,7 @@
89 void primaryPhoneNumberChanged();
90 void mccChanged();
91 void mncChanged();
92+ void preferredLanguagesChanged();
93
94 private:
95 void notifyProperties(const QStringList& propertyNames);
96
97=== modified file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp'
98--- src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp 2016-06-22 09:40:58 +0000
99+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp 2016-07-22 13:12:07 +0000
100@@ -42,12 +42,10 @@
101 shared_ptr<QOfonoSimManager> m_simManager;
102
103 QString m_iccid;
104- QStringList m_preferredLanguages;
105
106 bool m_present = false;
107
108 bool m_iccidSet = false;
109- bool m_preferredLanguagesSet = false;
110
111
112 Private(QOfonoSimWrapper& parent, shared_ptr<QOfonoSimManager> simmgr)
113@@ -55,7 +53,6 @@
114 {
115 connect(simmgr.get(), &QOfonoSimManager::presenceChanged, this, &Private::presentChanged);
116 connect(simmgr.get(), &QOfonoSimManager::cardIdentifierChanged, this, &Private::iccidChanged);
117- connect(simmgr.get(), &QOfonoSimManager::preferredLanguagesChanged, this, &Private::preferredLanguagesChanged);
118 }
119
120 public Q_SLOTS:
121@@ -70,7 +67,6 @@
122 if (!m_present)
123 {
124 m_iccidSet = false;
125- m_preferredLanguagesSet = false;
126 Q_EMIT p.readyChanged(false);
127 }
128 Q_EMIT p.presentChanged(value);
129@@ -95,27 +91,6 @@
130 Q_EMIT p.readyChanged(true);
131 }
132 }
133-
134- void preferredLanguagesChanged(const QStringList &value)
135- {
136- if (value.isEmpty())
137- {
138- return;
139- }
140-
141- if (m_preferredLanguagesSet)
142- {
143- qWarning() << "Unexpected update on Preferred Languages: " << m_preferredLanguages << ", " << value;
144- }
145-
146-
147- m_preferredLanguages = value;
148- m_preferredLanguagesSet = true;
149- if (p.ready())
150- {
151- Q_EMIT p.readyChanged(true);
152- }
153- }
154 };
155
156
157@@ -139,14 +114,8 @@
158 }
159
160
161-QStringList QOfonoSimWrapper::preferredLanguages() const
162-{
163- return d->m_preferredLanguages;
164-}
165-
166 bool QOfonoSimWrapper::ready() const {
167- return d->m_iccidSet &&
168- d->m_preferredLanguagesSet;
169+ return d->m_iccidSet;
170 }
171
172 std::shared_ptr<QOfonoSimManager> QOfonoSimWrapper::ofonoSimManager() const
173
174=== modified file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.h'
175--- src/indicator/nmofono/wwan/qofono-sim-wrapper.h 2016-06-22 09:40:58 +0000
176+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.h 2016-07-22 13:12:07 +0000
177@@ -58,7 +58,6 @@
178
179 QString iccid() const;
180 bool present() const;
181- QStringList preferredLanguages() const;
182 bool ready() const;
183
184 std::shared_ptr<QOfonoSimManager> ofonoSimManager() const;
185
186=== modified file 'src/indicator/nmofono/wwan/sim.cpp'
187--- src/indicator/nmofono/wwan/sim.cpp 2016-06-22 09:40:58 +0000
188+++ src/indicator/nmofono/wwan/sim.cpp 2016-07-22 13:12:07 +0000
189@@ -43,7 +43,7 @@
190 "",
191 "",
192 "",
193- wrapper->preferredLanguages(),
194+ {},
195 false));
196 sim->setOfonoSimManager(wrapper->ofonoSimManager());
197 return sim;
198@@ -117,6 +117,7 @@
199 connect(simmgr.get(), &QOfonoSimManager::subscriberNumbersChanged, this, &Private::phoneNumbersChanged);
200 connect(simmgr.get(), &QOfonoSimManager::mobileCountryCodeChanged, this, &Private::mccChanged);
201 connect(simmgr.get(), &QOfonoSimManager::mobileNetworkCodeChanged, this, &Private::mncChanged);
202+ connect(simmgr.get(), &QOfonoSimManager::preferredLanguagesChanged, this, &Private::preferredLanguagesChanged);
203 imsiChanged(simmgr->subscriberIdentity());
204 phoneNumbersChanged(simmgr->subscriberNumbers());
205 mccChanged(simmgr->mobileCountryCode());
206@@ -172,6 +173,17 @@
207 Q_EMIT p.mncChanged(m_mnc);
208 }
209
210+ void preferredLanguagesChanged(const QStringList &value)
211+ {
212+ if (value.isEmpty())
213+ {
214+ return;
215+ }
216+
217+ m_preferredLanguages = value;
218+ Q_EMIT p.preferredLanguagesChanged();
219+ }
220+
221 void poweredChanged()
222 {
223 if (!m_initialDataSet)
224
225=== modified file 'src/indicator/nmofono/wwan/sim.h'
226--- src/indicator/nmofono/wwan/sim.h 2016-06-22 09:40:58 +0000
227+++ src/indicator/nmofono/wwan/sim.h 2016-07-22 13:12:07 +0000
228@@ -96,7 +96,7 @@
229 Q_PROPERTY(QString mnc READ mnc NOTIFY mncChanged)
230 QString mnc() const;
231
232- Q_PROPERTY(QList<QString> preferredLanguages READ preferredLanguages CONSTANT)
233+ Q_PROPERTY(QList<QString> preferredLanguages READ preferredLanguages NOTIFY preferredLanguagesChanged)
234 QList<QString> preferredLanguages() const;
235
236 Q_PROPERTY(bool dataRoamingEnabled READ dataRoamingEnabled WRITE setDataRoamingEnabled NOTIFY dataRoamingEnabledChanged)
237@@ -126,6 +126,8 @@
238
239 void mncChanged(const QString &);
240
241+ void preferredLanguagesChanged();
242+
243 void lockedChanged(bool value);
244
245 void presentChanged(bool value);

Subscribers

People subscribed via source and target branches