Merge lp:~kzapalowicz/ubuntu-system-settings/ubuntu-system-settings-carfix2 into lp:ubuntu-system-settings

Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Ken VanDine
Approved revision: 1682
Merged at revision: 1691
Proposed branch: lp:~kzapalowicz/ubuntu-system-settings/ubuntu-system-settings-carfix2
Merge into: lp:ubuntu-system-settings
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/bluetooth/device.h (+1/-1)
To merge this branch: bzr merge lp:~kzapalowicz/ubuntu-system-settings/ubuntu-system-settings-carfix2
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Simon Fels (community) Needs Fixing
Matteo Croce (community) Approve
Review via email: mp+301886@code.launchpad.net

Commit message

Make device always valid.

The current implementation set the device status to valid only when the
type of the device has been known. This has been provided by reading
Class of Device or Appearance properties which in some cases such as
inbound pairing with yet unknown device has to be queried. Now, some
of the remote devices such as cars do not make themselves discoverable
when initiate pairing which make us unable to query it's type. As a
result the device has been permanently invalid and the pairing failed.

This change makes sure that the device is always valid.

Description of the change

Make device always valid

The current implementation set the device status to valid only when the
type of the device has been known. This has been provided by reading
Class of Device or Appearance properties which in some cases such as
inbound pairing with yet unknown device has to be queried. Now, some
of the remote devices such as cars do not make themselves discoverable
when initiate pairing which make us unable to query it's type. As a
result the device has been permanently invalid and the pairing failed.

This change makes sure that the device is always valid.

To post a comment you must log in.
Revision history for this message
Matteo Croce (teknoraver) :
review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Please drop the changelog entry, citrain will fill that in for you.

review: Needs Fixing
Revision history for this message
Simon Fels (morphis) wrote :

Please explain in the commit message why you do this. Simply copy over the description into the commit message. Otherwise LGTM

review: Needs Fixing
1682. By Konrad Zapałowicz

Revert changelog modification

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks, looks good

review: Approve
1683. By Konrad Zapałowicz

merge with upstream

1684. By Konrad Zapałowicz

merge with upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/device.h'
2--- plugins/bluetooth/device.h 2016-07-28 10:08:54 +0000
3+++ plugins/bluetooth/device.h 2016-08-11 12:33:38 +0000
4@@ -142,7 +142,7 @@
5 Device() {}
6 Device(const QString &path, QDBusConnection &bus);
7 ~Device() {}
8- bool isValid() const { return getType() != Type::Other; }
9+ bool isValid() const { return true; }
10 void pair();
11 Q_INVOKABLE void cancelPairing();
12 void connect();

Subscribers

People subscribed via source and target branches