ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/bluetooth-key-hint-workaround into lp:ubuntu-system-settings

  1. bluetooth-key-hint-workaround
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-02-13
Status: Merged
Approved by: Ken VanDine on 2015-02-13
Approved revision: 1304
Merged at revision: 1304
Proposed branch: lp:~seb128/ubuntu-system-settings/bluetooth-key-hint-workaround
Merge into: lp:ubuntu-system-settings
Diff against target: 15 lines (+4/-1)
1 file modified
plugins/bluetooth/DisplayPasskeyDialog.qml (+4/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/bluetooth-key-hint-workaround
Reviewer Review Type Date Requested Status
Ken VanDine 2015-02-13 Approve on 2015-02-13
Will Cooke (community) Approve on 2015-02-13
PS Jenkins bot continuous-integration Needs Fixing on 2015-02-13
Michael Zanetti 2015-02-13 Pending
Review via email: mp+249622@code.launchpad.net

Commit Message

bluetooth: workaround for a bluez bug where the number of entered digits
in DisplayPasskey pairing doesn't make sense. Only update the passkey hint
while typing if the number is <= 6.

Description of the Change

bluetooth: workaround for a bluez bug where the number of entered digits
in DisplayPasskey pairing doesn't make sense. Only update the passkey hint
while typing if the number is <= 6.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/DisplayPasskeyDialog.qml'
2--- plugins/bluetooth/DisplayPasskeyDialog.qml 2015-02-04 16:32:54 +0000
3+++ plugins/bluetooth/DisplayPasskeyDialog.qml 2015-02-13 10:37:49 +0000
4@@ -36,7 +36,10 @@
5
6 Label {
7 /* display the number of chars that remain to be typed */
8- text: root.passkey.slice(entered)+"⏎"
9+ /* TODO: workaround bluez bug #1421598, if the number of entered digit
10+ doesn't make sense then just display the passkey without masking
11+ chars as you type */
12+ text: (entered <= 6) ? root.passkey.slice(entered)+"⏎" : root.passkey+"⏎"
13 fontSize: "x-large"
14 verticalAlignment: Text.AlignVCenter
15 horizontalAlignment: Text.AlignHCenter

Subscribers

People subscribed via source and target branches