1
=== modified file 'debian/control'
2
--- debian/control	2015-10-29 15:48:06 +0000
3
+++ debian/control	2015-11-20 08:48:08 +0000
4
@@ -60,7 +60,7 @@
5
60
         ${shlibs:Depends},
60
         ${shlibs:Depends},
6
61
         accountsservice,
61
         accountsservice,
7
62
         accountsservice-ubuntu-schemas (>= 0.0.3+14.10.20140829~),
62
         accountsservice-ubuntu-schemas (>= 0.0.3+14.10.20140829~),
9
63
         bluez (>= 4.36),
63
         bluez (>= 5.23),
10
64
         click | ubuntu-snappy-cli,
64
         click | ubuntu-snappy-cli,
11
65
         dbus-property-service [amd64 armhf i386],
65
         dbus-property-service [amd64 armhf i386],
12
66
         gsettings-desktop-schemas,
66
         gsettings-desktop-schemas,
13
67
67
14
=== added file 'plugins/bluetooth/AuthorizationRequestDialog.qml'
15
--- plugins/bluetooth/AuthorizationRequestDialog.qml	1970-01-01 00:00:00 +0000
16
+++ plugins/bluetooth/AuthorizationRequestDialog.qml	2015-11-20 08:48:08 +0000
17
@@ -0,0 +1,53 @@
18
1
/*
19
2
 * This file is part of ubuntu-system-settings
20
3
 *
21
4
 * Copyright (C) 2013-2015 Canonical Ltd.
22
5
 *
23
6
 * This program is free software: you can redistribute it and/or modify it
24
7
 * under the terms of the GNU General Public License version 3, as published
25
8
 * by the Free Software Foundation.
26
9
 *
27
10
 * This program is distributed in the hope that it will be useful, but
28
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
29
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
30
13
 * PURPOSE.  See the GNU General Public License for more details.
31
14
 *
32
15
 * You should have received a copy of the GNU General Public License along
33
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
34
17
 */
35
18
36
19
37
20
import QtQuick 2.0
38
21
import Ubuntu.Components 1.3
39
22
import Ubuntu.Components.Popups 1.3
40
23
41
24
Dialog {
42
25
    id: root
43
26
    title: i18n.tr("Bluetooth Pairing Authorization Request")
44
27
45
28
    property string name: "Unknown"
46
29
47
30
    signal accepted
48
31
    signal declined
49
32
50
33
    // TRANSLATORS: %1 is the name of the bluetooth device which requires authorization
51
34
    text: i18n.tr("The device %1 wants to pair with this device. Do you want to allow this?").arg(root.name)
52
35
53
36
    Row {
54
37
        spacing: units.gu(1)
55
38
        Button {
56
39
            text: i18n.tr("Allow")
57
40
            onClicked: {
58
41
                root.allowed()
59
42
                PopupUtils.close(root)
60
43
            }
61
44
        }
62
45
        Button {
63
46
            text: i18n.tr("Refuse")
64
47
            onClicked: {
65
48
                root.denied()
66
49
                PopupUtils.close(root)
67
50
            }
68
51
        }
69
52
    }
70
53
}
71
0
54
72
=== modified file 'plugins/bluetooth/CMakeLists.txt'
73
--- plugins/bluetooth/CMakeLists.txt	2015-08-26 08:47:44 +0000
74
+++ plugins/bluetooth/CMakeLists.txt	2015-11-20 08:48:08 +0000
75
@@ -3,21 +3,34 @@
76
3
set(QML_SOURCES
3
set(QML_SOURCES
77
4
ProvidePinCodeDialog.qml
4
ProvidePinCodeDialog.qml
78
5
ConfirmPasskeyDialog.qml
5
ConfirmPasskeyDialog.qml
79
6
DisplayPinCodeDialog.qml
80
6
DisplayPasskeyDialog.qml
7
DisplayPasskeyDialog.qml
81
7
ProvidePasskeyDialog.qml
8
ProvidePasskeyDialog.qml
82
9
AuthorizationRequestDialog.qml
83
8
DevicePage.qml
10
DevicePage.qml
84
9
PageComponent.qml
11
PageComponent.qml
85
10
)
12
)
86
11
13
87
12
add_library(UbuntuBluetoothPanel MODULE
14
add_library(UbuntuBluetoothPanel MODULE
88
15
  bluez_adapter1.cpp
89
16
  bluez_agentmanager1.cpp
90
17
  bluez_device1.cpp
91
18
  bluez_agent1adaptor.cpp
92
19
  freedesktop_properties.cpp
93
20
  freedesktop_objectmanager.cpp
94
13
  agent.cpp
21
  agent.cpp
95
14
  agentadaptor.cpp
96
15
  bluetooth.cpp
22
  bluetooth.cpp
97
16
  device.cpp
23
  device.cpp
98
17
  devicemodel.cpp
24
  devicemodel.cpp
99
25
  bluez_adapter1.h
100
26
  bluez_agentmanager1.h
101
27
  bluez_device1.h
102
28
  bluez_agent1adaptor.h
103
29
  freedesktop_properties.h
104
30
  freedesktop_objectmanager.h
105
18
  plugin.cpp
31
  plugin.cpp
108
19
  agent.h 
32
  bluez_helper.h
109
20
  agentadaptor.h
33
  agent.h
110
21
  bluetooth.h
34
  bluetooth.h
111
22
  device.h
35
  device.h
112
23
  devicemodel.h
36
  devicemodel.h
113
24
37
114
=== modified file 'plugins/bluetooth/DevicePage.qml'
115
--- plugins/bluetooth/DevicePage.qml	2015-09-18 14:18:11 +0000
116
+++ plugins/bluetooth/DevicePage.qml	2015-11-20 08:48:08 +0000
117
@@ -58,6 +58,7 @@
118
58
        case Device.Mouse:      return i18n.tr("Mouse");
58
        case Device.Mouse:      return i18n.tr("Mouse");
119
59
        case Device.Printer:    return i18n.tr("Printer");
59
        case Device.Printer:    return i18n.tr("Printer");
120
60
        case Device.Camera:     return i18n.tr("Camera");
60
        case Device.Camera:     return i18n.tr("Camera");
121
61
        case Device.Watch:      return i18n.tr("Watch");
122
61
        default:                return i18n.tr("Other");
62
        default:                return i18n.tr("Other");
123
62
        }
63
        }
124
63
    }
64
    }
125
@@ -180,7 +181,7 @@
126
180
                        pageStack.pop();
181
                        pageStack.pop();
127
181
                    }
182
                    }
128
182
                    visible: backend.selectedDevice ? true : false
183
                    visible: backend.selectedDevice ? true : false
130
183
                    enabled: backend.selectedDevice ? backend.isSupportedType(backend.selectedDevice.type) : false
184
                    enabled: backend.selectedDevice && backend.powered ? (backend.isSupportedType(backend.selectedDevice.type) || backend.selectedDevice.connection != Device.Disconnected) : false
131
184
                }
185
                }
132
185
            }
186
            }
133
186
            ListItem.SingleControl {
187
            ListItem.SingleControl {
134
@@ -192,7 +193,7 @@
135
192
                        backend.resetSelectedDevice();
193
                        backend.resetSelectedDevice();
136
193
                        pageStack.pop();
194
                        pageStack.pop();
137
194
                    }
195
                    }
139
195
                    enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 ? true : false
196
                    enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 && backend.selectedDevice.paired ? true : false
140
196
                }
197
                }
141
197
            }
198
            }
142
198
        }
199
        }
143
199
200
144
=== added file 'plugins/bluetooth/DisplayPinCodeDialog.qml'
145
--- plugins/bluetooth/DisplayPinCodeDialog.qml	1970-01-01 00:00:00 +0000
146
+++ plugins/bluetooth/DisplayPinCodeDialog.qml	2015-11-20 08:48:08 +0000
147
@@ -0,0 +1,54 @@
148
1
/*
149
2
 * This file is part of ubuntu-system-settings
150
3
 *
151
4
 * Copyright (C) 2013-2015 Canonical Ltd.
152
5
 *
153
6
 * This program is free software: you can redistribute it and/or modify it
154
7
 * under the terms of the GNU General Public License version 3, as published
155
8
 * by the Free Software Foundation.
156
9
 *
157
10
 * This program is distributed in the hope that it will be useful, but
158
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
159
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
160
13
 * PURPOSE.  See the GNU General Public License for more details.
161
14
 *
162
15
 * You should have received a copy of the GNU General Public License along
163
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
164
17
 */
165
18
166
19
167
20
import QtQuick 2.0
168
21
import Ubuntu.Components 1.3
169
22
import Ubuntu.Components.Popups 1.3
170
23
171
24
Dialog {
172
25
    id: root
173
26
    title: i18n.tr("Bluetooth Pairing Request")
174
27
175
28
    property string name: "Unknown"
176
29
    property string pincode: ""
177
30
178
31
    signal canceled
179
32
180
33
    // TRANSLATORS: %1 is the name of the bluetooth device being paired
181
34
    text: i18n.tr("Please enter the following PIN on %1 and press “Enter” on the keyboard:").arg(root.name)
182
35
183
36
    Label {
184
37
        text: root.pincode+"⏎"
185
38
        fontSize: "x-large"
186
39
        verticalAlignment: Text.AlignVCenter
187
40
        horizontalAlignment: Text.AlignHCenter
188
41
    }
189
42
190
43
    Row {
191
44
        spacing: units.gu(1)
192
45
        Button {
193
46
            text: i18n.tr("Cancel")
194
47
            onClicked: {
195
48
                root.canceled()
196
49
                PopupUtils.close(root)
197
50
            }
198
51
            width: (parent.width - parent.spacing)
199
52
        }
200
53
    }
201
54
}
202
0
55
203
=== modified file 'plugins/bluetooth/PageComponent.qml'
204
--- plugins/bluetooth/PageComponent.qml	2015-11-05 12:57:06 +0000
205
+++ plugins/bluetooth/PageComponent.qml	2015-11-20 08:48:08 +0000
206
@@ -34,8 +34,28 @@
207
34
    objectName: "bluetoothPage"
34
    objectName: "bluetoothPage"
208
35
35
209
36
    property var dialogPopupId
36
    property var dialogPopupId
212
37
37
    property var currentDevice
213
38
    UbuntuBluetoothPanel { id: backend }
38
214
39
    function finishDevicePairing() {
215
40
        if (root.dialogPopupId)
216
41
            PopupUtils.close(root.dialogPopupId)
217
42
218
43
        root.dialogPopupId = null
219
44
        root.currentDevice = null
220
45
    }
221
46
222
47
    UbuntuBluetoothPanel {
223
48
        id: backend
224
49
225
50
        onDevicePairingDone: {
226
51
            console.log("Got pairing status notification for device " + device.address)
227
52
228
53
            if (device != root.currentDevice)
229
54
                return
230
55
231
56
            finishDevicePairing()
232
57
        }
233
58
    }
234
39
59
235
40
    Timer {
60
    Timer {
236
41
        id: discoverableTimer
61
        id: discoverableTimer
237
@@ -71,12 +91,23 @@
238
71
    }
91
    }
239
72
92
240
73
    Component {
93
    Component {
241
94
       id: displayPinCodeDialog
242
95
       DisplayPinCodeDialog { }
243
96
    }
244
97
245
98
    Component {
246
74
        id: displayPasskeyDialog
99
        id: displayPasskeyDialog
247
75
        DisplayPasskeyDialog { }
100
        DisplayPasskeyDialog { }
248
76
    }
101
    }
249
77
102
250
103
    Component {
251
104
        id: authorizationRequestDialog
252
105
        AuthorizationRequestDialog { }
253
106
    }
254
107
255
78
    Connections {
108
    Connections {
256
79
        target: backend.agent
109
        target: backend.agent
257
110
        onCancelNeeded: finishDevicePairing()
258
80
        onPasskeyConfirmationNeeded: {
111
        onPasskeyConfirmationNeeded: {
259
81
            var request_tag = tag
112
            var request_tag = tag
260
82
            var popup = PopupUtils.open(confirmPasskeyDialog, root, {passkey: passkey, name: device.name})
113
            var popup = PopupUtils.open(confirmPasskeyDialog, root, {passkey: passkey, name: device.name})
261
@@ -95,23 +126,60 @@
262
95
            popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
126
            popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
263
96
            popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
127
            popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
264
97
        }
128
        }
265
129
        onDisplayPinCodeNeeded: {
266
130
            if (!root.dialogPopupId)
267
131
            {
268
132
                root.currentDevice = device
269
133
                root.dialogPopupId  = PopupUtils.open(displayPinCodeDialog, root, {pincode: pincode, name: device.name})
270
134
                root.dialogPopupId.canceled.connect(function() {
271
135
                    root.dialogPopupId = null
272
136
                    if (root.currentDevice) {
273
137
                        root.currentDevice.cancelPairing()
274
138
                        root.currentDevice = null
275
139
                    }
276
140
                })
277
141
            }
278
142
            else
279
143
            {
280
144
                console.warn("Unhandled PIN code request for device " + device.name);
281
145
            }
282
146
        }
283
98
        onDisplayPasskeyNeeded: {
147
        onDisplayPasskeyNeeded: {
284
99
            if (!root.dialogPopupId)
148
            if (!root.dialogPopupId)
285
100
            {
149
            {
287
101
                var request_tag = tag
150
                root.currentDevice = device
288
102
                root.dialogPopupId  = PopupUtils.open(displayPasskeyDialog, root, {passkey: passkey, name: device.name,
151
                root.dialogPopupId  = PopupUtils.open(displayPasskeyDialog, root, {passkey: passkey, name: device.name,
289
103
                                                 entered: entered})
152
                                                 entered: entered})
292
104
                root.dialogPopupId.canceled.connect(function() {root.dialogPopupId = null;
153
                root.dialogPopupId.canceled.connect(function() {
293
105
                    target.displayPasskeyCallback(request_tag)})
154
                    root.dialogPopupId = null
294
155
                    if (root.currentDevice) {
295
156
                        root.currentDevice.cancelPairing()
296
157
                        root.currentDevice = null
297
158
                    }
298
159
                })
299
106
            }
160
            }
300
107
            else
161
            else
301
108
            {
162
            {
302
109
                root.dialogPopupId.entered = entered
163
                root.dialogPopupId.entered = entered
303
110
            }
164
            }
304
111
        }
165
        }
308
112
        onPairingDone: {
166
        onReleaseNeeded: {
309
113
            if (root.dialogPopupId)
167
            finishDevicePairing()
310
114
                PopupUtils.close(root.dialogPopupId)
168
        }
311
169
        onAuthorizationRequested: {
312
170
            if (!root.dialogPopupId)
313
171
            {
314
172
                var request_tag = tag
315
173
                root.dialogPopupId  = PopupUtils.open(authorizationRequestDialog, root, {name: device.name})
316
174
                root.dialogPopupId.accepted.connect(function() {
317
175
                    root.dialogPopupId = null
318
176
                    target.authorizationRequestCallback(request_tag, true)
319
177
                })
320
178
                root.dialogPopupId.declined.connect(function() {
321
179
                    root.dialogPopupId = null
322
180
                    target.authorizationRequestCallback(request_tag, false)
323
181
                })
324
182
            }
325
115
        }
183
        }
326
116
    }
184
    }
327
117
185
328
@@ -151,7 +219,7 @@
329
151
                text: i18n.tr("Bluetooth")
219
                text: i18n.tr("Bluetooth")
330
152
                control: Switch {
220
                control: Switch {
331
153
                    id: btSwitch
221
                    id: btSwitch
333
154
                    property bool serverChecked: bluetoothActionGroup.enabled.state
222
                    property bool serverChecked: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false
334
155
                    USC.ServerPropertySynchroniser {
223
                    USC.ServerPropertySynchroniser {
335
156
                        userTarget: btSwitch
224
                        userTarget: btSwitch
336
157
                        userProperty: "checked"
225
                        userProperty: "checked"
337
@@ -210,7 +278,6 @@
338
210
                }
278
                }
339
211
            }
279
            }
340
212
280
341
213
            //  Connnected Headset(s)
342
214
            ListItem.Standard {
281
            ListItem.Standard {
343
215
                id: connectedHeader
282
                id: connectedHeader
344
216
                text: i18n.tr("Connected devices:")
283
                text: i18n.tr("Connected devices:")
345
@@ -225,7 +292,7 @@
346
225
                    left: parent.left
292
                    left: parent.left
347
226
                    right: parent.right
293
                    right: parent.right
348
227
                }
294
                }
350
228
                visible: bluetoothActionGroup.enabled && (connectedRepeater.count > 0)
295
                visible: (bluetoothActionGroup.enabled.state != undefined && bluetoothActionGroup.enabled.state) && (connectedRepeater.count > 0)
351
229
                objectName: "connectedList"
296
                objectName: "connectedList"
352
230
297
353
231
                Repeater {
298
                Repeater {
354
@@ -248,12 +315,10 @@
355
248
                }
315
                }
356
249
            }
316
            }
357
250
317
358
251
            //  Disconnnected Headset(s)
359
252
360
253
            SettingsItemTitle {
318
            SettingsItemTitle {
361
254
                id: disconnectedHeader
319
                id: disconnectedHeader
362
255
                text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:")
320
                text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:")
364
256
                enabled: bluetoothActionGroup.enabled
321
                enabled: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false
365
257
                control: ActivityIndicator {
322
                control: ActivityIndicator {
366
258
                    visible: backend.powered && backend.discovering
323
                    visible: backend.powered && backend.discovering
367
259
                    running: visible
324
                    running: visible
368
@@ -266,7 +331,7 @@
369
266
                    left: parent.left
331
                    left: parent.left
370
267
                    right: parent.right
332
                    right: parent.right
371
268
                }
333
                }
373
269
                visible: bluetoothActionGroup.enabled && (disconnectedRepeater.count > 0)
334
                visible: (bluetoothActionGroup.enabled.state != undefined && bluetoothActionGroup.enabled.state) && (disconnectedRepeater.count > 0)
374
270
                objectName: "disconnectedList"
335
                objectName: "disconnectedList"
375
271
336
376
272
                Repeater {
337
                Repeater {
377
@@ -287,11 +352,10 @@
378
287
            ListItem.Standard {
352
            ListItem.Standard {
379
288
                id: disconnectedNone
353
                id: disconnectedNone
380
289
                text: i18n.tr("None detected")
354
                text: i18n.tr("None detected")
382
290
                visible: !disconnectedList.visible
355
                visible: !disconnectedList.visible && disconnectedHeader.visible
383
291
                enabled: false
356
                enabled: false
384
292
            }
357
            }
385
293
358
386
294
            //  Devices that connect automatically
387
295
            SettingsItemTitle {
359
            SettingsItemTitle {
388
296
                id: autoconnectHeader
360
                id: autoconnectHeader
389
297
                text: i18n.tr("Connect automatically when detected:")
361
                text: i18n.tr("Connect automatically when detected:")
390
298
362
391
=== modified file 'plugins/bluetooth/agent.cpp'
392
--- plugins/bluetooth/agent.cpp	2015-08-28 09:32:38 +0000
393
+++ plugins/bluetooth/agent.cpp	2015-11-20 08:48:08 +0000
394
@@ -53,7 +53,7 @@
395
53
 */
53
 */
396
54
void Agent::Release()
54
void Agent::Release()
397
55
{
55
{
399
56
    Q_EMIT(pairingDone());
56
    Q_EMIT(releaseNeeded());
400
57
}
57
}
401
58
58
402
59
/***
59
/***
403
@@ -112,9 +112,24 @@
404
112
    }
112
    }
405
113
}
113
}
406
114
114
410
115
/***
115
QString Agent::RequestPinCode(const QDBusObjectPath &objectPath)
411
116
****
116
{
412
117
***/
117
    auto device = m_devices.getDeviceFromPath(objectPath.path());
413
118
    if (device) {
414
119
        const uint tag = m_tag++;
415
120
416
121
        setDelayedReply(true);
417
122
        assert(!m_delayedReplies.contains(tag));
418
123
        m_delayedReplies[tag] = message();
419
124
420
125
        Q_EMIT(pinCodeNeeded(tag, device.data()));
421
126
422
127
    } else { // passkey requested for an unknown device..?!
423
128
        reject(message(), __func__);
424
129
    }
425
130
426
131
  return 0;
427
132
}
428
118
133
429
119
/**
134
/**
430
120
 * This method gets called when the service daemon
135
 * This method gets called when the service daemon
431
@@ -168,35 +183,6 @@
432
168
****
183
****
433
169
***/
184
***/
434
170
185
435
171
/*
436
172
 * This method gets called when the service daemon
437
173
 * needs to get the passkey for an authentication.
438
174
 *
439
175
 * The return value should be a string of 1-16 characters
440
176
 * length. The string can be alphanumeric.
441
177
 *
442
178
 * Possible errors: org.bluez.Error.Rejected
443
179
 *                  org.bluez.Error.Canceled
444
180
 */
445
181
QString Agent::RequestPinCode(const QDBusObjectPath &objectPath)
446
182
{
447
183
    auto device = m_devices.getDeviceFromPath(objectPath.path());
448
184
    if (device) {
449
185
        const uint tag = m_tag++;
450
186
451
187
        setDelayedReply(true);
452
188
        assert(!m_delayedReplies.contains(tag));
453
189
        m_delayedReplies[tag] = message();
454
190
455
191
        Q_EMIT(pinCodeNeeded(tag, device.data()));
456
192
457
193
    } else { // passkey requested for an unknown device..?!
458
194
        reject(message(), __func__);
459
195
    }
460
196
461
197
    return "";
462
198
}
463
199
464
200
/**
186
/**
465
201
 * Invoked by the user-facing code after it prompts the user for a PIN code
187
 * Invoked by the user-facing code after it prompts the user for a PIN code
466
202
 * from an Agent::pinCodeNeeded() signal.
188
 * from an Agent::pinCodeNeeded() signal.
467
@@ -218,33 +204,23 @@
468
218
    }
204
    }
469
219
}
205
}
470
220
206
484
221
/** This method gets called when the service daemon
207
void Agent::DisplayPinCode(const QDBusObjectPath &objectPath, QString pincode)
485
222
 * needs to display a passkey for an authentication.
208
{
486
223
 * The entered parameter indicates the number of already
209
    auto device = m_devices.getDeviceFromPath(objectPath.path());
487
224
 * typed keys on the remote side.
210
    if (device) {
488
225
 * An empty reply should be returned. When the passkey
211
        Q_EMIT(displayPinCodeNeeded(device.data(), pincode));
489
226
 * needs no longer to be displayed, the Cancel method
212
    } else {
490
227
 * of the agent will be called.
213
        reject(message(), __func__);
491
228
 * During the pairing process this method might be
214
    }
492
229
 * called multiple times to update the entered value.
215
}
480
230
 * Note that the passkey will always be a 6-digit number,
481
231
 * so the display should be zero-padded at the start if
482
232
 * the value contains less than 6 digits.
483
233
 */
493
234
216
494
235
void Agent::DisplayPasskey(const QDBusObjectPath &objectPath, uint passkey, ushort entered)
217
void Agent::DisplayPasskey(const QDBusObjectPath &objectPath, uint passkey, ushort entered)
495
236
{
218
{
496
237
    auto device = m_devices.getDeviceFromPath(objectPath.path());
219
    auto device = m_devices.getDeviceFromPath(objectPath.path());
497
238
    if (device) {
220
    if (device) {
498
239
        const uint tag = m_tag++;
499
240
500
241
        setDelayedReply(true);
501
242
        assert(!m_delayedReplies.contains(tag));
502
243
        m_delayedReplies[tag] = message();
503
244
504
245
        QString passkeyStr = QString("%1").arg(passkey, 6, 10, QChar('0'));
221
        QString passkeyStr = QString("%1").arg(passkey, 6, 10, QChar('0'));
507
246
        Q_EMIT(displayPasskeyNeeded(tag, device.data(), passkeyStr, entered));
222
        Q_EMIT(displayPasskeyNeeded(device.data(), passkeyStr, entered));
508
247
    } else { // confirmation requested for an unknown device..?!
223
    } else {
509
248
        reject(message(), __func__);
224
        reject(message(), __func__);
510
249
    }
225
    }
511
250
}
226
}
512
@@ -256,6 +232,53 @@
513
256
void Agent::Cancel()
232
void Agent::Cancel()
514
257
{
233
{
515
258
    qWarning() << "Cancel callback called";
234
    qWarning() << "Cancel callback called";
516
235
517
236
    Q_EMIT(cancelNeeded());
518
237
}
519
238
520
239
void Agent::RequestAuthorization(const QDBusObjectPath &path)
521
240
{
522
241
    qWarning() << "Authorization requested for device"
523
242
               << path.path();
524
243
525
244
    auto device = m_devices.getDeviceFromPath(path.path());
526
245
    if (device) {
527
246
        const uint tag = m_tag++;
528
247
529
248
        setDelayedReply(true);
530
249
        assert(!m_delayedReplies.contains(tag));
531
250
        m_delayedReplies[tag] = message();
532
251
533
252
        Q_EMIT(authorizationRequested(tag, device.data()));
534
253
    }
535
254
    else {
536
255
        reject(message(), __func__);
537
256
    }
538
257
}
539
258
540
259
void Agent::authorizationRequestCallback(uint tag, bool allow)
541
260
{
542
261
    if (m_delayedReplies.contains(tag)) {
543
262
        QDBusMessage message = m_delayedReplies[tag];
544
263
545
264
        if (allow)
546
265
            m_connection.send(message.createReply());
547
266
        else
548
267
            reject(message, __func__);
549
268
550
269
        m_delayedReplies.remove(tag);
551
270
    }
552
271
}
553
272
554
273
void Agent::displayPinCodeCallback(uint tag)
555
274
{
556
275
    if (m_delayedReplies.contains(tag)) {
557
276
        QDBusMessage message = m_delayedReplies[tag];
558
277
559
278
        cancel(message, __func__);
560
279
561
280
        m_delayedReplies.remove(tag);
562
281
    }
563
259
}
282
}
564
260
283
565
261
/**
284
/**
566
262
285
567
=== modified file 'plugins/bluetooth/agent.h'
568
--- plugins/bluetooth/agent.h	2015-08-28 09:32:38 +0000
569
+++ plugins/bluetooth/agent.h	2015-11-20 08:48:08 +0000
570
@@ -41,22 +41,29 @@
571
41
    Q_INVOKABLE void confirmPasskey(uint tag, bool confirmed);
41
    Q_INVOKABLE void confirmPasskey(uint tag, bool confirmed);
572
42
    Q_INVOKABLE void providePasskey(uint tag, bool provided, uint passkey);
42
    Q_INVOKABLE void providePasskey(uint tag, bool provided, uint passkey);
573
43
    Q_INVOKABLE void providePinCode(uint tag, bool provided, QString pinCode);
43
    Q_INVOKABLE void providePinCode(uint tag, bool provided, QString pinCode);
574
44
    Q_INVOKABLE void displayPinCodeCallback(uint tag);
575
44
    Q_INVOKABLE void displayPasskeyCallback(uint tag);
45
    Q_INVOKABLE void displayPasskeyCallback(uint tag);
576
46
    Q_INVOKABLE void authorizationRequestCallback(uint tag, bool allow);
577
45
47
578
46
public Q_SLOTS: // received from the system's bluez service
48
public Q_SLOTS: // received from the system's bluez service
579
47
    void Cancel();
49
    void Cancel();
580
50
    void DisplayPinCode(const QDBusObjectPath &path, QString pincode);
581
48
    void DisplayPasskey(const QDBusObjectPath &path, uint passkey, ushort entered);
51
    void DisplayPasskey(const QDBusObjectPath &path, uint passkey, ushort entered);
582
49
    void Release();
52
    void Release();
583
50
    void RequestConfirmation(const QDBusObjectPath &path, uint passkey);
53
    void RequestConfirmation(const QDBusObjectPath &path, uint passkey);
584
51
    uint RequestPasskey(const QDBusObjectPath &path);
54
    uint RequestPasskey(const QDBusObjectPath &path);
585
52
    QString RequestPinCode(const QDBusObjectPath &path);
55
    QString RequestPinCode(const QDBusObjectPath &path);
586
56
    void RequestAuthorization(const QDBusObjectPath &path);
587
53
57
588
54
Q_SIGNALS:
58
Q_SIGNALS:
589
55
    void pinCodeNeeded(int tag, Device* device);
59
    void pinCodeNeeded(int tag, Device* device);
590
56
    void passkeyNeeded(int tag, Device* device);
60
    void passkeyNeeded(int tag, Device* device);
591
57
    void passkeyConfirmationNeeded(int tag, Device* device, QString passkey);
61
    void passkeyConfirmationNeeded(int tag, Device* device, QString passkey);
594
58
    void displayPasskeyNeeded(int tag, Device* device, QString passkey, ushort entered);
62
    void displayPinCodeNeeded(Device* device, QString pincode);
595
59
    void pairingDone();
63
    void displayPasskeyNeeded(Device* device, QString passkey, ushort entered);
596
64
    void releaseNeeded();
597
65
    void cancelNeeded();
598
66
    void authorizationRequested(int tag, Device* device);
599
60
67
600
61
private:
68
private:
601
62
    Q_DISABLE_COPY(Agent)
69
    Q_DISABLE_COPY(Agent)
602
63
70
603
=== removed file 'plugins/bluetooth/agent.xml'
604
--- plugins/bluetooth/agent.xml	2015-02-04 10:48:47 +0000
605
+++ plugins/bluetooth/agent.xml	1970-01-01 00:00:00 +0000
606
@@ -1,38 +0,0 @@
607
1
<?xml version="1.0" encoding="UTF-8" ?>
608
2
609
3
<node name="/">
610
4
  <interface name="org.bluez.Agent">
611
5
    <method name="RequestPinCode">
612
6
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
613
7
      <arg type="o" name="device"/>
614
8
      <arg type="s" name="pincode" direction="out"/>
615
9
    </method>
616
10
617
11
    <method name="RequestPasskey">
618
12
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
619
13
      <arg type="o" name="device"/>
620
14
      <arg type="u" name="passkey" direction="out"/>
621
15
    </method>
622
16
623
17
    <method name="DisplayPasskey">
624
18
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
625
19
      <arg type="o" name="device"/>
626
20
      <arg type="u" name="passkey"/>
627
21
      <arg type="q" name="entered"/>
628
22
    </method>
629
23
630
24
    <method name="RequestConfirmation">
631
25
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
632
26
      <arg type="o" name="device"/>
633
27
      <arg type="u" name="passkey"/>
634
28
    </method>
635
29
636
30
    <method name="Cancel">
637
31
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
638
32
    </method>
639
33
640
34
    <method name="Release">
641
35
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
642
36
    </method>
643
37
  </interface>
644
38
</node>
645
39
0
646
=== removed file 'plugins/bluetooth/agentadaptor.cpp'
647
--- plugins/bluetooth/agentadaptor.cpp	2015-02-04 10:48:47 +0000
648
+++ plugins/bluetooth/agentadaptor.cpp	1970-01-01 00:00:00 +0000
649
@@ -1,75 +0,0 @@
650
1
/*
651
2
 * This file was generated by qdbusxml2cpp version 0.8
652
3
 * Command line was: qdbusxml2cpp agent.xml -a agentadaptor
653
4
 *
654
5
 * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
655
6
 *
656
7
 * This is an auto-generated file.
657
8
 * Do not edit! All changes made to it will be lost.
658
9
 */
659
10
660
11
#include "agentadaptor.h"
661
12
#include <QtCore/QMetaObject>
662
13
#include <QtCore/QByteArray>
663
14
#include <QtCore/QList>
664
15
#include <QtCore/QMap>
665
16
#include <QtCore/QString>
666
17
#include <QtCore/QStringList>
667
18
#include <QtCore/QVariant>
668
19
669
20
/*
670
21
 * Implementation of adaptor class AgentAdaptor
671
22
 */
672
23
673
24
AgentAdaptor::AgentAdaptor(QObject *parent)
674
25
    : QDBusAbstractAdaptor(parent)
675
26
{
676
27
    // constructor
677
28
    setAutoRelaySignals(true);
678
29
}
679
30
680
31
AgentAdaptor::~AgentAdaptor()
681
32
{
682
33
    // destructor
683
34
}
684
35
685
36
void AgentAdaptor::Cancel()
686
37
{
687
38
    // handle method call org.bluez.Agent.Cancel
688
39
    QMetaObject::invokeMethod(parent(), "Cancel");
689
40
}
690
41
691
42
void AgentAdaptor::DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered)
692
43
{
693
44
    // handle method call org.bluez.Agent.DisplayPasskey
694
45
    QMetaObject::invokeMethod(parent(), "DisplayPasskey", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey), Q_ARG(ushort, entered));
695
46
}
696
47
697
48
void AgentAdaptor::Release()
698
49
{
699
50
    // handle method call org.bluez.Agent.Release
700
51
    QMetaObject::invokeMethod(parent(), "Release");
701
52
}
702
53
703
54
void AgentAdaptor::RequestConfirmation(const QDBusObjectPath &device, uint passkey)
704
55
{
705
56
    // handle method call org.bluez.Agent.RequestConfirmation
706
57
    QMetaObject::invokeMethod(parent(), "RequestConfirmation", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey));
707
58
}
708
59
709
60
uint AgentAdaptor::RequestPasskey(const QDBusObjectPath &device)
710
61
{
711
62
    // handle method call org.bluez.Agent.RequestPasskey
712
63
    uint passkey;
713
64
    QMetaObject::invokeMethod(parent(), "RequestPasskey", Q_RETURN_ARG(uint, passkey), Q_ARG(QDBusObjectPath, device));
714
65
    return passkey;
715
66
}
716
67
717
68
QString AgentAdaptor::RequestPinCode(const QDBusObjectPath &device)
718
69
{
719
70
    // handle method call org.bluez.Agent.RequestPinCode
720
71
    QString pincode;
721
72
    QMetaObject::invokeMethod(parent(), "RequestPinCode", Q_RETURN_ARG(QString, pincode), Q_ARG(QDBusObjectPath, device));
722
73
    return pincode;
723
74
}
724
75
725
76
0
726
=== removed file 'plugins/bluetooth/agentadaptor.h'
727
--- plugins/bluetooth/agentadaptor.h	2015-02-04 10:48:47 +0000
728
+++ plugins/bluetooth/agentadaptor.h	1970-01-01 00:00:00 +0000
729
@@ -1,79 +0,0 @@
730
1
/*
731
2
 * This file was generated by qdbusxml2cpp version 0.8
732
3
 * Command line was: qdbusxml2cpp agent.xml -a agentadaptor
733
4
 *
734
5
 * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
735
6
 *
736
7
 * This is an auto-generated file.
737
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
738
9
 * before re-generating it.
739
10
 */
740
11
741
12
#ifndef AGENTADAPTOR_H_1423046874
742
13
#define AGENTADAPTOR_H_1423046874
743
14
744
15
#include <QtCore/QObject>
745
16
#include <QtDBus/QtDBus>
746
17
QT_BEGIN_NAMESPACE
747
18
class QByteArray;
748
19
template<class T> class QList;
749
20
template<class Key, class Value> class QMap;
750
21
class QString;
751
22
class QStringList;
752
23
class QVariant;
753
24
QT_END_NAMESPACE
754
25
755
26
/*
756
27
 * Adaptor class for interface org.bluez.Agent
757
28
 */
758
29
class AgentAdaptor: public QDBusAbstractAdaptor
759
30
{
760
31
    Q_OBJECT
761
32
    Q_CLASSINFO("D-Bus Interface", "org.bluez.Agent")
762
33
    Q_CLASSINFO("D-Bus Introspection", ""
763
34
"  <interface name=\"org.bluez.Agent\">\n"
764
35
"    <method name=\"RequestPinCode\">\n"
765
36
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
766
37
"      <arg type=\"o\" name=\"device\"/>\n"
767
38
"      <arg direction=\"out\" type=\"s\" name=\"pincode\"/>\n"
768
39
"    </method>\n"
769
40
"    <method name=\"RequestPasskey\">\n"
770
41
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
771
42
"      <arg type=\"o\" name=\"device\"/>\n"
772
43
"      <arg direction=\"out\" type=\"u\" name=\"passkey\"/>\n"
773
44
"    </method>\n"
774
45
"    <method name=\"DisplayPasskey\">\n"
775
46
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
776
47
"      <arg type=\"o\" name=\"device\"/>\n"
777
48
"      <arg type=\"u\" name=\"passkey\"/>\n"
778
49
"      <arg type=\"q\" name=\"entered\"/>\n"
779
50
"    </method>\n"
780
51
"    <method name=\"RequestConfirmation\">\n"
781
52
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
782
53
"      <arg type=\"o\" name=\"device\"/>\n"
783
54
"      <arg type=\"u\" name=\"passkey\"/>\n"
784
55
"    </method>\n"
785
56
"    <method name=\"Cancel\">\n"
786
57
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
787
58
"    </method>\n"
788
59
"    <method name=\"Release\">\n"
789
60
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
790
61
"    </method>\n"
791
62
"  </interface>\n"
792
63
        "")
793
64
public:
794
65
    AgentAdaptor(QObject *parent);
795
66
    virtual ~AgentAdaptor();
796
67
797
68
public: // PROPERTIES
798
69
public Q_SLOTS: // METHODS
799
70
    void Cancel();
800
71
    void DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered);
801
72
    void Release();
802
73
    void RequestConfirmation(const QDBusObjectPath &device, uint passkey);
803
74
    uint RequestPasskey(const QDBusObjectPath &device);
804
75
    QString RequestPinCode(const QDBusObjectPath &device);
805
76
Q_SIGNALS: // SIGNALS
806
77
};
807
78
808
79
#endif
809
80
0
810
=== modified file 'plugins/bluetooth/bluetooth.cpp'
811
--- plugins/bluetooth/bluetooth.cpp	2015-08-28 09:32:38 +0000
812
+++ plugins/bluetooth/bluetooth.cpp	2015-11-20 08:48:08 +0000
813
@@ -23,7 +23,6 @@
814
23
#include <QQmlEngine>
23
#include <QQmlEngine>
815
24
24
816
25
#include "agent.h"
25
#include "agent.h"
817
26
#include "agentadaptor.h"
818
27
#include "dbus-shared.h"
26
#include "dbus-shared.h"
819
28
27
820
29
Bluetooth::Bluetooth(QObject *parent):
28
Bluetooth::Bluetooth(QObject *parent):
821
@@ -38,7 +37,7 @@
822
38
    m_agent(m_dbus, m_devices)
37
    m_agent(m_dbus, m_devices)
823
39
{
38
{
824
40
    // export our Agent to handle pairing requests
39
    // export our Agent to handle pairing requests
826
41
    new AgentAdaptor(&m_agent);
40
    new BluezAgent1Adaptor(&m_agent);
827
42
    if(!m_dbus.registerObject(DBUS_ADAPTER_AGENT_PATH, &m_agent))
41
    if(!m_dbus.registerObject(DBUS_ADAPTER_AGENT_PATH, &m_agent))
828
43
        qCritical() << "Couldn't register agent at" << DBUS_ADAPTER_AGENT_PATH;
42
        qCritical() << "Couldn't register agent at" << DBUS_ADAPTER_AGENT_PATH;
829
44
43
830
@@ -63,6 +62,9 @@
831
63
62
832
64
    QObject::connect(&m_devices, SIGNAL(discoverableChanged(bool)),
63
    QObject::connect(&m_devices, SIGNAL(discoverableChanged(bool)),
833
65
                     this, SIGNAL(discoverableChanged(bool)));
64
                     this, SIGNAL(discoverableChanged(bool)));
834
65
835
66
    QObject::connect(&m_devices, SIGNAL(devicePairingDone(Device*,bool)),
836
67
                     this, SIGNAL(devicePairingDone(Device*,bool)));
837
66
}
68
}
838
67
69
839
68
void Bluetooth::setSelectedDevice(const QString &address)
70
void Bluetooth::setSelectedDevice(const QString &address)
840
@@ -110,6 +112,7 @@
841
110
    case Device::Type::OtherAudio:
112
    case Device::Type::OtherAudio:
842
111
    case Device::Type::Keyboard:
113
    case Device::Type::Keyboard:
843
112
    case Device::Type::Mouse:
114
    case Device::Type::Mouse:
844
115
    case Device::Type::Watch:
845
113
        return true;
116
        return true;
846
114
117
847
115
    default:
118
    default:
848
@@ -167,73 +170,38 @@
849
167
170
850
168
void Bluetooth::disconnectDevice()
171
void Bluetooth::disconnectDevice()
851
169
{
172
{
873
170
    if (m_selectedDevice) {
173
    if (!m_selectedDevice)
874
171
        auto type = m_selectedDevice->getType();
174
        return;
875
172
        switch ((Device::Type)type) {
175
876
173
        case Device::Type::Headset:
176
    m_selectedDevice->disconnect();
856
174
        case Device::Type::Headphones:
857
175
        case Device::Type::OtherAudio:
858
176
        case Device::Type::Speakers:
859
177
        case Device::Type::Carkit:
860
178
            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
861
179
            break;
862
180
        case Device::Type::Keyboard:
863
181
        case Device::Type::Mouse:
864
182
            m_selectedDevice->disconnect(Device::ConnectionMode::Input);
865
183
            break;
866
184
        default:
867
185
            qWarning() << "Nothing to disconnect: Unsupported device type.";
868
186
            break;
869
187
        }
870
188
    } else {
871
189
        qWarning() << "No selected device to disconnect";
872
190
    }
877
191
}
177
}
878
192
178
879
193
void Bluetooth::connectDevice(const QString &address)
179
void Bluetooth::connectDevice(const QString &address)
880
194
{
180
{
881
195
    Device::ConnectionMode connMode;
882
196
    auto device = m_devices.getDeviceFromAddress(address);
181
    auto device = m_devices.getDeviceFromAddress(address);
883
197
    Device::Type type;
884
198
182
885
199
    if (!device) {
183
    if (!device) {
886
200
        qWarning() << "No device to connect.";
184
        qWarning() << "No device to connect.";
887
201
        return;
185
        return;
888
202
    }
186
    }
889
203
187
906
204
    type = device->getType();
188
    if (!device->isPaired()) {
907
205
    switch (type) {
189
        device->setConnectAfterPairing(true);
908
206
    case Device::Type::Headset:
190
        device->pair();
893
207
    case Device::Type::Headphones:
894
208
    case Device::Type::OtherAudio:
895
209
    case Device::Type::Speakers:
896
210
    case Device::Type::Carkit:
897
211
        connMode = Device::ConnectionMode::Audio;
898
212
        break;
899
213
    case Device::Type::Keyboard:
900
214
    case Device::Type::Mouse:
901
215
        connMode = Device::ConnectionMode::Input;
902
216
        break;
903
217
    default:
904
218
        qWarning() << "Nothing to connect: Unsupported device type.";
905
219
        return;
909
220
    }
191
    }
916
221
192
    else {
917
222
    if (device->isTrusted()) {
193
        device->connect();
912
223
        device->connect(connMode);
913
224
    } else {
914
225
        m_devices.addConnectAfterPairing(address, connMode);
915
226
        m_devices.createDevice(address, &m_agent);
918
227
    }
194
    }
919
228
}
195
}
920
229
196
921
230
void Bluetooth::removeDevice()
197
void Bluetooth::removeDevice()
922
231
{
198
{
927
232
    if (m_selectedDevice) {
199
    if (!m_selectedDevice) {
924
233
        QString path = m_selectedDevice->getPath();
925
234
        m_devices.removeDevice(path);
926
235
    } else {
928
236
        qWarning() << "No selected device to remove.";
200
        qWarning() << "No selected device to remove.";
929
201
        return;
930
237
    }
202
    }
931
203
932
204
    QString path = m_selectedDevice->getPath();
933
205
    m_devices.removeDevice(path);
934
238
}
206
}
935
239
207
936
240
208
937
=== modified file 'plugins/bluetooth/bluetooth.h'
938
--- plugins/bluetooth/bluetooth.h	2015-08-28 09:32:38 +0000
939
+++ plugins/bluetooth/bluetooth.h	2015-11-20 08:48:08 +0000
940
@@ -24,9 +24,10 @@
941
24
#include <QObject>
24
#include <QObject>
942
25
25
943
26
#include "agent.h"
26
#include "agent.h"
944
27
#include "agentadaptor.h"
945
28
#include "devicemodel.h"
27
#include "devicemodel.h"
946
29
28
947
29
#include "bluez_agent1adaptor.h"
948
30
949
30
class Bluetooth : public QObject
31
class Bluetooth : public QObject
950
31
{
32
{
951
32
    Q_OBJECT
33
    Q_OBJECT
952
@@ -68,6 +69,7 @@
953
68
    void poweredChanged(bool powered);
69
    void poweredChanged(bool powered);
954
69
    void discoveringChanged(bool isActive);
70
    void discoveringChanged(bool isActive);
955
70
    void discoverableChanged(bool isActive);
71
    void discoverableChanged(bool isActive);
956
72
    void devicePairingDone(Device *device, bool success);
957
71
73
958
72
public:
74
public:
959
73
    explicit Bluetooth(QObject *parent = nullptr);
75
    explicit Bluetooth(QObject *parent = nullptr);
960
74
76
961
=== added file 'plugins/bluetooth/bluez_adapter1.cpp'
962
--- plugins/bluetooth/bluez_adapter1.cpp	1970-01-01 00:00:00 +0000
963
+++ plugins/bluetooth/bluez_adapter1.cpp	2015-11-20 08:48:08 +0000
964
@@ -0,0 +1,26 @@
965
1
/*
966
2
 * This file was generated by qdbusxml2cpp version 0.8
967
3
 * Command line was: qdbusxml2cpp -c BluezAdapter1 -p bluez_adapter1 -v org.bluez.Adapter1.xml
968
4
 *
969
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
970
6
 *
971
7
 * This is an auto-generated file.
972
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
973
9
 * before re-generating it.
974
10
 */
975
11
976
12
#include "bluez_adapter1.h"
977
13
978
14
/*
979
15
 * Implementation of interface class BluezAdapter1
980
16
 */
981
17
982
18
BluezAdapter1::BluezAdapter1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
983
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
984
20
{
985
21
}
986
22
987
23
BluezAdapter1::~BluezAdapter1()
988
24
{
989
25
}
990
26
991
0
27
992
=== added file 'plugins/bluetooth/bluez_adapter1.h'
993
--- plugins/bluetooth/bluez_adapter1.h	1970-01-01 00:00:00 +0000
994
+++ plugins/bluetooth/bluez_adapter1.h	2015-11-20 08:48:08 +0000
995
@@ -0,0 +1,66 @@
996
1
/*
997
2
 * This file was generated by qdbusxml2cpp version 0.8
998
3
 * Command line was: qdbusxml2cpp -c BluezAdapter1 -p bluez_adapter1 -v org.bluez.Adapter1.xml
999
4
 *
1000
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1001
6
 *
1002
7
 * This is an auto-generated file.
1003
8
 * Do not edit! All changes made to it will be lost.
1004
9
 */
1005
10
1006
11
#ifndef BLUEZ_ADAPTER1_H_1442480417
1007
12
#define BLUEZ_ADAPTER1_H_1442480417
1008
13
1009
14
#include <QtCore/QObject>
1010
15
#include <QtCore/QByteArray>
1011
16
#include <QtCore/QList>
1012
17
#include <QtCore/QMap>
1013
18
#include <QtCore/QString>
1014
19
#include <QtCore/QStringList>
1015
20
#include <QtCore/QVariant>
1016
21
#include <QtDBus/QtDBus>
1017
22
1018
23
/*
1019
24
 * Proxy class for interface org.bluez.Adapter1
1020
25
 */
1021
26
class BluezAdapter1: public QDBusAbstractInterface
1022
27
{
1023
28
    Q_OBJECT
1024
29
public:
1025
30
    static inline const char *staticInterfaceName()
1026
31
    { return "org.bluez.Adapter1"; }
1027
32
1028
33
public:
1029
34
    BluezAdapter1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
1030
35
1031
36
    ~BluezAdapter1();
1032
37
1033
38
public Q_SLOTS: // METHODS
1034
39
    inline QDBusPendingReply<> RemoveDevice(const QDBusObjectPath &device)
1035
40
    {
1036
41
        QList<QVariant> argumentList;
1037
42
        argumentList << QVariant::fromValue(device);
1038
43
        return asyncCallWithArgumentList(QStringLiteral("RemoveDevice"), argumentList);
1039
44
    }
1040
45
1041
46
    inline QDBusPendingReply<> StartDiscovery()
1042
47
    {
1043
48
        QList<QVariant> argumentList;
1044
49
        return asyncCallWithArgumentList(QStringLiteral("StartDiscovery"), argumentList);
1045
50
    }
1046
51
1047
52
    inline QDBusPendingReply<> StopDiscovery()
1048
53
    {
1049
54
        QList<QVariant> argumentList;
1050
55
        return asyncCallWithArgumentList(QStringLiteral("StopDiscovery"), argumentList);
1051
56
    }
1052
57
1053
58
Q_SIGNALS: // SIGNALS
1054
59
};
1055
60
1056
61
namespace org {
1057
62
  namespace bluez {
1058
63
    typedef ::BluezAdapter1 Adapter1;
1059
64
  }
1060
65
}
1061
66
#endif
1062
0
67
1063
=== added file 'plugins/bluetooth/bluez_agent1adaptor.cpp'
1064
--- plugins/bluetooth/bluez_agent1adaptor.cpp	1970-01-01 00:00:00 +0000
1065
+++ plugins/bluetooth/bluez_agent1adaptor.cpp	2015-11-20 08:48:08 +0000
1066
@@ -0,0 +1,93 @@
1067
1
/*
1068
2
 * This file was generated by qdbusxml2cpp version 0.8
1069
3
 * Command line was: qdbusxml2cpp -a bluez_agent1adaptor -c BluezAgent1Adaptor org.bluez.Agent1.xml
1070
4
 *
1071
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1072
6
 *
1073
7
 * This is an auto-generated file.
1074
8
 * Do not edit! All changes made to it will be lost.
1075
9
 */
1076
10
1077
11
#include "bluez_agent1adaptor.h"
1078
12
#include <QtCore/QMetaObject>
1079
13
#include <QtCore/QByteArray>
1080
14
#include <QtCore/QList>
1081
15
#include <QtCore/QMap>
1082
16
#include <QtCore/QString>
1083
17
#include <QtCore/QStringList>
1084
18
#include <QtCore/QVariant>
1085
19
1086
20
/*
1087
21
 * Implementation of adaptor class BluezAgent1Adaptor
1088
22
 */
1089
23
1090
24
BluezAgent1Adaptor::BluezAgent1Adaptor(QObject *parent)
1091
25
    : QDBusAbstractAdaptor(parent)
1092
26
{
1093
27
    // constructor
1094
28
    setAutoRelaySignals(true);
1095
29
}
1096
30
1097
31
BluezAgent1Adaptor::~BluezAgent1Adaptor()
1098
32
{
1099
33
    // destructor
1100
34
}
1101
35
1102
36
void BluezAgent1Adaptor::AuthorizeService(const QDBusObjectPath &device, const QString &uuid)
1103
37
{
1104
38
    // handle method call org.bluez.Agent1.AuthorizeService
1105
39
    QMetaObject::invokeMethod(parent(), "AuthorizeService", Q_ARG(QDBusObjectPath, device), Q_ARG(QString, uuid));
1106
40
}
1107
41
1108
42
void BluezAgent1Adaptor::Cancel()
1109
43
{
1110
44
    // handle method call org.bluez.Agent1.Cancel
1111
45
    QMetaObject::invokeMethod(parent(), "Cancel");
1112
46
}
1113
47
1114
48
void BluezAgent1Adaptor::DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered)
1115
49
{
1116
50
    // handle method call org.bluez.Agent1.DisplayPasskey
1117
51
    QMetaObject::invokeMethod(parent(), "DisplayPasskey", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey), Q_ARG(ushort, entered));
1118
52
}
1119
53
1120
54
void BluezAgent1Adaptor::DisplayPinCode(const QDBusObjectPath &device, const QString &pincode)
1121
55
{
1122
56
    // handle method call org.bluez.Agent1.DisplayPinCode
1123
57
    QMetaObject::invokeMethod(parent(), "DisplayPinCode", Q_ARG(QDBusObjectPath, device), Q_ARG(QString, pincode));
1124
58
}
1125
59
1126
60
void BluezAgent1Adaptor::Release()
1127
61
{
1128
62
    // handle method call org.bluez.Agent1.Release
1129
63
    QMetaObject::invokeMethod(parent(), "Release");
1130
64
}
1131
65
1132
66
void BluezAgent1Adaptor::RequestAuthorization(const QDBusObjectPath &device)
1133
67
{
1134
68
    // handle method call org.bluez.Agent1.RequestAuthorization
1135
69
    QMetaObject::invokeMethod(parent(), "RequestAuthorization", Q_ARG(QDBusObjectPath, device));
1136
70
}
1137
71
1138
72
void BluezAgent1Adaptor::RequestConfirmation(const QDBusObjectPath &device, uint passkey)
1139
73
{
1140
74
    // handle method call org.bluez.Agent1.RequestConfirmation
1141
75
    QMetaObject::invokeMethod(parent(), "RequestConfirmation", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey));
1142
76
}
1143
77
1144
78
uint BluezAgent1Adaptor::RequestPasskey(const QDBusObjectPath &device)
1145
79
{
1146
80
    // handle method call org.bluez.Agent1.RequestPasskey
1147
81
    uint passkey;
1148
82
    QMetaObject::invokeMethod(parent(), "RequestPasskey", Q_RETURN_ARG(uint, passkey), Q_ARG(QDBusObjectPath, device));
1149
83
    return passkey;
1150
84
}
1151
85
1152
86
QString BluezAgent1Adaptor::RequestPinCode(const QDBusObjectPath &device)
1153
87
{
1154
88
    // handle method call org.bluez.Agent1.RequestPinCode
1155
89
    QString pincode;
1156
90
    QMetaObject::invokeMethod(parent(), "RequestPinCode", Q_RETURN_ARG(QString, pincode), Q_ARG(QDBusObjectPath, device));
1157
91
    return pincode;
1158
92
}
1159
93
1160
0
94
1161
=== added file 'plugins/bluetooth/bluez_agent1adaptor.h'
1162
--- plugins/bluetooth/bluez_agent1adaptor.h	1970-01-01 00:00:00 +0000
1163
+++ plugins/bluetooth/bluez_agent1adaptor.h	2015-11-20 08:48:08 +0000
1164
@@ -0,0 +1,96 @@
1165
1
/*
1166
2
 * This file was generated by qdbusxml2cpp version 0.8
1167
3
 * Command line was: qdbusxml2cpp -a bluez_agent1adaptor -c BluezAgent1Adaptor org.bluez.Agent1.xml
1168
4
 *
1169
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1170
6
 *
1171
7
 * This is an auto-generated file.
1172
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
1173
9
 * before re-generating it.
1174
10
 */
1175
11
1176
12
#ifndef BLUEZ_AGENT1ADAPTOR_H_1442560744
1177
13
#define BLUEZ_AGENT1ADAPTOR_H_1442560744
1178
14
1179
15
#include <QtCore/QObject>
1180
16
#include <QtDBus/QtDBus>
1181
17
QT_BEGIN_NAMESPACE
1182
18
class QByteArray;
1183
19
template<class T> class QList;
1184
20
template<class Key, class Value> class QMap;
1185
21
class QString;
1186
22
class QStringList;
1187
23
class QVariant;
1188
24
QT_END_NAMESPACE
1189
25
1190
26
/*
1191
27
 * Adaptor class for interface org.bluez.Agent1
1192
28
 */
1193
29
class BluezAgent1Adaptor: public QDBusAbstractAdaptor
1194
30
{
1195
31
    Q_OBJECT
1196
32
    Q_CLASSINFO("D-Bus Interface", "org.bluez.Agent1")
1197
33
    Q_CLASSINFO("D-Bus Introspection", ""
1198
34
"  <interface name=\"org.bluez.Agent1\">\n"
1199
35
"    <method name=\"RequestPinCode\">\n"
1200
36
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1201
37
"      <arg type=\"o\" name=\"device\"/>\n"
1202
38
"      <arg direction=\"out\" type=\"s\" name=\"pincode\"/>\n"
1203
39
"    </method>\n"
1204
40
"    <method name=\"DisplayPinCode\">\n"
1205
41
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1206
42
"      <arg type=\"o\" name=\"device\"/>\n"
1207
43
"      <arg type=\"s\" name=\"pincode\"/>\n"
1208
44
"    </method>\n"
1209
45
"    <method name=\"RequestPasskey\">\n"
1210
46
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1211
47
"      <arg type=\"o\" name=\"device\"/>\n"
1212
48
"      <arg direction=\"out\" type=\"u\" name=\"passkey\"/>\n"
1213
49
"    </method>\n"
1214
50
"    <method name=\"DisplayPasskey\">\n"
1215
51
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1216
52
"      <arg type=\"o\" name=\"device\"/>\n"
1217
53
"      <arg type=\"u\" name=\"passkey\"/>\n"
1218
54
"      <arg type=\"q\" name=\"entered\"/>\n"
1219
55
"    </method>\n"
1220
56
"    <method name=\"RequestConfirmation\">\n"
1221
57
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1222
58
"      <arg type=\"o\" name=\"device\"/>\n"
1223
59
"      <arg type=\"u\" name=\"passkey\"/>\n"
1224
60
"    </method>\n"
1225
61
"    <method name=\"RequestAuthorization\">\n"
1226
62
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1227
63
"      <arg type=\"o\" name=\"device\"/>\n"
1228
64
"    </method>\n"
1229
65
"    <method name=\"AuthorizeService\">\n"
1230
66
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1231
67
"      <arg type=\"o\" name=\"device\"/>\n"
1232
68
"      <arg type=\"s\" name=\"uuid\"/>\n"
1233
69
"    </method>\n"
1234
70
"    <method name=\"Cancel\">\n"
1235
71
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1236
72
"    </method>\n"
1237
73
"    <method name=\"Release\">\n"
1238
74
"      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
1239
75
"    </method>\n"
1240
76
"  </interface>\n"
1241
77
        "")
1242
78
public:
1243
79
    BluezAgent1Adaptor(QObject *parent);
1244
80
    virtual ~BluezAgent1Adaptor();
1245
81
1246
82
public: // PROPERTIES
1247
83
public Q_SLOTS: // METHODS
1248
84
    void AuthorizeService(const QDBusObjectPath &device, const QString &uuid);
1249
85
    void Cancel();
1250
86
    void DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered);
1251
87
    void DisplayPinCode(const QDBusObjectPath &device, const QString &pincode);
1252
88
    void Release();
1253
89
    void RequestAuthorization(const QDBusObjectPath &device);
1254
90
    void RequestConfirmation(const QDBusObjectPath &device, uint passkey);
1255
91
    uint RequestPasskey(const QDBusObjectPath &device);
1256
92
    QString RequestPinCode(const QDBusObjectPath &device);
1257
93
Q_SIGNALS: // SIGNALS
1258
94
};
1259
95
1260
96
#endif
1261
0
97
1262
=== added file 'plugins/bluetooth/bluez_agentmanager1.cpp'
1263
--- plugins/bluetooth/bluez_agentmanager1.cpp	1970-01-01 00:00:00 +0000
1264
+++ plugins/bluetooth/bluez_agentmanager1.cpp	2015-11-20 08:48:08 +0000
1265
@@ -0,0 +1,26 @@
1266
1
/*
1267
2
 * This file was generated by qdbusxml2cpp version 0.8
1268
3
 * Command line was: qdbusxml2cpp -c BluezAgentManager1 -p bluez_agentmanager1 org.bluez.AgentManager1.xml
1269
4
 *
1270
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1271
6
 *
1272
7
 * This is an auto-generated file.
1273
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
1274
9
 * before re-generating it.
1275
10
 */
1276
11
1277
12
#include "bluez_agentmanager1.h"
1278
13
1279
14
/*
1280
15
 * Implementation of interface class BluezAgentManager1
1281
16
 */
1282
17
1283
18
BluezAgentManager1::BluezAgentManager1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
1284
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
1285
20
{
1286
21
}
1287
22
1288
23
BluezAgentManager1::~BluezAgentManager1()
1289
24
{
1290
25
}
1291
26
1292
0
27
1293
=== added file 'plugins/bluetooth/bluez_agentmanager1.h'
1294
--- plugins/bluetooth/bluez_agentmanager1.h	1970-01-01 00:00:00 +0000
1295
+++ plugins/bluetooth/bluez_agentmanager1.h	2015-11-20 08:48:08 +0000
1296
@@ -0,0 +1,68 @@
1297
1
/*
1298
2
 * This file was generated by qdbusxml2cpp version 0.8
1299
3
 * Command line was: qdbusxml2cpp -c BluezAgentManager1 -p bluez_agentmanager1 org.bluez.AgentManager1.xml
1300
4
 *
1301
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1302
6
 *
1303
7
 * This is an auto-generated file.
1304
8
 * Do not edit! All changes made to it will be lost.
1305
9
 */
1306
10
1307
11
#ifndef BLUEZ_AGENTMANAGER1_H_1442489332
1308
12
#define BLUEZ_AGENTMANAGER1_H_1442489332
1309
13
1310
14
#include <QtCore/QObject>
1311
15
#include <QtCore/QByteArray>
1312
16
#include <QtCore/QList>
1313
17
#include <QtCore/QMap>
1314
18
#include <QtCore/QString>
1315
19
#include <QtCore/QStringList>
1316
20
#include <QtCore/QVariant>
1317
21
#include <QtDBus/QtDBus>
1318
22
1319
23
/*
1320
24
 * Proxy class for interface org.bluez.AgentManager1
1321
25
 */
1322
26
class BluezAgentManager1: public QDBusAbstractInterface
1323
27
{
1324
28
    Q_OBJECT
1325
29
public:
1326
30
    static inline const char *staticInterfaceName()
1327
31
    { return "org.bluez.AgentManager1"; }
1328
32
1329
33
public:
1330
34
    BluezAgentManager1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
1331
35
1332
36
    ~BluezAgentManager1();
1333
37
1334
38
public Q_SLOTS: // METHODS
1335
39
    inline QDBusPendingReply<> RegisterAgent(const QDBusObjectPath &agent, const QString &capability)
1336
40
    {
1337
41
        QList<QVariant> argumentList;
1338
42
        argumentList << QVariant::fromValue(agent) << QVariant::fromValue(capability);
1339
43
        return asyncCallWithArgumentList(QStringLiteral("RegisterAgent"), argumentList);
1340
44
    }
1341
45
1342
46
    inline QDBusPendingReply<> RequestDefaultAgent(const QDBusObjectPath &agent)
1343
47
    {
1344
48
        QList<QVariant> argumentList;
1345
49
        argumentList << QVariant::fromValue(agent);
1346
50
        return asyncCallWithArgumentList(QStringLiteral("RequestDefaultAgent"), argumentList);
1347
51
    }
1348
52
1349
53
    inline QDBusPendingReply<> UnregisterAgent(const QDBusObjectPath &agent)
1350
54
    {
1351
55
        QList<QVariant> argumentList;
1352
56
        argumentList << QVariant::fromValue(agent);
1353
57
        return asyncCallWithArgumentList(QStringLiteral("UnregisterAgent"), argumentList);
1354
58
    }
1355
59
1356
60
Q_SIGNALS: // SIGNALS
1357
61
};
1358
62
1359
63
namespace org {
1360
64
  namespace bluez {
1361
65
    typedef ::BluezAgentManager1 AgentManager1;
1362
66
  }
1363
67
}
1364
68
#endif
1365
0
69
1366
=== added file 'plugins/bluetooth/bluez_device1.cpp'
1367
--- plugins/bluetooth/bluez_device1.cpp	1970-01-01 00:00:00 +0000
1368
+++ plugins/bluetooth/bluez_device1.cpp	2015-11-20 08:48:08 +0000
1369
@@ -0,0 +1,26 @@
1370
1
/*
1371
2
 * This file was generated by qdbusxml2cpp version 0.8
1372
3
 * Command line was: qdbusxml2cpp -c BluezDevice1 -p bluez_device1 org.bluez.Device1.xml
1373
4
 *
1374
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1375
6
 *
1376
7
 * This is an auto-generated file.
1377
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
1378
9
 * before re-generating it.
1379
10
 */
1380
11
1381
12
#include "bluez_device1.h"
1382
13
1383
14
/*
1384
15
 * Implementation of interface class BluezDevice1
1385
16
 */
1386
17
1387
18
BluezDevice1::BluezDevice1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
1388
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
1389
20
{
1390
21
}
1391
22
1392
23
BluezDevice1::~BluezDevice1()
1393
24
{
1394
25
}
1395
26
1396
0
27
1397
=== added file 'plugins/bluetooth/bluez_device1.h'
1398
--- plugins/bluetooth/bluez_device1.h	1970-01-01 00:00:00 +0000
1399
+++ plugins/bluetooth/bluez_device1.h	2015-11-20 08:48:08 +0000
1400
@@ -0,0 +1,85 @@
1401
1
/*
1402
2
 * This file was generated by qdbusxml2cpp version 0.8
1403
3
 * Command line was: qdbusxml2cpp -c BluezDevice1 -p bluez_device1 org.bluez.Device1.xml
1404
4
 *
1405
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
1406
6
 *
1407
7
 * This is an auto-generated file.
1408
8
 * Do not edit! All changes made to it will be lost.
1409
9
 */
1410
10
1411
11
#ifndef BLUEZ_DEVICE1_H_1442480478
1412
12
#define BLUEZ_DEVICE1_H_1442480478
1413
13
1414
14
#include <QtCore/QObject>
1415
15
#include <QtCore/QByteArray>
1416
16
#include <QtCore/QList>
1417
17
#include <QtCore/QMap>
1418
18
#include <QtCore/QString>
1419
19
#include <QtCore/QStringList>
1420
20
#include <QtCore/QVariant>
1421
21
#include <QtDBus/QtDBus>
1422
22
1423
23
/*
1424
24
 * Proxy class for interface org.bluez.Device1
1425
25
 */
1426
26
class BluezDevice1: public QDBusAbstractInterface
1427
27
{
1428
28
    Q_OBJECT
1429
29
public:
1430
30
    static inline const char *staticInterfaceName()
1431
31
    { return "org.bluez.Device1"; }
1432
32
1433
33
public:
1434
34
    BluezDevice1(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
1435
35
1436
36
    ~BluezDevice1();
1437
37
1438
38
public Q_SLOTS: // METHODS
1439
39
    inline QDBusPendingReply<> CancelPairing()
1440
40
    {
1441
41
        QList<QVariant> argumentList;
1442
42
        return asyncCallWithArgumentList(QStringLiteral("CancelPairing"), argumentList);
1443
43
    }
1444
44
1445
45
    inline QDBusPendingReply<> Connect()
1446
46
    {
1447
47
        QList<QVariant> argumentList;
1448
48
        return asyncCallWithArgumentList(QStringLiteral("Connect"), argumentList);
1449
49
    }
1450
50
1451
51
    inline QDBusPendingReply<> ConnectProfile(const QString &UUID)
1452
52
    {
1453
53
        QList<QVariant> argumentList;
1454
54
        argumentList << QVariant::fromValue(UUID);
1455
55
        return asyncCallWithArgumentList(QStringLiteral("ConnectProfile"), argumentList);
1456
56
    }
1457
57
1458
58
    inline QDBusPendingReply<> Disconnect()
1459
59
    {
1460
60
        QList<QVariant> argumentList;
1461
61
        return asyncCallWithArgumentList(QStringLiteral("Disconnect"), argumentList);
1462
62
    }
1463
63
1464
64
    inline QDBusPendingReply<> DisconnectProfile(const QString &UUID)
1465
65
    {
1466
66
        QList<QVariant> argumentList;
1467
67
        argumentList << QVariant::fromValue(UUID);
1468
68
        return asyncCallWithArgumentList(QStringLiteral("DisconnectProfile"), argumentList);
1469
69
    }
1470
70
1471
71
    inline QDBusPendingReply<> Pair()
1472
72
    {
1473
73
        QList<QVariant> argumentList;
1474
74
        return asyncCallWithArgumentList(QStringLiteral("Pair"), argumentList);
1475
75
    }
1476
76
1477
77
Q_SIGNALS: // SIGNALS
1478
78
};
1479
79
1480
80
namespace org {
1481
81
  namespace bluez {
1482
82
    typedef ::BluezDevice1 Device1;
1483
83
  }
1484
84
}
1485
85
#endif
1486
0
86
1487
=== added file 'plugins/bluetooth/bluez_helper.h'
1488
--- plugins/bluetooth/bluez_helper.h	1970-01-01 00:00:00 +0000
1489
+++ plugins/bluetooth/bluez_helper.h	2015-11-20 08:48:08 +0000
1490
@@ -0,0 +1,29 @@
1491
1
/*
1492
2
 * Copyright (C) 2015 Canonical Ltd
1493
3
 *
1494
4
 * This program is free software: you can redistribute it and/or modify
1495
5
 * it under the terms of the GNU General Public License version 3 as
1496
6
 * published by the Free Software Foundation.
1497
7
 *
1498
8
 * This program is distributed in the hope that it will be useful,
1499
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1500
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1501
11
 * GNU General Public License for more details.
1502
12
 *
1503
13
 * You should have received a copy of the GNU General Public License
1504
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1505
15
 *
1506
16
*/
1507
17
1508
18
#ifndef BLUEZ_HELPER_H_
1509
19
#define BLUEZ_HELPER_H_
1510
20
1511
21
#include <QObject>
1512
22
1513
23
typedef QMap<QString, QVariantMap> InterfaceList;
1514
24
typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList;
1515
25
1516
26
Q_DECLARE_METATYPE(InterfaceList)
1517
27
Q_DECLARE_METATYPE(ManagedObjectList)
1518
28
1519
29
#endif
1520
0
30
1521
=== modified file 'plugins/bluetooth/dbus-shared.h'
1522
--- plugins/bluetooth/dbus-shared.h	2015-08-28 09:32:38 +0000
1523
+++ plugins/bluetooth/dbus-shared.h	2015-11-20 08:48:08 +0000
1524
@@ -24,4 +24,13 @@
1525
24
#define DBUS_ADAPTER_AGENT_PATH "/com/canonical/SettingsBluetoothAgent/adapteragent"
24
#define DBUS_ADAPTER_AGENT_PATH "/com/canonical/SettingsBluetoothAgent/adapteragent"
1526
25
#define DBUS_AGENT_CAPABILITY "KeyboardDisplay"
25
#define DBUS_AGENT_CAPABILITY "KeyboardDisplay"
1527
26
26
1528
27
#define BLUEZ_SERVICE "org.bluez"
1529
28
1530
29
#define BLUEZ_ADAPTER_IFACE "org.bluez.Adapter1"
1531
30
#define BLUEZ_DEVICE_IFACE "org.bluez.Device1"
1532
31
1533
32
#define watchCall(call, func) \
1534
33
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this); \
1535
34
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, func)
1536
35
1537
27
#endif // USS_DBUS_SHARED_H
36
#endif // USS_DBUS_SHARED_H
1538
28
37
1539
=== modified file 'plugins/bluetooth/device.cpp'
1540
--- plugins/bluetooth/device.cpp	2015-08-28 09:32:38 +0000
1541
+++ plugins/bluetooth/device.cpp	2015-11-20 08:48:08 +0000
1542
@@ -26,16 +26,8 @@
1543
26
26
1544
27
#include "dbus-shared.h"
27
#include "dbus-shared.h"
1545
28
28
1556
29
/***
29
Device::Device(const QString &path, QDBusConnection &bus) :
1557
30
****
30
   m_strength(Device::None)
1548
31
***/
1549
32
1550
33
Device::Device(const QMap<QString,QVariant> &properties)
1551
34
{
1552
35
    setProperties(properties);
1553
36
}
1554
37
1555
38
Device::Device(const QString &path, QDBusConnection &bus)
1558
39
{
31
{
1559
40
    initDevice(path, bus);
32
    initDevice(path, bus);
1560
41
}
33
}
1561
@@ -53,53 +45,44 @@
1562
53
    QObject::connect(this, SIGNAL(connectionChanged()), this, SIGNAL(deviceChanged()));
45
    QObject::connect(this, SIGNAL(connectionChanged()), this, SIGNAL(deviceChanged()));
1563
54
    QObject::connect(this, SIGNAL(strengthChanged()), this, SIGNAL(deviceChanged()));
46
    QObject::connect(this, SIGNAL(strengthChanged()), this, SIGNAL(deviceChanged()));
1564
55
47
1572
56
    // init the interfaces that we're supporting.
48
    m_bluezDevice.reset(new BluezDevice1(BLUEZ_SERVICE, path, bus));
1573
57
    initInterface(m_deviceInterface,      path, "org.bluez.Device",      bus);
49
    /* Give our calls a bit more time than the default 25 seconds to
1574
58
    initInterface(m_audioInterface,       path, "org.bluez.Audio",       bus);
50
     * complete whatever they are doing. In some situations (e.g. with
1575
59
    initInterface(m_audioSourceInterface, path, "org.bluez.AudioSource", bus);
51
     * specific devices) the default doesn't seem to be enough to. */
1576
60
    initInterface(m_audioSinkInterface,   path, "org.bluez.AudioSink",   bus);
52
    m_bluezDevice->setTimeout(60 * 1000 /* 60 seconds */);
1577
61
    initInterface(m_headsetInterface,     path, "org.bluez.Headset",     bus);
53
1578
62
    initInterface(m_inputInterface,       path, "org.bluez.Input",       bus);
54
    m_bluezDeviceProperties.reset(new FreeDesktopProperties(BLUEZ_SERVICE, path, bus));
1579
55
1580
56
    QObject::connect(m_bluezDeviceProperties.data(), SIGNAL(PropertiesChanged(const QString&, const QVariantMap&, const QStringList&)),
1581
57
                     this, SLOT(slotPropertiesChanged(const QString&, const QVariantMap&, const QStringList&)));
1582
63
58
1583
64
    Q_EMIT(pathChanged());
59
    Q_EMIT(pathChanged());
1622
65
}
60
1623
66
61
    watchCall(m_bluezDeviceProperties->GetAll(BLUEZ_DEVICE_IFACE), [=](QDBusPendingCallWatcher *watcher) {
1624
67
/***
62
        QDBusPendingReply<QVariantMap> reply = *watcher;
1625
68
****
63
1626
69
***/
64
        if (reply.isError()) {
1627
70
65
            qWarning() << "Failed to retrieve properties for device" << m_bluezDevice->path();
1628
71
void Device::slotPropertyChanged(const QString      &key,
66
            watcher->deleteLater();
1629
72
                                 const QDBusVariant &value)
67
            return;
1630
73
{
68
        }
1631
74
  updateProperty (key, value.variant());
69
1632
75
}
70
        auto properties = reply.argumentAt<0>();
1633
76
71
        setProperties(properties);
1634
77
void Device::initInterface(QSharedPointer<QDBusInterface> &setme,
72
1635
78
                           const QString                  &path,
73
        watcher->deleteLater();
1636
79
                           const QString                  &interfaceName,
74
    });
1637
80
                           QDBusConnection                &bus)
75
}
1638
81
{
76
1639
82
    const QString service = "org.bluez";
77
void Device::slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
1640
83
78
                                   const QStringList &invalidatedProperties)
1641
84
    auto i = new QDBusInterface(service, path, interfaceName, bus);
79
{
1642
85
80
    Q_UNUSED(invalidatedProperties);
1643
86
    if (!i->isValid()) {
81
1644
87
        delete i;
82
   if (interface != BLUEZ_DEVICE_IFACE)
1645
88
        i = 0;
83
      return;
1646
89
        qWarning() << "Couldn't add proxy for" << interfaceName;
84
1647
90
    } else {
85
   setProperties(changedProperties);
1610
91
        if (!bus.connect(service, path, interfaceName, "PropertyChanged",
1611
92
                         this, SLOT(slotPropertyChanged(const QString&, const QDBusVariant&))))
1612
93
            qWarning() << "Unable to connect to " << interfaceName << "::PropertyChanged on" << path;
1613
94
    }
1614
95
1615
96
    setme.reset(i);
1616
97
1617
98
    if (setme && setme->isValid()) {
1618
99
        QDBusReply<QMap<QString,QVariant> > properties = setme->call("GetProperties");
1619
100
        if (properties.isValid())
1620
101
            setProperties(properties.value());
1621
102
    }
1648
103
}
86
}
1649
104
87
1650
105
void Device::setProperties(const QMap<QString,QVariant> &properties)
88
void Device::setProperties(const QMap<QString,QVariant> &properties)
1651
@@ -111,79 +94,118 @@
1652
111
    }
94
    }
1653
112
}
95
}
1654
113
96
1728
114
void Device::connectPending()
97
void Device::setConnectAfterPairing(bool value)
1729
115
{
98
{
1730
116
    if (m_paired && !m_trusted) {
99
    if (m_connectAfterPairing == value)
1731
117
        while (!m_connectAfterPairing.isEmpty()) {
100
        return;
1732
118
            ConnectionMode mode = m_connectAfterPairing.takeFirst();
101
1733
119
            connect(mode);
102
    m_connectAfterPairing = value;
1734
120
        }
103
}
1735
121
    }
104
1736
122
}
105
void Device::disconnect()
1737
123
106
{
1738
124
/***
107
    setConnection(Device::Disconnecting);
1739
125
****
108
1740
126
***/
109
    QDBusPendingCall call = m_bluezDevice->Disconnect();
1741
127
110
1742
128
void Device::addConnectAfterPairing(ConnectionMode mode)
111
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
1743
129
{
112
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
1744
130
    m_connectAfterPairing.append(mode);
113
        QDBusPendingReply<void> reply = *watcher;
1745
131
}
114
1746
132
115
        if (reply.isError()) {
1747
133
void Device::disconnect(ConnectionMode mode)
116
            qWarning() << "Could not disconnect device:"
1748
134
{
117
                       << reply.error().message();
1749
135
    QSharedPointer<QDBusInterface> interface;
118
1750
136
119
            // Make sure we switch the connection indicator back to
1751
137
    switch (mode) {
120
            // a sane state
1752
138
    case HeadsetMode:
121
            updateConnection();
1753
139
        interface = m_headsetInterface;
122
        }
1754
140
        break;
123
1755
141
    case Audio:
124
        watcher->deleteLater();
1756
142
        interface = m_audioInterface;
125
    });
1757
143
        break;
126
}
1758
144
    case Input:
127
1759
145
        interface = m_inputInterface;
128
void Device::connectAfterPairing()
1760
146
        break;
129
{
1761
147
    default:
130
    if (!m_connectAfterPairing)
1762
148
        qWarning() << "Unhandled connection mode" << mode;
131
        return;
1763
149
        return;
132
1764
150
    }
133
    connect();
1765
151
134
}
1766
152
    QDBusPendingCall call = interface->asyncCall("Disconnect");
135
1767
153
136
void Device::pair()
1768
154
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
137
{
1769
155
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
138
    if (m_paired) {
1770
156
        QDBusPendingReply<void> reply = *watcher;
139
        // If we are already paired we just have to make sure we
1771
157
140
        // trigger the connection process if we have to
1772
158
        if (reply.isError()) {
141
        connectAfterPairing();
1773
159
            qWarning() << "Could not connect device:"
142
        return;
1774
160
                       << reply.error().message();
143
    }
1775
161
        }
144
1776
162
145
    setConnection(Device::Connecting);
1777
163
        watcher->deleteLater();
146
1778
164
    });
147
    m_isPairing = true;
1779
165
}
148
1780
166
149
    auto call = m_bluezDevice->asyncCall("Pair");
1781
167
void Device::connect(ConnectionMode mode)
150
1782
168
{
151
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
1783
169
    QSharedPointer<QDBusInterface> interface;
152
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
1784
170
153
        QDBusPendingReply<void> reply = *watcher;
1785
171
    switch (mode) {
154
        bool success = true;
1786
172
    case HeadsetMode:
155
1787
173
        interface = m_headsetInterface;
156
        if (reply.isError()) {
1788
174
        break;
157
            qWarning() << "Failed to pair with device:"
1789
175
    case Audio:
158
                       << reply.error().message();
1790
176
        interface = m_audioInterface;
159
            updateConnection();
1791
177
        break;
160
            success = false;
1792
178
    case Input:
161
        }
1793
179
        interface = m_inputInterface;
162
1794
180
        break;
163
        m_isPairing = false;
1795
181
    default:
164
1796
182
        qWarning() << "Unhandled connection mode" << mode;
165
        Q_EMIT(pairingDone(success));
1797
183
        return;
166
1798
184
    }
167
        watcher->deleteLater();
1799
185
168
    });
1800
186
    QDBusPendingCall call = interface->asyncCall("Connect");
169
}
1801
170
1802
171
void Device::cancelPairing()
1803
172
{
1804
173
   if (!m_isPairing)
1805
174
      return;
1806
175
1807
176
    auto call = m_bluezDevice->asyncCall("CancelPairing");
1808
177
1809
178
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
1810
179
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
1811
180
        QDBusPendingReply<void> reply = *watcher;
1812
181
1813
182
        if (reply.isError()) {
1814
183
            qWarning() << "Failed to cancel pairing attempt with device:"
1815
184
                       << reply.error().message();
1816
185
            updateConnection();
1817
186
        } else {
1818
187
            // Only mark us a not pairing when call succeeded
1819
188
            m_isPairing = false;
1820
189
        }
1821
190
1822
191
        watcher->deleteLater();
1823
192
    });
1824
193
}
1825
194
1826
195
void Device::connect()
1827
196
{
1828
197
    // If we have just paired then the device switched to connected = true for
1829
198
    // a short moment as BlueZ opened up a RFCOMM channel to perform SDP. If
1830
199
    // we should connect with the device on specific profiles now we go ahead
1831
200
    // here even if we're marked as connected as this still doesn't mean we're
1832
201
    // connected on any profile. Calling org.bluez.Device1.Connect multiple
1833
202
    // times doesn't hurt an will not fail.
1834
203
    if (m_isConnected && !m_connectAfterPairing)
1835
204
       return;
1836
205
1837
206
    setConnection(Device::Connecting);
1838
207
1839
208
    QDBusPendingCall call = m_bluezDevice->asyncCall("Connect");
1840
187
209
1841
188
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
210
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
1842
189
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
211
    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) {
1843
@@ -196,6 +218,12 @@
1844
196
            makeTrusted(true);
218
            makeTrusted(true);
1845
197
        }
219
        }
1846
198
220
1847
221
        // Regardless if the Connected property has changed or not we update
1848
222
        // the connection state here as the connection process is over now
1849
223
        // and we should have received any state change already at this
1850
224
        // point.
1851
225
        updateConnection();
1852
226
1853
199
        watcher->deleteLater();
227
        watcher->deleteLater();
1854
200
    });
228
    });
1855
201
}
229
}
1856
@@ -205,36 +233,22 @@
1857
205
    QDBusPendingReply<void> reply = *call;
233
    QDBusPendingReply<void> reply = *call;
1858
206
234
1859
207
    if (reply.isError()) {
235
    if (reply.isError()) {
1861
208
        qWarning() << "Could not set device as trusted:"
236
        qWarning() << "Could not mark device as trusted:"
1862
209
                   << reply.error().message();
237
                   << reply.error().message();
1863
210
    }
238
    }
1864
239
1865
211
    call->deleteLater();
240
    call->deleteLater();
1866
212
}
241
}
1867
213
242
1868
214
void Device::makeTrusted(bool trusted)
243
void Device::makeTrusted(bool trusted)
1869
215
{
244
{
1886
216
    QVariant value;
245
    auto call = m_bluezDeviceProperties->Set(BLUEZ_DEVICE_IFACE, "Trusted", QDBusVariant(trusted));
1887
217
    QDBusVariant variant(trusted);
246
1888
218
247
    auto watcher = new QDBusPendingCallWatcher(call, this);
1889
219
    value.setValue(variant);
248
    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
1890
220
249
                     this, SLOT(slotMakeTrustedDone(QDBusPendingCallWatcher*)));
1875
221
    if (m_deviceInterface) {
1876
222
        QDBusPendingCall pcall
1877
223
            = m_deviceInterface->asyncCall("SetProperty", "Trusted", value);
1878
224
1879
225
        QDBusPendingCallWatcher *watcher
1880
226
            = new QDBusPendingCallWatcher(pcall, this);
1881
227
        QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
1882
228
                         this, SLOT(slotMakeTrustedDone(QDBusPendingCallWatcher*)));
1883
229
    } else {
1884
230
        qWarning() << "Can't set device trusted before it is added in BlueZ";
1885
231
    }
1891
232
}
250
}
1892
233
251
1893
234
/***
1894
235
****
1895
236
***/
1896
237
1897
238
void Device::setName(const QString &name)
252
void Device::setName(const QString &name)
1898
239
{
253
{
1899
240
    if (m_name != name) {
254
    if (m_name != name) {
1900
@@ -342,42 +356,34 @@
1901
342
{
356
{
1902
343
    Connection c;
357
    Connection c;
1903
344
358
1916
345
    /* The "State" property is a little more useful this "Connected" bool
359
    c = m_isConnected ? Connection::Connected : Connection::Disconnected;
1905
346
       because the former tells us Bluez *knows* a device is connecting.
1906
347
       So use "Connected" only as a fallback */
1907
348
1908
349
    if ((m_state == "connected") || (m_state == "playing"))
1909
350
        c = Connection::Connected;
1910
351
    else if (m_state == "connecting")
1911
352
        c = Connection::Connecting;
1912
353
    else if (m_state == "disconnected")
1913
354
        c = Connection::Disconnected;
1914
355
    else
1915
356
        c = m_isConnected ? Connection::Connected : Connection::Disconnected;
1917
357
360
1918
358
    setConnection(c);
361
    setConnection(c);
1919
359
}
362
}
1920
360
363
1921
361
void Device::updateProperty(const QString &key, const QVariant &value)
364
void Device::updateProperty(const QString &key, const QVariant &value)
1922
362
{
365
{
1924
363
    if (key == "Name") { // org.bluez.Device
366
    if (key == "Name") {
1925
364
        setName(value.toString());
367
        setName(value.toString());
1927
365
    } else if (key == "Address") { // org.bluez.Device
368
    } else if (key == "Address") {
1928
366
        setAddress(value.toString());
369
        setAddress(value.toString());
1929
367
    } else if (key == "State") { // org.bluez.Audio, org.bluez.Headset
1930
368
        m_state = value.toString();
1931
369
        updateConnection();
1932
370
    } else if (key == "Connected") {
370
    } else if (key == "Connected") {
1933
371
        m_isConnected = value.toBool();
371
        m_isConnected = value.toBool();
1934
372
        updateConnection();
372
        updateConnection();
1936
373
    } else if (key == "Class") { // org.bluez.Device
373
    } else if (key == "Class") {
1937
374
        setType(getTypeFromClass(value.toUInt()));
374
        setType(getTypeFromClass(value.toUInt()));
1939
375
    } else if (key == "Paired") { // org.bluez.Device
375
    } else if (key == "Paired") {
1940
376
        setPaired(value.toBool());
376
        setPaired(value.toBool());
1941
377
1942
378
        if (m_paired && m_connectAfterPairing) {
1943
379
           connectAfterPairing();
1944
380
           return;
1945
381
        }
1946
382
1947
377
        updateConnection();
383
        updateConnection();
1949
378
    } else if (key == "Trusted") { // org.bluez.Device
384
    } else if (key == "Trusted") {
1950
379
        setTrusted(value.toBool());
385
        setTrusted(value.toBool());
1952
380
    } else if (key == "Icon") { // org.bluez.Device
386
    } else if (key == "Icon") {
1953
381
        m_fallbackIconName = value.toString();
387
        m_fallbackIconName = value.toString();
1954
382
        updateIcon ();
388
        updateIcon ();
1955
383
    } else if (key == "RSSI") {
389
    } else if (key == "RSSI") {
1956
@@ -386,10 +392,6 @@
1957
386
    }
392
    }
1958
387
}
393
}
1959
388
394
1960
389
/***
1961
390
****
1962
391
***/
1963
392
1964
393
/* Determine the Type from the bits in the Class of Device (CoD) field.
395
/* Determine the Type from the bits in the Class of Device (CoD) field.
1965
394
   https://www.bluetooth.org/en-us/specification/assigned-numbers/baseband */
396
   https://www.bluetooth.org/en-us/specification/assigned-numbers/baseband */
1966
395
Device::Type Device::getTypeFromClass (quint32 c)
397
Device::Type Device::getTypeFromClass (quint32 c)
1967
@@ -468,6 +470,11 @@
1968
468
        if ((c & 0x20) != 0)
470
        if ((c & 0x20) != 0)
1969
469
            return Type::Camera;
471
            return Type::Camera;
1970
470
        break;
472
        break;
1971
473
1972
474
    case 0x07:
1973
475
        if ((c & 0x4) != 0)
1974
476
            return Type::Watch;
1975
477
        break;
1976
471
    }
478
    }
1977
472
479
1978
473
    return Type::Other;
480
    return Type::Other;
1979
@@ -489,4 +496,3 @@
1980
489
496
1981
490
    return None;
497
    return None;
1982
491
}
498
}
1983
492
1984
493
499
1985
=== modified file 'plugins/bluetooth/device.h'
1986
--- plugins/bluetooth/device.h	2015-08-28 09:32:38 +0000
1987
+++ plugins/bluetooth/device.h	2015-11-20 08:48:08 +0000
1988
@@ -26,6 +26,9 @@
1989
26
#include <QSharedPointer>
26
#include <QSharedPointer>
1990
27
#include <QString>
27
#include <QString>
1991
28
28
1992
29
#include "freedesktop_properties.h"
1993
30
#include "bluez_device1.h"
1994
31
1995
29
struct Device: QObject
32
struct Device: QObject
1996
30
{
33
{
1997
31
    Q_OBJECT
34
    Q_OBJECT
1998
@@ -71,17 +74,14 @@
1999
71
74
2000
72
    enum Type { Other, Computer, Cellular, Smartphone, Phone, Modem, Network,
75
    enum Type { Other, Computer, Cellular, Smartphone, Phone, Modem, Network,
2001
73
                Headset, Speakers, Headphones, Video, OtherAudio, Joypad,
76
                Headset, Speakers, Headphones, Video, OtherAudio, Joypad,
2003
74
                Keypad, Keyboard, Tablet, Mouse, Printer, Camera, Carkit };
77
                Keypad, Keyboard, Tablet, Mouse, Printer, Camera, Carkit, Watch };
2004
75
78
2005
76
    enum Strength { None, Poor, Fair, Good, Excellent };
79
    enum Strength { None, Poor, Fair, Good, Excellent };
2006
77
80
2007
78
    enum Connection { Disconnected=1, Connecting=2,
81
    enum Connection { Disconnected=1, Connecting=2,
2008
79
                      Connected=4, Disconnecting=8 };
82
                      Connected=4, Disconnecting=8 };
2009
80
83
2014
81
    enum ConnectionMode { Audio, AudioSource, AudioSink, HandsfreeGateway,
84
    Q_ENUMS(Type Strength Connection)
2011
82
                          HeadsetMode, Input };
2012
83
2013
84
    Q_ENUMS(Type Strength Connection ConnectionMode)
2015
85
85
2016
86
    Q_DECLARE_FLAGS(Connections, Connection)
86
    Q_DECLARE_FLAGS(Connections, Connection)
2017
87
87
2018
@@ -96,6 +96,7 @@
2019
96
    void connectionChanged();
96
    void connectionChanged();
2020
97
    void strengthChanged();
97
    void strengthChanged();
2021
98
    void deviceChanged(); // catchall for any change
98
    void deviceChanged(); // catchall for any change
2022
99
    void pairingDone(bool success);
2023
99
100
2024
100
public:
101
public:
2025
101
    const QString& getName() const { return m_name; }
102
    const QString& getName() const { return m_name; }
2026
@@ -106,7 +107,7 @@
2027
106
    bool isTrusted() const { return m_trusted; }
107
    bool isTrusted() const { return m_trusted; }
2028
107
    Connection getConnection() const { return m_connection; }
108
    Connection getConnection() const { return m_connection; }
2029
108
    Strength getStrength() const { return m_strength; }
109
    Strength getStrength() const { return m_strength; }
2031
109
    QString getPath() const { return m_deviceInterface ? m_deviceInterface->path() : QString(); }
110
    QString getPath() const { return m_bluezDevice ? m_bluezDevice->path() : QString(); }
2032
110
111
2033
111
  private:
112
  private:
2034
112
    QString m_name;
113
    QString m_name;
2035
@@ -120,13 +121,10 @@
2036
120
    Connection m_connection = Connection::Disconnected;
121
    Connection m_connection = Connection::Disconnected;
2037
121
    Strength m_strength = Strength::None;
122
    Strength m_strength = Strength::None;
2038
122
    bool m_isConnected = false;
123
    bool m_isConnected = false;
2046
123
    QSharedPointer<QDBusInterface> m_deviceInterface;
124
    bool m_connectAfterPairing = false;
2047
124
    QSharedPointer<QDBusInterface> m_audioInterface;
125
    QScopedPointer<BluezDevice1> m_bluezDevice;
2048
125
    QSharedPointer<QDBusInterface> m_audioSourceInterface;
126
    QScopedPointer<FreeDesktopProperties> m_bluezDeviceProperties;
2049
126
    QSharedPointer<QDBusInterface> m_audioSinkInterface;
127
    bool m_isPairing = false;
2043
127
    QSharedPointer<QDBusInterface> m_headsetInterface;
2044
128
    QSharedPointer<QDBusInterface> m_inputInterface;
2045
129
    QList<ConnectionMode> m_connectAfterPairing;
2050
130
128
2051
131
  protected:
129
  protected:
2052
132
    void setName(const QString &name);
130
    void setName(const QString &name);
2053
@@ -142,30 +140,29 @@
2054
142
140
2055
143
  public:
141
  public:
2056
144
    Device() {}
142
    Device() {}
2057
143
    Device(const QString &path, QDBusConnection &bus);
2058
145
    ~Device() {}
144
    ~Device() {}
2059
146
    Device(const QString &path, QDBusConnection &bus);
2060
147
    Device(const QMap<QString,QVariant> &properties);
2061
148
    void initDevice(const QString &path, QDBusConnection &bus);
2062
149
    bool isValid() const { return getType() != Type::Other; }
145
    bool isValid() const { return getType() != Type::Other; }
2064
150
    void connect(ConnectionMode);
146
    void pair();
2065
147
    Q_INVOKABLE void cancelPairing();
2066
148
    void connect();
2067
151
    void makeTrusted(bool trusted);
149
    void makeTrusted(bool trusted);
2069
152
    void disconnect(ConnectionMode);
150
    void disconnect();
2070
153
    void setProperties(const QMap<QString,QVariant> &properties);
151
    void setProperties(const QMap<QString,QVariant> &properties);
2075
154
    void addConnectAfterPairing(const ConnectionMode mode);
152
    void setConnectAfterPairing(bool value);
2072
155
2073
156
  public Q_SLOTS:
2074
157
    void connectPending();
2076
158
153
2077
159
  private Q_SLOTS:
154
  private Q_SLOTS:
2079
160
    void slotPropertyChanged(const QString &key, const QDBusVariant &value);
155
    void slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
2080
156
                               const QStringList &invalidatedProperties);
2081
161
    void slotMakeTrustedDone(QDBusPendingCallWatcher *call);
157
    void slotMakeTrustedDone(QDBusPendingCallWatcher *call);
2082
162
158
2083
163
  private:
159
  private:
2084
160
    void initDevice(const QString &path, QDBusConnection &bus);
2085
164
    void updateProperties(QSharedPointer<QDBusInterface>);
161
    void updateProperties(QSharedPointer<QDBusInterface>);
2086
165
    void initInterface(QSharedPointer<QDBusInterface>&, const QString &path, const QString &name, QDBusConnection&);
2087
166
    void updateProperty(const QString &key, const QVariant &value);
162
    void updateProperty(const QString &key, const QVariant &value);
2088
167
    static Type getTypeFromClass(quint32 bluetoothClass);
163
    static Type getTypeFromClass(quint32 bluetoothClass);
2089
168
    Device::Strength getStrengthFromRssi(int rssi);
164
    Device::Strength getStrengthFromRssi(int rssi);
2090
165
    void connectAfterPairing();
2091
169
};
166
};
2092
170
167
2093
171
Q_DECLARE_METATYPE(Device*)
168
Q_DECLARE_METATYPE(Device*)
2094
172
169
2095
=== modified file 'plugins/bluetooth/devicemodel.cpp'
2096
--- plugins/bluetooth/devicemodel.cpp	2015-08-28 09:32:38 +0000
2097
+++ plugins/bluetooth/devicemodel.cpp	2015-11-20 08:48:08 +0000
2098
@@ -27,33 +27,81 @@
2099
27
27
2100
28
namespace
28
namespace
2101
29
{
29
{
2104
30
  const int SCANNING_ACTIVE_DURATION_MSEC = (10 * 1000);
30
  const int SCANNING_ACTIVE_DURATION_MSEC = (30 * 1000);
2103
31
2105
32
  const int SCANNING_IDLE_DURATION_MSEC = (10 * 1000);
31
  const int SCANNING_IDLE_DURATION_MSEC = (10 * 1000);
2106
33
}
32
}
2107
34
33
2108
35
DeviceModel::DeviceModel(QDBusConnection &dbus, QObject *parent):
34
DeviceModel::DeviceModel(QDBusConnection &dbus, QObject *parent):
2109
36
    QAbstractListModel(parent),
35
    QAbstractListModel(parent),
2110
37
    m_dbus(dbus),
36
    m_dbus(dbus),
2112
38
    m_bluezManager("org.bluez", "/", "org.bluez.Manager", m_dbus)
37
    m_bluezManager("org.bluez", "/", m_dbus),
2113
38
    m_bluezAgentManager("org.bluez", "/org/bluez", m_dbus),
2114
39
    m_isPowered(false),
2115
40
    m_isPairable(false),
2116
41
    m_isDiscovering(false),
2117
42
    m_isDiscoverable(false)
2118
39
{
43
{
2119
40
    if (m_bluezManager.isValid()) {
44
    if (m_bluezManager.isValid()) {
2120
41
45
2136
42
        QDBusReply<QDBusObjectPath> qObjectPath = m_bluezManager.call("DefaultAdapter");
46
        connect(&m_bluezManager, SIGNAL(InterfacesAdded(const QDBusObjectPath&, InterfaceList)),
2137
43
        if (qObjectPath.isValid())
47
                this, SLOT(slotInterfacesAdded(const QDBusObjectPath&, InterfaceList)));
2138
44
            setAdapterFromPath(qObjectPath.value().path());
48
2139
45
49
        connect(&m_bluezManager, SIGNAL(InterfacesRemoved(const QDBusObjectPath&, const QStringList&)),
2140
46
        m_dbus.connect (m_bluezManager.service(),
50
                this, SLOT(slotInterfacesRemoved(const QDBusObjectPath&, const QStringList&)));
2141
47
                        m_bluezManager.path(),
51
2142
48
                        m_bluezManager.interface(),
52
        watchCall(m_bluezManager.GetManagedObjects(), [=](QDBusPendingCallWatcher *watcher) {
2143
49
                        "DefaultAdapterChanged",
53
            QDBusPendingReply<ManagedObjectList> reply = *watcher;
2144
50
                        this, SLOT(slotDefaultAdapterChanged(const QDBusObjectPath&)));
54
2145
51
55
            if (reply.isError()) {
2146
52
        m_dbus.connect (m_bluezManager.service(),
56
                qWarning() << "Failed to retrieve list of managed objects from BlueZ service: "
2147
53
                        m_bluezManager.path(),
57
                           << reply.error().message();
2148
54
                        m_bluezManager.interface(),
58
                watcher->deleteLater();
2149
55
                        "AdapterRemoved",
59
                return;
2150
56
                        this, SLOT(slotAdapterRemoved(const QDBusObjectPath&)));
60
            }
2151
61
2152
62
            auto objectList = reply.argumentAt<0>();
2153
63
2154
64
            for (QDBusObjectPath path : objectList.keys()) {
2155
65
                InterfaceList ifaces = objectList.value(path);
2156
66
2157
67
                if (!ifaces.contains(BLUEZ_ADAPTER_IFACE))
2158
68
                    continue;
2159
69
2160
70
                // Ok, here we've found an adapter. As we don't expect multiple at the
2161
71
                // moment we just take the first one we find.
2162
72
                setAdapterFromPath(path.path(), ifaces.value(BLUEZ_ADAPTER_IFACE));
2163
73
                break;
2164
74
            }
2165
75
2166
76
            watcher->deleteLater();
2167
77
        });
2168
78
    }
2169
79
2170
80
    if (m_bluezAgentManager.isValid()) {
2171
81
        // NOTE: We can safely register our agent here even if we don't
2172
82
        // manage any adapter yet. BlueZ makes sure our agent will only
2173
83
        // process requests related to actions we do unless we our agent
2174
84
        // the system default one.
2175
85
        auto call = m_bluezAgentManager.RegisterAgent(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH),
2176
86
                                                      DBUS_AGENT_CAPABILITY);
2177
87
2178
88
        watchCall(call, [=](QDBusPendingCallWatcher *watcher) {
2179
89
            QDBusPendingReply<void> reply = *watcher;
2180
90
2181
91
            if (reply.isError()) {
2182
92
                qWarning() << "Failed to register our agent with BlueZ:"
2183
93
                           << reply.error().message();
2184
94
            }
2185
95
            else {
2186
96
                setupAsDefaultAgent();
2187
97
            }
2188
98
2189
99
            watcher->deleteLater();
2190
100
        });
2191
101
    }
2192
102
    else {
2193
103
        qWarning() << "Could not register agent with BlueZ service as "
2194
104
                   << "the agent manager is not available!";
2195
57
    }
105
    }
2196
58
106
2197
59
    connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
107
    connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
2198
@@ -62,6 +110,89 @@
2199
62
DeviceModel::~DeviceModel()
110
DeviceModel::~DeviceModel()
2200
63
{
111
{
2201
64
    clearAdapter();
112
    clearAdapter();
2202
113
2203
114
    qWarning() << "Releasing device model ..";
2204
115
2205
116
    if (m_bluezAgentManager.isValid()) {
2206
117
        auto call = m_bluezAgentManager.UnregisterAgent(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH));
2207
118
        watchCall(call, [=](QDBusPendingCallWatcher *watcher) {
2208
119
            QDBusPendingReply<void> reply = *watcher;
2209
120
2210
121
            if (reply.isError()) {
2211
122
                qWarning() << "Failed to unregister our agent with BlueZ:"
2212
123
                           << reply.error().message();
2213
124
            }
2214
125
2215
126
            watcher->deleteLater();
2216
127
        });
2217
128
    }
2218
129
}
2219
130
2220
131
void DeviceModel::setupAsDefaultAgent()
2221
132
{
2222
133
    auto call = m_bluezAgentManager.RequestDefaultAgent(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH));
2223
134
    watchCall(call, [=](QDBusPendingCallWatcher *watcher) {
2224
135
        QDBusPendingReply<void> reply = *watcher;
2225
136
2226
137
        if (reply.isError()) {
2227
138
            qWarning() << "Failed to setup ourself as default agent: "
2228
139
                       << reply.error().message();
2229
140
        }
2230
141
2231
142
        watcher->deleteLater();
2232
143
    });
2233
144
}
2234
145
2235
146
void DeviceModel::slotInterfacesAdded(const QDBusObjectPath &objectPath, InterfaceList ifacesAndProps)
2236
147
{
2237
148
    Q_UNUSED(ifacesAndProps);
2238
149
2239
150
    auto candidatedPath = objectPath.path();
2240
151
2241
152
    if (!m_bluezAdapter) {
2242
153
        // Maybe we have a new adapter we can start to use?
2243
154
        if (ifacesAndProps.contains(BLUEZ_ADAPTER_IFACE))
2244
155
            setAdapterFromPath(candidatedPath, ifacesAndProps.value(BLUEZ_ADAPTER_IFACE));
2245
156
2246
157
        return;
2247
158
    }
2248
159
2249
160
    // At this point we can only get new devices
2250
161
    if (!candidatedPath.startsWith(m_bluezAdapter->path()))
2251
162
        return;
2252
163
2253
164
    if (!ifacesAndProps.contains(BLUEZ_DEVICE_IFACE))
2254
165
        return;
2255
166
2256
167
    addDevice(candidatedPath, ifacesAndProps.value(BLUEZ_DEVICE_IFACE));
2257
168
}
2258
169
2259
170
void DeviceModel::slotInterfacesRemoved(const QDBusObjectPath &objectPath, const QStringList &interfaces)
2260
171
{
2261
172
    auto candidatedPath = objectPath.path();
2262
173
2263
174
    if (!m_bluezAdapter)
2264
175
        return;
2265
176
2266
177
    if (candidatedPath == m_bluezAdapter->path() &&
2267
178
        interfaces.contains(BLUEZ_ADAPTER_IFACE)) {
2268
179
        clearAdapter();
2269
180
        return;
2270
181
    }
2271
182
2272
183
    if (!candidatedPath.startsWith(m_bluezAdapter->path()))
2273
184
        return;
2274
185
2275
186
    if (!interfaces.contains(BLUEZ_DEVICE_IFACE))
2276
187
        return;
2277
188
2278
189
    auto device = getDeviceFromPath(candidatedPath);
2279
190
    if (!device)
2280
191
        return;
2281
192
2282
193
    const int row = findRowFromAddress(device->getAddress());
2283
194
    if ((row >= 0))
2284
195
        removeRow(row);
2285
65
}
196
}
2286
66
197
2287
67
int DeviceModel::findRowFromAddress(const QString &address) const
198
int DeviceModel::findRowFromAddress(const QString &address) const
2288
@@ -79,27 +210,45 @@
2289
79
                                   : SCANNING_IDLE_DURATION_MSEC);
210
                                   : SCANNING_IDLE_DURATION_MSEC);
2290
80
}
211
}
2291
81
212
2292
213
void DeviceModel::setDiscovering(bool value)
2293
214
{
2294
215
    if (value == m_isDiscovering)
2295
216
        return;
2296
217
2297
218
    m_isDiscovering = value;
2298
219
    Q_EMIT(discoveringChanged(m_isDiscovering));
2299
220
}
2300
221
2301
82
void DeviceModel::stopDiscovery()
222
void DeviceModel::stopDiscovery()
2302
83
{
223
{
2308
84
    if (m_isDiscovering) {
224
    if (m_bluezAdapter && m_isPowered && m_isDiscovering) {
2309
85
        if (m_bluezAdapter)
225
2310
86
            m_bluezAdapter->asyncCall("StopDiscovery");
226
         watchCall(m_bluezAdapter->StopDiscovery(), [=](QDBusPendingCallWatcher *watcher) {
2311
87
        m_isDiscovering = false;
227
            QDBusPendingReply<void> reply = *watcher;
2312
88
        Q_EMIT(discoveringChanged(m_isDiscovering));
228
            if (reply.isError()) {
2313
229
                qWarning() << "Failed to stop device discovery:"
2314
230
                           << reply.error().message();
2315
231
            }
2316
232
2317
233
            watcher->deleteLater();
2318
234
        });
2319
89
    }
235
    }
2320
90
2321
91
    restartTimer();
2322
92
}
236
}
2323
93
237
2324
94
void DeviceModel::startDiscovery()
238
void DeviceModel::startDiscovery()
2325
95
{
239
{
2326
96
    if (m_bluezAdapter && m_isPowered && !m_isDiscovering) {
240
    if (m_bluezAdapter && m_isPowered && !m_isDiscovering) {
2330
97
        m_bluezAdapter->asyncCall("StartDiscovery");
241
2331
98
        m_isDiscovering = true;
242
        watchCall(m_bluezAdapter->StartDiscovery(), [=](QDBusPendingCallWatcher *watcher) {
2332
99
        Q_EMIT(discoveringChanged(m_isDiscovering));
243
            QDBusPendingReply<void> reply = *watcher;
2333
244
            if (reply.isError()) {
2334
245
                qWarning() << "Failed to start device discovery:"
2335
246
                           << reply.error().message();
2336
247
            }
2337
248
2338
249
            watcher->deleteLater();
2339
250
        });
2340
100
    }
251
    }
2341
101
2342
102
    restartTimer();
2343
103
}
252
}
2344
104
253
2345
105
void DeviceModel::toggleDiscovery()
254
void DeviceModel::toggleDiscovery()
2346
@@ -119,27 +268,12 @@
2347
119
{
268
{
2348
120
    if (m_bluezAdapter) {
269
    if (m_bluezAdapter) {
2349
121
270
2350
122
        QDBusConnection bus = m_bluezAdapter->connection();
2351
123
        const QString service = m_bluezAdapter->service();
2352
124
        const QString path = m_bluezAdapter->path();
2353
125
        const QString interface = m_bluezAdapter->interface();
2354
126
2355
127
        stopDiscovery();
271
        stopDiscovery();
2356
128
        m_discoverableTimer.stop();
272
        m_discoverableTimer.stop();
2357
129
        trySetDiscoverable(false);
273
        trySetDiscoverable(false);
2358
130
274
2359
131
        bus.disconnect(service, path, interface, "DeviceCreated",
2360
132
                       this, SLOT(slotDeviceCreated(const QDBusObjectPath&)));
2361
133
        bus.disconnect(service, path, interface, "DeviceRemoved",
2362
134
                       this, SLOT(slotDeviceRemoved(const QDBusObjectPath&)));
2363
135
        bus.disconnect(service, path, interface, "DeviceFound",
2364
136
                       this, SLOT(slotDeviceFound(const QString&, const QMap<QString,QVariant>&)));
2365
137
        bus.disconnect(service, path, interface, "DeviceDisappeared",
2366
138
                       this, SLOT(slotDeviceDisappeared(const QString&)));
2367
139
        bus.disconnect(service, path, interface, "PropertyChanged",
2368
140
                       this, SLOT(slotPropertyChanged(const QString&, const QDBusVariant&)));
2369
141
2370
142
        m_bluezAdapter.reset(0);
275
        m_bluezAdapter.reset(0);
2371
276
        m_bluezAdapterProperties.reset(0);
2372
143
        m_adapterName.clear();
277
        m_adapterName.clear();
2373
144
278
2374
145
        beginResetModel();
279
        beginResetModel();
2375
@@ -148,68 +282,75 @@
2376
148
    }
282
    }
2377
149
}
283
}
2378
150
284
2380
151
void DeviceModel::setAdapterFromPath(const QString &path)
285
void DeviceModel::setAdapterFromPath(const QString &path, const QVariantMap &properties)
2381
152
{
286
{
2382
153
    clearAdapter();
287
    clearAdapter();
2383
154
288
2384
155
    if (!path.isEmpty()) {
289
    if (!path.isEmpty()) {
2385
156
290
2402
157
        const QString service = "org.bluez";
291
        auto adapter = new BluezAdapter1(BLUEZ_SERVICE, path, m_dbus);
2403
158
        const QString interface = "org.bluez.Adapter";
292
        auto adapterProperties = new FreeDesktopProperties(BLUEZ_SERVICE, path, m_dbus);
2404
159
        auto i = new QDBusInterface(service, path, interface, m_dbus);
293
2405
160
294
        m_bluezAdapter.reset(adapter);
2406
161
        m_dbus.connect(service, path, interface, "DeviceCreated",
295
        m_bluezAdapterProperties.reset(adapterProperties);
2407
162
                       this, SLOT(slotDeviceCreated(const QDBusObjectPath&)));
296
2392
163
        m_dbus.connect(service, path, interface, "DeviceRemoved",
2393
164
                       this, SLOT(slotDeviceRemoved(const QDBusObjectPath&)));
2394
165
        m_dbus.connect(service, path, interface, "DeviceFound",
2395
166
                       this, SLOT(slotDeviceFound(const QString&, const QMap<QString,QVariant>&)));
2396
167
        m_dbus.connect(service, path, interface, "DeviceDisappeared",
2397
168
                       this, SLOT(slotDeviceDisappeared(const QString&)));
2398
169
        m_dbus.connect(service, path, interface, "PropertyChanged",
2399
170
                       this, SLOT(slotPropertyChanged(const QString&, const QDBusVariant&)));
2400
171
2401
172
        m_bluezAdapter.reset(i);
2408
173
        startDiscovery();
297
        startDiscovery();
2409
174
        updateDevices();
298
        updateDevices();
2410
175
299
2414
176
        QDBusReply<QMap<QString,QVariant> > properties = m_bluezAdapter->call("GetProperties");
300
        setProperties(properties);
2415
177
        if (properties.isValid())
301
2416
178
            setProperties(properties.value());
302
        connect(adapterProperties, SIGNAL(PropertiesChanged(const QString&, const QVariantMap&, const QStringList&)),
2417
303
                this, SLOT(slotAdapterPropertiesChanged(const QString&, const QVariantMap&, const QStringList&)));
2418
179
304
2419
180
        // Delay enabling discoverability by 1 second.
305
        // Delay enabling discoverability by 1 second.
2420
181
        m_discoverableTimer.setSingleShot(true);
306
        m_discoverableTimer.setSingleShot(true);
2421
182
        connect(&m_discoverableTimer, SIGNAL(timeout()), this, SLOT(slotEnableDiscoverable()));
307
        connect(&m_discoverableTimer, SIGNAL(timeout()), this, SLOT(slotEnableDiscoverable()));
2422
183
        m_discoverableTimer.start(1000);
308
        m_discoverableTimer.start(1000);
2423
184
2424
185
        // With the agent registered on the bus, make it known by the adapter
2425
186
        QDBusReply<void > reply = m_bluezAdapter->call("RegisterAgent",
2426
187
                                                       qVariantFromValue(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH)),
2427
188
                                                       QString(DBUS_AGENT_CAPABILITY));
2428
189
        if (!reply.isValid())
2429
190
                qWarning() << "Error registering agent for the default adapter:" << reply.error();
2430
191
    }
309
    }
2431
192
}
310
}
2432
193
311
2442
194
void DeviceModel::slotAdapterRemoved(const QDBusObjectPath &path)
312
void DeviceModel::slotAdapterPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
2443
195
{
313
                                               const QStringList &invalidatedProperties)
2444
196
  if (m_bluezAdapter && (m_bluezAdapter->path()==path.path()))
314
{
2445
197
      clearAdapter();
315
    Q_UNUSED(invalidatedProperties);
2446
198
}
316
2447
199
317
    if (interface != BLUEZ_ADAPTER_IFACE)
2448
200
void DeviceModel::slotDefaultAdapterChanged(const QDBusObjectPath &objectPath)
318
        return;
2449
201
{
319
2450
202
  setAdapterFromPath (objectPath.path());
320
    setProperties(changedProperties);
2451
203
}
321
}
2452
204
322
2453
205
void DeviceModel::updateDevices()
323
void DeviceModel::updateDevices()
2454
206
{
324
{
2461
207
    if (m_bluezAdapter && m_bluezAdapter->isValid()) {
325
    watchCall(m_bluezManager.GetManagedObjects(), [=](QDBusPendingCallWatcher *watcher) {
2462
208
        QDBusReply<QList<QDBusObjectPath> > reply = m_bluezAdapter->call("ListDevices");
326
        QDBusPendingReply<ManagedObjectList> reply = *watcher;
2463
209
        if (reply.isValid())
327
2464
210
            for (auto path : reply.value())
328
        if (reply.isError()) {
2465
211
                addDevice(path.path());
329
            qWarning() << "Failed to retrieve list of managed objects from BlueZ service: "
2466
212
    }
330
                       << reply.error().message();
2467
331
            watcher->deleteLater();
2468
332
            return;
2469
333
        }
2470
334
2471
335
        auto objectList = reply.argumentAt<0>();
2472
336
2473
337
        for (auto objectPath : objectList.keys()) {
2474
338
            auto candidatePath = objectPath.path();
2475
339
2476
340
            if (!candidatePath.startsWith(m_bluezAdapter->path()))
2477
341
                continue;
2478
342
2479
343
            InterfaceList ifaces = objectList.value(objectPath);
2480
344
2481
345
            if (!ifaces.contains(BLUEZ_DEVICE_IFACE))
2482
346
                continue;
2483
347
2484
348
            auto properties = ifaces.value(BLUEZ_DEVICE_IFACE);
2485
349
2486
350
            addDevice(candidatePath, properties);
2487
351
        }
2488
352
2489
353
    });
2490
213
}
354
}
2491
214
355
2492
215
void DeviceModel::setProperties(const QMap<QString,QVariant> &properties)
356
void DeviceModel::setProperties(const QMap<QString,QVariant> &properties)
2493
@@ -231,6 +372,9 @@
2494
231
        m_isPairable = value.toBool();
372
        m_isPairable = value.toBool();
2495
232
    } else if (key == "Discoverable") {
373
    } else if (key == "Discoverable") {
2496
233
        setDiscoverable(value.toBool());
374
        setDiscoverable(value.toBool());
2497
375
    } else if (key == "Discovering") {
2498
376
        setDiscovering(value.toBool());
2499
377
        restartTimer();
2500
234
    } else if (key == "Powered") {
378
    } else if (key == "Powered") {
2501
235
        setPowered(value.toBool());
379
        setPowered(value.toBool());
2502
236
        if (m_isPowered)
380
        if (m_isPowered)
2503
@@ -268,7 +412,7 @@
2504
268
    value.setValue(disc);
412
    value.setValue(disc);
2505
269
413
2506
270
    if (m_bluezAdapter && m_bluezAdapter->isValid() && m_isPowered) {
414
    if (m_bluezAdapter && m_bluezAdapter->isValid() && m_isPowered) {
2508
271
        reply = m_bluezAdapter->call("SetProperty", "Discoverable", value);
415
        reply = m_bluezAdapterProperties->call("Set", BLUEZ_ADAPTER_IFACE, "Discoverable", value);
2509
272
        if (!reply.isValid())
416
        if (!reply.isValid())
2510
273
            qWarning() << "Error setting device discoverable:" << reply.error();
417
            qWarning() << "Error setting device discoverable:" << reply.error();
2511
274
    }
418
    }
2512
@@ -280,12 +424,23 @@
2513
280
    updateProperty (key, value.variant());
424
    updateProperty (key, value.variant());
2514
281
}
425
}
2515
282
426
2517
283
void DeviceModel::addDevice(const QString &path)
427
void DeviceModel::slotDevicePairingDone(bool success)
2518
428
{
2519
429
    Device *device = static_cast<Device*>(sender());
2520
430
2521
431
    Q_EMIT(devicePairingDone(device, success));
2522
432
}
2523
433
2524
434
void DeviceModel::addDevice(const QString &path, const QVariantMap &properties)
2525
284
{
435
{
2526
285
    QSharedPointer<Device> device(new Device(path, m_dbus));
436
    QSharedPointer<Device> device(new Device(path, m_dbus));
2527
437
    device->setProperties(properties);
2528
438
2529
286
    if (device->isValid()) {
439
    if (device->isValid()) {
2530
287
        QObject::connect(device.data(), SIGNAL(deviceChanged()),
440
        QObject::connect(device.data(), SIGNAL(deviceChanged()),
2531
288
                         this, SLOT(slotDeviceChanged()));
441
                         this, SLOT(slotDeviceChanged()));
2532
442
        QObject::connect(device.data(), SIGNAL(pairingDone(bool)),
2533
443
                         this, SLOT(slotDevicePairingDone(bool)));
2534
289
        addDevice(device);
444
        addDevice(device);
2535
290
    }
445
    }
2536
291
}
446
}
2537
@@ -322,78 +477,6 @@
2538
322
    }
477
    }
2539
323
}
478
}
2540
324
479
2541
325
void DeviceModel::slotDeviceCreated(const QDBusObjectPath &path)
2542
326
{
2543
327
    const QString service = "org.bluez";
2544
328
    const QString interface = "org.bluez.Device";
2545
329
    QScopedPointer<QDBusInterface> bluezDevice(
2546
330
        new QDBusInterface(service, path.path(), interface, m_dbus));
2547
331
2548
332
    // A device was created. Now, we likely already have it, so let's find it
2549
333
    // again and finish the initialization.
2550
334
    QDBusReply<QMap<QString,QVariant> > properties
2551
335
        = bluezDevice->call("GetProperties");
2552
336
    if (properties.isValid()) {
2553
337
        QMapIterator<QString,QVariant> it(properties);
2554
338
        while (it.hasNext()) {
2555
339
            it.next();
2556
340
            if (it.key() == "Address") {
2557
341
                QSharedPointer<Device> device = getDeviceFromAddress(it.value().toString());
2558
342
2559
343
                if (device) {
2560
344
                    device->initDevice(path.path(), m_dbus);
2561
345
                    QObject::connect(device.data(), SIGNAL(deviceChanged()),
2562
346
                                     this, SLOT(slotDeviceChanged()));
2563
347
                    addDevice(device);
2564
348
                } else {
2565
349
                    addDevice(path.path());
2566
350
                }
2567
351
                break;
2568
352
            }
2569
353
        }
2570
354
    } else {
2571
355
        qWarning() << "Invalid device properties for" << path.path();
2572
356
    }
2573
357
}
2574
358
2575
359
void DeviceModel::slotDeviceFound(const QString                &address,
2576
360
                                  const QMap<QString,QVariant> &properties)
2577
361
{
2578
362
    Q_UNUSED(properties);
2579
363
2580
364
    QSharedPointer<Device> device = getDeviceFromAddress(address);
2581
365
2582
366
    if (!device) {
2583
367
        QSharedPointer<Device> device(new Device(properties));
2584
368
        if (device->isValid()) {
2585
369
            addDevice(device);
2586
370
        }
2587
371
    } else {
2588
372
        device->setProperties(properties);
2589
373
    }
2590
374
}
2591
375
2592
376
void DeviceModel::slotDeviceRemoved(const QDBusObjectPath &path)
2593
377
{
2594
378
    /* Remove the device immediately, it will be listed again
2595
379
       once discovery results are returned.  */
2596
380
2597
381
    auto device = getDeviceFromPath(path.path());
2598
382
2599
383
    if (device != nullptr) {
2600
384
        const int row = findRowFromAddress(device->getAddress());
2601
385
        if ((row >= 0))
2602
386
            removeRow(row);
2603
387
    }
2604
388
}
2605
389
2606
390
void DeviceModel::slotDeviceDisappeared(const QString &address)
2607
391
{
2608
392
    const int row = findRowFromAddress(address);
2609
393
    if ((row >= 0) && !m_devices[row]->isPaired())
2610
394
        removeRow(row);
2611
395
}
2612
396
2613
397
void DeviceModel::slotDeviceChanged()
480
void DeviceModel::slotDeviceChanged()
2614
398
{
481
{
2615
399
    const Device * device = qobject_cast<Device*>(sender());
482
    const Device * device = qobject_cast<Device*>(sender());
2616
@@ -429,61 +512,6 @@
2617
429
    return QSharedPointer<Device>();
512
    return QSharedPointer<Device>();
2618
430
}
513
}
2619
431
514
2620
432
void DeviceModel::addConnectAfterPairing(const QString &address, Device::ConnectionMode mode)
2621
433
{
2622
434
    QSharedPointer<Device> device = getDeviceFromAddress(address);
2623
435
    if (device) {
2624
436
        device->addConnectAfterPairing(mode);
2625
437
    } else {
2626
438
        qWarning() << "Device could not be found, can't add an operation";
2627
439
    }
2628
440
}
2629
441
2630
442
void DeviceModel::slotCreateFinished(QDBusPendingCallWatcher *call)
2631
443
{
2632
444
    QDBusPendingReply<QDBusObjectPath> reply = *call;
2633
445
2634
446
    if (reply.isError()) {
2635
447
        qWarning() << "Could not create device:" << reply.error().message();
2636
448
    }
2637
449
2638
450
    call->deleteLater();
2639
451
}
2640
452
2641
453
void DeviceModel::createDevice (const QString &address, QObject *agent)
2642
454
{
2643
455
    if (m_bluezAdapter) {
2644
456
        QString agent_path(DBUS_AGENT_PATH);
2645
457
        agent_path.append("/");
2646
458
        agent_path.append(address);
2647
459
        agent_path.replace(":", "_");
2648
460
2649
461
        if(!m_dbus.registerObject(agent_path, agent))
2650
462
            qCritical() << "Couldn't register agent at" << agent_path;
2651
463
2652
464
        QDBusPendingCall pcall = m_bluezAdapter->asyncCall("CreatePairedDevice",
2653
465
                                                           address,
2654
466
                                                           qVariantFromValue(QDBusObjectPath(agent_path)),
2655
467
                                                           QString(DBUS_AGENT_CAPABILITY));
2656
468
2657
469
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
2658
470
        QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [this, address](QDBusPendingCallWatcher *watcher) {
2659
471
            QDBusPendingReply<QDBusObjectPath> reply = *watcher;
2660
472
2661
473
            if (reply.isError()) {
2662
474
                qWarning() << "Could not create device:" << reply.error().message();
2663
475
            } else {
2664
476
                QSharedPointer<Device> device = getDeviceFromAddress(address);
2665
477
                device->connectPending();
2666
478
            }
2667
479
2668
480
            watcher->deleteLater();
2669
481
        });
2670
482
    } else {
2671
483
        qWarning() << "Default adapter is not available for device creation";
2672
484
    }
2673
485
}
2674
486
2675
487
void DeviceModel::slotRemoveFinished(QDBusPendingCallWatcher *call)
515
void DeviceModel::slotRemoveFinished(QDBusPendingCallWatcher *call)
2676
488
{
516
{
2677
489
    QDBusPendingReply<void> reply = *call;
517
    QDBusPendingReply<void> reply = *call;
2678
@@ -496,19 +524,19 @@
2679
496
524
2680
497
void DeviceModel::removeDevice (const QString &path)
525
void DeviceModel::removeDevice (const QString &path)
2681
498
{
526
{
2689
499
    if (m_bluezAdapter) {
527
    if (!m_bluezAdapter) {
2683
500
        QDBusPendingCall pcall = m_bluezAdapter->asyncCall("RemoveDevice", qVariantFromValue(QDBusObjectPath(path)));
2684
501
2685
502
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
2686
503
        QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
2687
504
                         this, SLOT(slotRemoveFinished(QDBusPendingCallWatcher*)));
2688
505
    } else {
2690
506
        qWarning() << "Default adapter is not available for device removal";
528
        qWarning() << "Default adapter is not available for device removal";
2691
529
        return;
2692
507
    }
530
    }
2693
531
2694
532
    QDBusPendingCall call = m_bluezAdapter->RemoveDevice(QDBusObjectPath(path));
2695
533
2696
534
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
2697
535
    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
2698
536
                     this, SLOT(slotRemoveFinished(QDBusPendingCallWatcher*)));
2699
508
}
537
}
2700
509
538
2703
510
int
539
int DeviceModel::rowCount(const QModelIndex &parent) const
2702
511
DeviceModel::rowCount(const QModelIndex &parent) const
2704
512
{
540
{
2705
513
    Q_UNUSED(parent);
541
    Q_UNUSED(parent);
2706
514
542
2707
@@ -583,13 +611,6 @@
2708
583
    return ret;
611
    return ret;
2709
584
}
612
}
2710
585
613
2711
586
2712
587
/***
2713
588
****
2714
589
****  Filter
2715
590
****
2716
591
***/
2717
592
2718
593
void DeviceFilter::filterOnType(QVector<Device::Type> types)
614
void DeviceFilter::filterOnType(QVector<Device::Type> types)
2719
594
{
615
{
2720
595
    m_types = types;
616
    m_types = types;
2721
596
617
2722
=== modified file 'plugins/bluetooth/devicemodel.h'
2723
--- plugins/bluetooth/devicemodel.h	2015-08-28 09:32:38 +0000
2724
+++ plugins/bluetooth/devicemodel.h	2015-11-20 08:48:08 +0000
2725
@@ -35,6 +35,11 @@
2726
35
35
2727
36
#include "device.h"
36
#include "device.h"
2728
37
37
2729
38
#include "freedesktop_objectmanager.h"
2730
39
#include "freedesktop_properties.h"
2731
40
#include "bluez_adapter1.h"
2732
41
#include "bluez_agentmanager1.h"
2733
42
2734
38
class DeviceModel: public QAbstractListModel
43
class DeviceModel: public QAbstractListModel
2735
39
{
44
{
2736
40
    Q_OBJECT
45
    Q_OBJECT
2737
@@ -68,8 +73,6 @@
2738
68
    bool isPowered() const { return m_isPowered; }
73
    bool isPowered() const { return m_isPowered; }
2739
69
    bool isDiscovering() const { return m_isDiscovering; }
74
    bool isDiscovering() const { return m_isDiscovering; }
2740
70
    bool isDiscoverable() const { return m_isDiscoverable; }
75
    bool isDiscoverable() const { return m_isDiscoverable; }
2741
71
    void addConnectAfterPairing(const QString &address, Device::ConnectionMode mode);
2742
72
    void createDevice(const QString &address, QObject *agent);
2743
73
    void removeDevice(const QString &path);
76
    void removeDevice(const QString &path);
2744
74
    void stopDiscovery();
77
    void stopDiscovery();
2745
75
    void startDiscovery();
78
    void startDiscovery();
2746
@@ -80,10 +83,12 @@
2747
80
    void poweredChanged(bool powered);
83
    void poweredChanged(bool powered);
2748
81
    void discoveringChanged(bool isDiscovering);
84
    void discoveringChanged(bool isDiscovering);
2749
82
    void discoverableChanged(bool isDiscoverable);
85
    void discoverableChanged(bool isDiscoverable);
2750
86
    void devicePairingDone(Device *device, bool success);
2751
83
87
2752
84
private:
88
private:
2753
85
    QDBusConnection m_dbus;
89
    QDBusConnection m_dbus;
2755
86
    QDBusInterface m_bluezManager;
90
    DBusObjectManagerInterface m_bluezManager;
2756
91
    BluezAgentManager1 m_bluezAgentManager;
2757
87
92
2758
88
    void setProperties(const QMap<QString,QVariant> &properties);
93
    void setProperties(const QMap<QString,QVariant> &properties);
2759
89
    void updateProperty(const QString &key, const QVariant &value);
94
    void updateProperty(const QString &key, const QVariant &value);
2760
@@ -100,31 +105,34 @@
2761
100
    void setDiscoverable(bool discoverable);
105
    void setDiscoverable(bool discoverable);
2762
101
    void setPowered(bool powered);
106
    void setPowered(bool powered);
2763
102
107
2765
103
    QScopedPointer<QDBusInterface> m_bluezAdapter;
108
    QScopedPointer<BluezAdapter1> m_bluezAdapter;
2766
109
    QScopedPointer<FreeDesktopProperties> m_bluezAdapterProperties;
2767
110
2768
104
    void clearAdapter();
111
    void clearAdapter();
2770
105
    void setAdapterFromPath(const QString &objectPath);
112
    void setAdapterFromPath(const QString &objectPath, const QVariantMap &properties);
2771
106
113
2772
107
    QList<QSharedPointer<Device> > m_devices;
114
    QList<QSharedPointer<Device> > m_devices;
2773
108
    void updateDevices();
115
    void updateDevices();
2774
109
    void addDevice(QSharedPointer<Device> &device);
116
    void addDevice(QSharedPointer<Device> &device);
2776
110
    void addDevice(const QString &objectPath);
117
    void addDevice(const QString &objectPath, const QVariantMap &properties);
2777
111
    void removeRow(int i);
118
    void removeRow(int i);
2778
112
    int findRowFromAddress(const QString &address) const;
119
    int findRowFromAddress(const QString &address) const;
2779
113
    void emitRowChanged(int row);
120
    void emitRowChanged(int row);
2780
114
121
2781
122
    void setDiscovering(bool value);
2782
123
    void setupAsDefaultAgent();
2783
124
2784
115
private Q_SLOTS:
125
private Q_SLOTS:
2786
116
    void slotCreateFinished(QDBusPendingCallWatcher *call);
126
    void slotInterfacesAdded(const QDBusObjectPath &objectPath, InterfaceList ifacesAndProps);
2787
127
    void slotInterfacesRemoved(const QDBusObjectPath &objectPath, const QStringList &interfaces);
2788
128
    void slotAdapterPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
2789
129
                                      const QStringList &invalidatedProperties);
2790
117
    void slotRemoveFinished(QDBusPendingCallWatcher *call);
130
    void slotRemoveFinished(QDBusPendingCallWatcher *call);
2791
118
    void slotPropertyChanged(const QString &key, const QDBusVariant &value);
131
    void slotPropertyChanged(const QString &key, const QDBusVariant &value);
2792
119
    void slotTimeout();
132
    void slotTimeout();
2793
120
    void slotEnableDiscoverable();
133
    void slotEnableDiscoverable();
2794
121
    void slotDeviceChanged();
134
    void slotDeviceChanged();
2801
122
    void slotDeviceCreated(const QDBusObjectPath &);
135
    void slotDevicePairingDone(bool success);
2796
123
    void slotDeviceRemoved(const QDBusObjectPath &);
2797
124
    void slotDeviceFound(const QString &, const QMap<QString,QVariant>&);
2798
125
    void slotDeviceDisappeared(const QString&);
2799
126
    void slotDefaultAdapterChanged(const QDBusObjectPath&);
2800
127
    void slotAdapterRemoved(const QDBusObjectPath& path);
2802
128
};
136
};
2803
129
137
2804
130
class DeviceFilter: public QSortFilterProxyModel
138
class DeviceFilter: public QSortFilterProxyModel
2805
131
139
2806
=== added file 'plugins/bluetooth/freedesktop_objectmanager.cpp'
2807
--- plugins/bluetooth/freedesktop_objectmanager.cpp	1970-01-01 00:00:00 +0000
2808
+++ plugins/bluetooth/freedesktop_objectmanager.cpp	2015-11-20 08:48:08 +0000
2809
@@ -0,0 +1,26 @@
2810
1
/*
2811
2
 * This file was generated by qdbusxml2cpp version 0.8
2812
3
 * Command line was: qdbusxml2cpp -p freedesktop_objectmanager -i bluez_helper.h -v -c DBusObjectManagerInterface org.freedesktop.DBus.ObjectManager.xml
2813
4
 *
2814
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
2815
6
 *
2816
7
 * This is an auto-generated file.
2817
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
2818
9
 * before re-generating it.
2819
10
 */
2820
11
2821
12
#include "freedesktop_objectmanager.h"
2822
13
2823
14
/*
2824
15
 * Implementation of interface class DBusObjectManagerInterface
2825
16
 */
2826
17
2827
18
DBusObjectManagerInterface::DBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
2828
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
2829
20
{
2830
21
}
2831
22
2832
23
DBusObjectManagerInterface::~DBusObjectManagerInterface()
2833
24
{
2834
25
}
2835
26
2836
0
27
2837
=== added file 'plugins/bluetooth/freedesktop_objectmanager.h'
2838
--- plugins/bluetooth/freedesktop_objectmanager.h	1970-01-01 00:00:00 +0000
2839
+++ plugins/bluetooth/freedesktop_objectmanager.h	2015-11-20 08:48:08 +0000
2840
@@ -0,0 +1,58 @@
2841
1
/*
2842
2
 * This file was generated by qdbusxml2cpp version 0.8
2843
3
 * Command line was: qdbusxml2cpp -p freedesktop_objectmanager -i bluez_helper.h -v -c DBusObjectManagerInterface org.freedesktop.DBus.ObjectManager.xml
2844
4
 *
2845
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
2846
6
 *
2847
7
 * This is an auto-generated file.
2848
8
 * Do not edit! All changes made to it will be lost.
2849
9
 */
2850
10
2851
11
#ifndef FREEDESKTOP_OBJECTMANAGER_H_1442473386
2852
12
#define FREEDESKTOP_OBJECTMANAGER_H_1442473386
2853
13
2854
14
#include <QtCore/QObject>
2855
15
#include <QtCore/QByteArray>
2856
16
#include <QtCore/QList>
2857
17
#include <QtCore/QMap>
2858
18
#include <QtCore/QString>
2859
19
#include <QtCore/QStringList>
2860
20
#include <QtCore/QVariant>
2861
21
#include <QtDBus/QtDBus>
2862
22
#include "bluez_helper.h"
2863
23
2864
24
/*
2865
25
 * Proxy class for interface org.freedesktop.DBus.ObjectManager
2866
26
 */
2867
27
class DBusObjectManagerInterface: public QDBusAbstractInterface
2868
28
{
2869
29
    Q_OBJECT
2870
30
public:
2871
31
    static inline const char *staticInterfaceName()
2872
32
    { return "org.freedesktop.DBus.ObjectManager"; }
2873
33
2874
34
public:
2875
35
    DBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
2876
36
2877
37
    ~DBusObjectManagerInterface();
2878
38
2879
39
public Q_SLOTS: // METHODS
2880
40
    inline QDBusPendingReply<ManagedObjectList> GetManagedObjects()
2881
41
    {
2882
42
        QList<QVariant> argumentList;
2883
43
        return asyncCallWithArgumentList(QStringLiteral("GetManagedObjects"), argumentList);
2884
44
    }
2885
45
2886
46
Q_SIGNALS: // SIGNALS
2887
47
    void InterfacesAdded(const QDBusObjectPath &object_path, InterfaceList interfaces_and_properties);
2888
48
    void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
2889
49
};
2890
50
2891
51
namespace org {
2892
52
  namespace freedesktop {
2893
53
    namespace DBus {
2894
54
      typedef ::DBusObjectManagerInterface ObjectManager;
2895
55
    }
2896
56
  }
2897
57
}
2898
58
#endif
2899
0
59
2900
=== added file 'plugins/bluetooth/freedesktop_properties.cpp'
2901
--- plugins/bluetooth/freedesktop_properties.cpp	1970-01-01 00:00:00 +0000
2902
+++ plugins/bluetooth/freedesktop_properties.cpp	2015-11-20 08:48:08 +0000
2903
@@ -0,0 +1,26 @@
2904
1
/*
2905
2
 * This file was generated by qdbusxml2cpp version 0.8
2906
3
 * Command line was: qdbusxml2cpp -c FreeDesktopProperties -p freedesktop_properties -v org.freedesktop.DBus.Properties.xml
2907
4
 *
2908
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
2909
6
 *
2910
7
 * This is an auto-generated file.
2911
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
2912
9
 * before re-generating it.
2913
10
 */
2914
11
2915
12
#include "freedesktop_properties.h"
2916
13
2917
14
/*
2918
15
 * Implementation of interface class FreeDesktopProperties
2919
16
 */
2920
17
2921
18
FreeDesktopProperties::FreeDesktopProperties(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
2922
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
2923
20
{
2924
21
}
2925
22
2926
23
FreeDesktopProperties::~FreeDesktopProperties()
2927
24
{
2928
25
}
2929
26
2930
0
27
2931
=== added file 'plugins/bluetooth/freedesktop_properties.h'
2932
--- plugins/bluetooth/freedesktop_properties.h	1970-01-01 00:00:00 +0000
2933
+++ plugins/bluetooth/freedesktop_properties.h	2015-11-20 08:48:08 +0000
2934
@@ -0,0 +1,71 @@
2935
1
/*
2936
2
 * This file was generated by qdbusxml2cpp version 0.8
2937
3
 * Command line was: qdbusxml2cpp -c FreeDesktopProperties -p freedesktop_properties -v org.freedesktop.DBus.Properties.xml
2938
4
 *
2939
5
 * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
2940
6
 *
2941
7
 * This is an auto-generated file.
2942
8
 * Do not edit! All changes made to it will be lost.
2943
9
 */
2944
10
2945
11
#ifndef FREEDESKTOP_PROPERTIES_H_1442473392
2946
12
#define FREEDESKTOP_PROPERTIES_H_1442473392
2947
13
2948
14
#include <QtCore/QObject>
2949
15
#include <QtCore/QByteArray>
2950
16
#include <QtCore/QList>
2951
17
#include <QtCore/QMap>
2952
18
#include <QtCore/QString>
2953
19
#include <QtCore/QStringList>
2954
20
#include <QtCore/QVariant>
2955
21
#include <QtDBus/QtDBus>
2956
22
2957
23
/*
2958
24
 * Proxy class for interface org.freedesktop.DBus.Properties
2959
25
 */
2960
26
class FreeDesktopProperties: public QDBusAbstractInterface
2961
27
{
2962
28
    Q_OBJECT
2963
29
public:
2964
30
    static inline const char *staticInterfaceName()
2965
31
    { return "org.freedesktop.DBus.Properties"; }
2966
32
2967
33
public:
2968
34
    FreeDesktopProperties(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
2969
35
2970
36
    ~FreeDesktopProperties();
2971
37
2972
38
public Q_SLOTS: // METHODS
2973
39
    inline QDBusPendingReply<QDBusVariant> Get(const QString &interface, const QString &name)
2974
40
    {
2975
41
        QList<QVariant> argumentList;
2976
42
        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name);
2977
43
        return asyncCallWithArgumentList(QStringLiteral("Get"), argumentList);
2978
44
    }
2979
45
2980
46
    inline QDBusPendingReply<QVariantMap> GetAll(const QString &interface)
2981
47
    {
2982
48
        QList<QVariant> argumentList;
2983
49
        argumentList << QVariant::fromValue(interface);
2984
50
        return asyncCallWithArgumentList(QStringLiteral("GetAll"), argumentList);
2985
51
    }
2986
52
2987
53
    inline QDBusPendingReply<> Set(const QString &interface, const QString &name, const QDBusVariant &value)
2988
54
    {
2989
55
        QList<QVariant> argumentList;
2990
56
        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name) << QVariant::fromValue(value);
2991
57
        return asyncCallWithArgumentList(QStringLiteral("Set"), argumentList);
2992
58
    }
2993
59
2994
60
Q_SIGNALS: // SIGNALS
2995
61
    void PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, const QStringList &invalidated_properties);
2996
62
};
2997
63
2998
64
namespace org {
2999
65
  namespace freedesktop {
3000
66
    namespace DBus {
3001
67
      typedef ::FreeDesktopProperties Properties;
3002
68
    }
3003
69
  }
3004
70
}
3005
71
#endif
3006
0
72
3007
=== added file 'plugins/bluetooth/org.bluez.Adapter1.xml'
3008
--- plugins/bluetooth/org.bluez.Adapter1.xml	1970-01-01 00:00:00 +0000
3009
+++ plugins/bluetooth/org.bluez.Adapter1.xml	2015-11-20 08:48:08 +0000
3010
@@ -0,0 +1,11 @@
3011
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
3012
2
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
3013
3
<node>
3014
4
  <interface name="org.bluez.Adapter1">
3015
5
    <method name="StartDiscovery"></method>
3016
6
    <method name="StopDiscovery"></method>
3017
7
    <method name="RemoveDevice">
3018
8
      <arg name="device" type="o" direction="in"/>
3019
9
    </method>
3020
10
  </interface>
3021
11
</node>
3022
0
12
3023
=== added file 'plugins/bluetooth/org.bluez.Agent1.xml'
3024
--- plugins/bluetooth/org.bluez.Agent1.xml	1970-01-01 00:00:00 +0000
3025
+++ plugins/bluetooth/org.bluez.Agent1.xml	2015-11-20 08:48:08 +0000
3026
@@ -0,0 +1,55 @@
3027
1
<?xml version="1.0" encoding="UTF-8" ?>
3028
2
3029
3
<node name="/">
3030
4
  <interface name="org.bluez.Agent1">
3031
5
    <method name="RequestPinCode">
3032
6
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3033
7
      <arg type="o" name="device"/>
3034
8
      <arg type="s" name="pincode" direction="out"/>
3035
9
    </method>
3036
10
3037
11
    <method name="DisplayPinCode">
3038
12
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3039
13
      <arg type="o" name="device"/>
3040
14
      <arg type="s" name="pincode"/>
3041
15
    </method>
3042
16
3043
17
    <method name="RequestPasskey">
3044
18
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3045
19
      <arg type="o" name="device"/>
3046
20
      <arg type="u" name="passkey" direction="out"/>
3047
21
    </method>
3048
22
3049
23
    <method name="DisplayPasskey">
3050
24
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3051
25
      <arg type="o" name="device"/>
3052
26
      <arg type="u" name="passkey"/>
3053
27
      <arg type="q" name="entered"/>
3054
28
    </method>
3055
29
3056
30
    <method name="RequestConfirmation">
3057
31
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3058
32
      <arg type="o" name="device"/>
3059
33
      <arg type="u" name="passkey"/>
3060
34
    </method>
3061
35
3062
36
    <method name="RequestAuthorization">
3063
37
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3064
38
      <arg type="o" name="device"/>
3065
39
    </method>
3066
40
3067
41
    <method name="AuthorizeService">
3068
42
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3069
43
      <arg type="o" name="device"/>
3070
44
      <arg type="s" name="uuid"/>
3071
45
    </method>
3072
46
3073
47
    <method name="Cancel">
3074
48
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3075
49
    </method>
3076
50
3077
51
    <method name="Release">
3078
52
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
3079
53
    </method>
3080
54
  </interface>
3081
55
</node>
3082
0
56
3083
=== added file 'plugins/bluetooth/org.bluez.AgentManager1.xml'
3084
--- plugins/bluetooth/org.bluez.AgentManager1.xml	1970-01-01 00:00:00 +0000
3085
+++ plugins/bluetooth/org.bluez.AgentManager1.xml	2015-11-20 08:48:08 +0000
3086
@@ -0,0 +1,16 @@
3087
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
3088
2
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
3089
3
<node>
3090
4
  <interface name="org.bluez.AgentManager1">
3091
5
    <method name="RegisterAgent">
3092
6
      <arg type="o" name="agent"/>
3093
7
      <arg type="s" name="capability"/>
3094
8
    </method>
3095
9
    <method name="UnregisterAgent">
3096
10
      <arg type="o" name="agent"/>
3097
11
    </method>
3098
12
    <method name="RequestDefaultAgent">
3099
13
      <arg type="o" name="agent"/>
3100
14
    </method>
3101
15
  </interface>
3102
16
</node>
3103
0
17
3104
=== added file 'plugins/bluetooth/org.bluez.Device1.xml'
3105
--- plugins/bluetooth/org.bluez.Device1.xml	1970-01-01 00:00:00 +0000
3106
+++ plugins/bluetooth/org.bluez.Device1.xml	2015-11-20 08:48:08 +0000
3107
@@ -0,0 +1,16 @@
3108
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
3109
2
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
3110
3
<node>
3111
4
  <interface name="org.bluez.Device1">
3112
5
    <method name="Disconnect"></method>
3113
6
    <method name="Connect"></method>
3114
7
    <method name="ConnectProfile">
3115
8
      <arg name="UUID" type="s" direction="in"/>
3116
9
    </method>
3117
10
    <method name="DisconnectProfile">
3118
11
      <arg name="UUID" type="s" direction="in"/>
3119
12
    </method>
3120
13
    <method name="Pair"></method>
3121
14
    <method name="CancelPairing"></method>
3122
15
  </interface>
3123
16
</node>
3124
0
17
3125
=== added file 'plugins/bluetooth/org.freedesktop.DBus.ObjectManager.xml'
3126
--- plugins/bluetooth/org.freedesktop.DBus.ObjectManager.xml	1970-01-01 00:00:00 +0000
3127
+++ plugins/bluetooth/org.freedesktop.DBus.ObjectManager.xml	2015-11-20 08:48:08 +0000
3128
@@ -0,0 +1,19 @@
3129
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
3130
2
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
3131
3
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
3132
4
  <interface name="org.freedesktop.DBus.ObjectManager">
3133
5
    <method name="GetManagedObjects">
3134
6
      <arg type="a{oa{sa{sv}}}" name="object_paths_interfaces_and_properties" direction="out"/>
3135
7
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ManagedObjectList"/>
3136
8
    </method>
3137
9
    <signal name="InterfacesAdded">
3138
10
      <arg type="o" name="object_path"/>
3139
11
  <arg type="a{sa{sv}}" name="interfaces_and_properties"/>
3140
12
  <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="InterfaceList"/>
3141
13
    </signal>
3142
14
    <signal name="InterfacesRemoved">
3143
15
      <arg type="o" name="object_path"/>
3144
16
      <arg type="as" name="interfaces"/>
3145
17
    </signal>
3146
18
  </interface>
3147
19
</node>
3148
0
20
3149
=== added file 'plugins/bluetooth/org.freedesktop.DBus.Properties.xml'
3150
--- plugins/bluetooth/org.freedesktop.DBus.Properties.xml	1970-01-01 00:00:00 +0000
3151
+++ plugins/bluetooth/org.freedesktop.DBus.Properties.xml	2015-11-20 08:48:08 +0000
3152
@@ -0,0 +1,27 @@
3153
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
3154
2
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
3155
3
<node>
3156
4
  <interface name="org.freedesktop.DBus.Properties">
3157
5
    <method name="Get">
3158
6
      <arg name="interface" type="s" direction="in"/>
3159
7
      <arg name="name" type="s" direction="in"/>
3160
8
      <arg name="value" type="v" direction="out"/>
3161
9
    </method>
3162
10
    <method name="Set">
3163
11
      <arg name="interface" type="s" direction="in"/>
3164
12
      <arg name="name" type="s" direction="in"/>
3165
13
      <arg name="value" type="v" direction="in"/>
3166
14
    </method>
3167
15
    <method name="GetAll">
3168
16
      <arg name="interface" type="s" direction="in"/>
3169
17
      <arg name="properties" type="a{sv}" direction="out"/>
3170
18
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
3171
19
    </method>
3172
20
    <signal name="PropertiesChanged">
3173
21
      <arg name="interface" type="s"/>
3174
22
      <arg name="changed_properties" type="a{sv}"/>
3175
23
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
3176
24
      <arg name="invalidated_properties" type="as"/>
3177
25
    </signal>
3178
26
  </interface>
3179
27
</node>
3180
0
28
3181
=== modified file 'plugins/bluetooth/plugin.cpp'
3182
--- plugins/bluetooth/plugin.cpp	2015-08-28 09:32:38 +0000
3183
+++ plugins/bluetooth/plugin.cpp	2015-11-20 08:48:08 +0000
3184
@@ -24,11 +24,17 @@
3185
24
#include <QtQml/QQmlContext>
24
#include <QtQml/QQmlContext>
3186
25
#include "bluetooth.h"
25
#include "bluetooth.h"
3187
26
#include "device.h"
26
#include "device.h"
3188
27
#include "bluez_helper.h"
3189
27
28
3190
28
void BackendPlugin::registerTypes(const char *uri)
29
void BackendPlugin::registerTypes(const char *uri)
3191
29
{
30
{
3192
30
    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Bluetooth"));
31
    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Bluetooth"));
3193
31
32
3194
33
    // Register additional QtDBus types we need
3195
34
    qDBusRegisterMetaType<InterfaceList>();
3196
35
    qDBusRegisterMetaType<ManagedObjectList>();
3197
36
3198
37
    // .. now register our real QML types
3199
32
    qmlRegisterType<Bluetooth>(uri, 1, 0, "UbuntuBluetoothPanel");
38
    qmlRegisterType<Bluetooth>(uri, 1, 0, "UbuntuBluetoothPanel");
3200
33
    qmlRegisterType<Device>(uri, 1, 0, "Device");
39
    qmlRegisterType<Device>(uri, 1, 0, "Device");
3201
34
    qmlRegisterType<Device>(uri, 1, 0, "Agent");
40
    qmlRegisterType<Device>(uri, 1, 0, "Agent");
3202
35
41
3203
=== modified file 'tests/plugins/bluetooth/CMakeLists.txt'
3204
--- tests/plugins/bluetooth/CMakeLists.txt	2014-07-29 20:45:24 +0000
3205
+++ tests/plugins/bluetooth/CMakeLists.txt	2015-11-20 08:48:08 +0000
3206
@@ -4,14 +4,23 @@
3207
4
include_directories(${QTDBUSTEST_INCLUDE_DIRS})
4
include_directories(${QTDBUSTEST_INCLUDE_DIRS})
3208
5
add_definitions(-DTESTS)
5
add_definitions(-DTESTS)
3209
6
6
3210
7
set(PLUGIN_SOURCES
3211
8
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluetooth.cpp
3212
9
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/devicemodel.cpp
3213
10
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/device.cpp
3214
11
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agent.cpp
3215
12
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluez_agent1adaptor.cpp
3216
13
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluez_agentmanager1.cpp
3217
14
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluez_device1.cpp
3218
15
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluez_adapter1.cpp
3219
16
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/freedesktop_objectmanager.cpp
3220
17
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/freedesktop_properties.cpp
3221
18
)
3222
19
3223
7
add_executable(tst-bluetooth
20
add_executable(tst-bluetooth
3224
8
    tst_bluetooth.cpp
21
    tst_bluetooth.cpp
3225
9
    fakebluez.cpp
22
    fakebluez.cpp
3231
10
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluetooth.cpp
23
    ${PLUGIN_SOURCES}
3227
11
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/devicemodel.cpp
3228
12
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/device.cpp
3229
13
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agent.cpp
3230
14
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agentadaptor.cpp
3232
15
)
24
)
3233
16
25
3234
17
target_link_libraries(tst-bluetooth
26
target_link_libraries(tst-bluetooth
3235
@@ -22,11 +31,7 @@
3236
22
add_executable(tst-bluetooth-devicemodel
31
add_executable(tst-bluetooth-devicemodel
3237
23
    tst_devicemodel.cpp
32
    tst_devicemodel.cpp
3238
24
    fakebluez.cpp
33
    fakebluez.cpp
3244
25
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluetooth.cpp
34
    ${PLUGIN_SOURCES}
3240
26
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/devicemodel.cpp
3241
27
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/device.cpp
3242
28
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agent.cpp
3243
29
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agentadaptor.cpp
3245
30
)
35
)
3246
31
36
3247
32
target_link_libraries(tst-bluetooth-devicemodel
37
target_link_libraries(tst-bluetooth-devicemodel
3248
@@ -35,13 +40,9 @@
3249
35
)
40
)
3250
36
41
3251
37
add_executable(tst-bluetooth-device
42
add_executable(tst-bluetooth-device
3253
38
    tst_devicemodel.cpp
43
    tst_device.cpp
3254
39
    fakebluez.cpp
44
    fakebluez.cpp
3260
40
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/bluetooth.cpp
45
    ${PLUGIN_SOURCES}
3256
41
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/devicemodel.cpp
3257
42
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/device.cpp
3258
43
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agent.cpp
3259
44
    ${CMAKE_SOURCE_DIR}/plugins/bluetooth/agentadaptor.cpp
3261
45
)
46
)
3262
46
47
3263
47
target_link_libraries(tst-bluetooth-device
48
target_link_libraries(tst-bluetooth-device
3264
48
49
3265
=== modified file 'tests/plugins/bluetooth/fakebluez.cpp'
3266
--- tests/plugins/bluetooth/fakebluez.cpp	2014-07-29 20:53:16 +0000
3267
+++ tests/plugins/bluetooth/fakebluez.cpp	2015-11-20 08:48:08 +0000
3268
@@ -29,7 +29,7 @@
3269
29
{
29
{
3270
30
    DBusMock::registerMetaTypes();
30
    DBusMock::registerMetaTypes();
3271
31
31
3273
32
    m_dbusMock.registerTemplate(BLUEZ_SERVICE, "bluez4",
32
    m_dbusMock.registerTemplate(BLUEZ_SERVICE, "bluez5",
3274
33
                                QDBusConnection::SystemBus);
33
                                QDBusConnection::SystemBus);
3275
34
    m_dbusTestRunner.startServices();
34
    m_dbusTestRunner.startServices();
3276
35
35
3277
@@ -75,13 +75,49 @@
3278
75
    return reply.isValid() ? reply.value() : QString();
75
    return reply.isValid() ? reply.value() : QString();
3279
76
}
76
}
3280
77
77
3281
78
void
3282
79
FakeBluez::pairDevice(const QString &address)
3283
80
{
3284
81
    QDBusReply<void> reply = m_bluezMock->call("PairDevice",
3285
82
                                                  m_currentAdapter,
3286
83
                                                  address);
3287
84
3288
85
    if (!reply.isValid()) {
3289
86
        qWarning() << "Failed to pair mock device:" << reply.error().message();
3290
87
    }
3291
88
}
3292
89
3293
90
void
3294
91
FakeBluez::connectDevice(const QString &address)
3295
92
{
3296
93
    QDBusReply<void> reply = m_bluezMock->call("ConnectDevice",
3297
94
                                                  m_currentAdapter,
3298
95
                                                  address);
3299
96
3300
97
    if (!reply.isValid()) {
3301
98
        qWarning() << "Failed to connect mock device:" << reply.error().message();
3302
99
    }
3303
100
}
3304
101
3305
102
void
3306
103
FakeBluez::disconnectDevice(const QString &address)
3307
104
{
3308
105
    QDBusReply<void> reply = m_bluezMock->call("DisconnectDevice",
3309
106
                                                  m_currentAdapter,
3310
107
                                                  address);
3311
108
3312
109
    if (!reply.isValid()) {
3313
110
        qWarning() << "Failed to disconnect mock device:" << reply.error().message();
3314
111
    }
3315
112
}
3316
113
3317
78
QVariant
114
QVariant
3318
79
FakeBluez::getProperty(const QString &path,
115
FakeBluez::getProperty(const QString &path,
3319
80
                       const QString &interface,
116
                       const QString &interface,
3320
81
                       const QString &property)
117
                       const QString &property)
3321
82
{
118
{
3322
83
    QDBusInterface iface(BLUEZ_SERVICE, path,
119
    QDBusInterface iface(BLUEZ_SERVICE, path,
3324
84
                         "org.freedesktop.DBus.Properties",
120
                         FREEDESKTOP_PROPERTIES_IFACE,
3325
85
                         m_dbusTestRunner.systemConnection());
121
                         m_dbusTestRunner.systemConnection());
3326
86
122
3327
87
    QDBusReply<QVariant> reply = iface.call("Get", interface, property);
123
    QDBusReply<QVariant> reply = iface.call("Get", interface, property);
3328
@@ -103,10 +139,11 @@
3329
103
                       const QVariant &value)
139
                       const QVariant &value)
3330
104
{
140
{
3331
105
    QDBusInterface iface(BLUEZ_SERVICE, path,
141
    QDBusInterface iface(BLUEZ_SERVICE, path,
3333
106
                         interface,
142
                         FREEDESKTOP_PROPERTIES_IFACE,
3334
107
                         m_dbusTestRunner.systemConnection());
143
                         m_dbusTestRunner.systemConnection());
3335
108
144
3337
109
    QDBusReply<void> reply = iface.call("SetProperty",
145
    QDBusReply<void> reply = iface.call("Set",
3338
146
                                        interface,
3339
110
                                        property, value);
147
                                        property, value);
3340
111
148
3341
112
    if (!reply.isValid()) {
149
    if (!reply.isValid()) {
3342
113
150
3343
=== modified file 'tests/plugins/bluetooth/fakebluez.h'
3344
--- tests/plugins/bluetooth/fakebluez.h	2014-07-29 20:53:16 +0000
3345
+++ tests/plugins/bluetooth/fakebluez.h	2015-11-20 08:48:08 +0000
3346
@@ -32,10 +32,10 @@
3347
32
#define BLUEZ_MAIN_OBJECT "/"
32
#define BLUEZ_MAIN_OBJECT "/"
3348
33
#define BLUEZ_MOCK_IFACE "org.bluez.Mock"
33
#define BLUEZ_MOCK_IFACE "org.bluez.Mock"
3349
34
34
3354
35
#define BLUEZ_MANAGER_IFACE "org.bluez.Manager"
35
#define BLUEZ_ADAPTER_IFACE "org.bluez.Adapter1"
3355
36
#define BLUEZ_ADAPTER_IFACE "org.bluez.Adapter"
36
#define BLUEZ_DEVICE_IFACE "org.bluez.Device1"
3356
37
#define BLUEZ_DEVICE_IFACE "org.bluez.Device"
37
3357
38
#define BLUEZ_AUDIO_IFACE "org.bluez.Audio"
38
#define FREEDESKTOP_PROPERTIES_IFACE "org.freedesktop.DBus.Properties"
3358
39
39
3359
40
using namespace QtDBusTest;
40
using namespace QtDBusTest;
3360
41
using namespace QtDBusMock;
41
using namespace QtDBusMock;
3361
@@ -61,17 +61,20 @@
3362
61
61
3363
62
    ~FakeBluez();
62
    ~FakeBluez();
3364
63
63
3366
64
    const QString currentAdapter() { return m_currentAdapter; }
64
    const QString currentAdapterPath() { return QString("/org/bluez/%1").arg(m_currentAdapter); }
3367
65
    const QList<QString> devices() { return m_devices; }
65
    const QList<QString> devices() { return m_devices; }
3368
66
    const QDBusConnection & dbus() { return m_dbusTestRunner.systemConnection(); }
66
    const QDBusConnection & dbus() { return m_dbusTestRunner.systemConnection(); }
3369
67
67
3370
68
    QString addAdapter(const QString &name, const QString &system_name);
68
    QString addAdapter(const QString &name, const QString &system_name);
3371
69
    QString addDevice(const QString &name, const QString &address);
69
    QString addDevice(const QString &name, const QString &address);
3372
70
    void pairDevice(const QString &address);
3373
71
    void connectDevice(const QString &address);
3374
72
    void disconnectDevice(const QString &address);
3375
70
73
3376
71
    QVariant getProperty(const QString &path,
74
    QVariant getProperty(const QString &path,
3377
72
                         const QString &interface,
75
                         const QString &interface,
3378
73
                         const QString &property);
76
                         const QString &property);
3380
74
    
77
3381
75
    void setProperty(const QString &path,
78
    void setProperty(const QString &path,
3382
76
                     const QString &interface,
79
                     const QString &interface,
3383
77
                     const QString &property,
80
                     const QString &property,
3384
78
81
3385
=== modified file 'tests/plugins/bluetooth/tst_bluetooth.cpp'
3386
--- tests/plugins/bluetooth/tst_bluetooth.cpp	2015-02-10 11:19:53 +0000
3387
+++ tests/plugins/bluetooth/tst_bluetooth.cpp	2015-11-20 08:48:08 +0000
3388
@@ -23,6 +23,7 @@
3389
23
#include "bluetooth.h"
23
#include "bluetooth.h"
3390
24
#include "device.h"
24
#include "device.h"
3391
25
#include "agent.h"
25
#include "agent.h"
3392
26
#include "bluez_helper.h"
3393
26
#include "fakebluez.h"
27
#include "fakebluez.h"
3394
27
28
3395
28
using namespace Bluez;
29
using namespace Bluez;
3396
@@ -36,6 +37,9 @@
3397
36
    Bluetooth *m_bluetooth;
37
    Bluetooth *m_bluetooth;
3398
37
    QDBusConnection *m_dbus;
38
    QDBusConnection *m_dbus;
3399
38
39
3400
40
    void processEvents(unsigned int msecs = 500);
3401
41
    void setDiscovering(bool value);
3402
42
3403
39
private Q_SLOTS:
43
private Q_SLOTS:
3404
40
    void init();
44
    void init();
3405
41
    void testGotAdapter();
45
    void testGotAdapter();
3406
@@ -48,16 +52,38 @@
3407
48
52
3408
49
};
53
};
3409
50
54
3410
55
void BluetoothTest::processEvents(unsigned int msecs)
3411
56
{
3412
57
    QTimer::singleShot(msecs, [=]() { QCoreApplication::instance()->exit(); });
3413
58
    QCoreApplication::instance()->exec();
3414
59
}
3415
60
3416
61
void BluetoothTest::setDiscovering(bool value)
3417
62
{
3418
63
    m_bluezMock->setProperty(m_bluezMock->currentAdapterPath(),
3419
64
                             BLUEZ_ADAPTER_IFACE,
3420
65
                             "Discovering",
3421
66
                             QVariant(value));
3422
67
}
3423
68
3424
51
void BluetoothTest::init()
69
void BluetoothTest::init()
3425
52
{
70
{
3426
71
    qWarning() << "init test";
3427
72
3428
73
    qDBusRegisterMetaType<InterfaceList>();
3429
74
    qDBusRegisterMetaType<ManagedObjectList>();
3430
75
3431
53
    m_bluezMock = new FakeBluez();
76
    m_bluezMock = new FakeBluez();
3432
54
    m_bluezMock->addAdapter("new0", "bluetoothTest");
77
    m_bluezMock->addAdapter("new0", "bluetoothTest");
3433
55
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
78
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
3434
56
    m_bluetooth = new Bluetooth(*m_dbus);
79
    m_bluetooth = new Bluetooth(*m_dbus);
3435
80
3436
81
    processEvents();
3437
57
}
82
}
3438
58
83
3439
59
void BluetoothTest::cleanup()
84
void BluetoothTest::cleanup()
3440
60
{
85
{
3441
86
    qWarning() << "cleanup";
3442
61
    delete m_bluezMock;
87
    delete m_bluezMock;
3443
62
    delete m_bluetooth;
88
    delete m_bluetooth;
3444
63
}
89
}
3445
@@ -67,6 +93,8 @@
3446
67
    QString expected = "bluetoothTest";
93
    QString expected = "bluetoothTest";
3447
68
    QString result;
94
    QString result;
3448
69
95
3449
96
    processEvents();
3450
97
3451
70
    result = m_bluetooth->adapterName();
98
    result = m_bluetooth->adapterName();
3452
71
99
3453
72
    QCOMPARE(result, expected);
100
    QCOMPARE(result, expected);
3454
@@ -74,70 +102,100 @@
3455
74
102
3456
75
void BluetoothTest::testStartDiscovery()
103
void BluetoothTest::testStartDiscovery()
3457
76
{
104
{
3458
77
    bool expected = true;
3459
78
    QVariant result;
105
    QVariant result;
3460
79
106
3462
80
    QSKIP("Fails due to a bug in bluez4 dbusmock template", SkipAll);
107
    // This is what our test expects the adapter to have set
3463
108
    setDiscovering(false);
3464
109
    processEvents();
3465
81
110
3468
82
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
111
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3469
83
                                      "org.bluez.Adapter",
112
                                      BLUEZ_ADAPTER_IFACE,
3470
84
                                      "Discovering");
113
                                      "Discovering");
3471
85
    qWarning() << result;
114
    qWarning() << result;
3473
86
    QCOMPARE(result.toBool(), !expected);
115
    QCOMPARE(result.toBool(), false);
3474
87
116
3475
88
    m_bluetooth->startDiscovery();
117
    m_bluetooth->startDiscovery();
3479
89
118
    setDiscovering(true);
3480
90
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
119
3481
91
                                      "org.bluez.Adapter",
120
    processEvents();
3482
121
3483
122
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3484
123
                                      BLUEZ_ADAPTER_IFACE,
3485
92
                                      "Discovering");
124
                                      "Discovering");
3486
93
    qWarning() << result;
125
    qWarning() << result;
3488
94
    QCOMPARE(result.toBool(), expected);
126
    QCOMPARE(result.toBool(), true);
3489
95
}
127
}
3490
96
128
3491
97
void BluetoothTest::testStopDiscovery()
129
void BluetoothTest::testStopDiscovery()
3492
98
{
130
{
3493
99
    bool expected = false;
3494
100
    QVariant result;
131
    QVariant result;
3495
101
132
3497
102
    QSKIP("Fails due to a bug in bluez4 dbusmock template", SkipAll);
133
    // This is what our test expects the adapter to have set
3498
134
    setDiscovering(true);
3499
135
    processEvents();
3500
103
136
3503
104
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
137
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3504
105
                                      "org.bluez.Adapter",
138
                                      BLUEZ_ADAPTER_IFACE,
3505
106
                                      "Discovering");
139
                                      "Discovering");
3507
107
    QCOMPARE(result.toBool(), !expected);
140
    QCOMPARE(result.toBool(), true);
3508
108
141
3509
109
    m_bluetooth->stopDiscovery();
142
    m_bluetooth->stopDiscovery();
3513
110
143
    setDiscovering(false);
3514
111
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
144
3515
112
                                      "org.bluez.Adapter",
145
    processEvents();
3516
146
3517
147
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3518
148
                                      BLUEZ_ADAPTER_IFACE,
3519
113
                                      "Discovering");
149
                                      "Discovering");
3521
114
    QCOMPARE(result.toBool(), expected);
150
    QCOMPARE(result.toBool(), false);
3522
115
}
151
}
3523
116
152
3524
153
/*
3525
154
 * NOTE: The bluez5 mock template currently doesn't send PropertiesChanged
3526
155
 * events when StartDiscovery/StopDiscovery is called on the adapter interface.
3527
156
 * To accomondate this we're calling the org.freedesktop.DBus.Properties.Set
3528
157
 * method here manually to simulate a property change. However this means
3529
158
 * that other than doing a dumb call to StartDiscovery/StopDiscovery nothing
3530
159
 * else will happen when those methods are called of the Bluetooth class we're
3531
160
 * testing here.
3532
161
 *
3533
162
 * This affects the following tested methods:
3534
163
 * - Bluetooth::startDiscovering
3535
164
 * - Bluetooth::stopDiscovery
3536
165
 * - Bluetooth::toggleDiscovery
3537
166
 */
3538
167
3539
117
void BluetoothTest::testToggleDiscovery()
168
void BluetoothTest::testToggleDiscovery()
3540
118
{
169
{
3541
119
    QVariant result;
170
    QVariant result;
3542
120
171
3543
121
    QSKIP("Fails due to a bug in bluez4 dbusmock template", SkipAll);
3544
122
3545
123
    m_bluetooth->stopDiscovery();
172
    m_bluetooth->stopDiscovery();
3549
124
173
    setDiscovering(false);
3550
125
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
174
3551
126
                                      "org.bluez.Adapter",
175
    processEvents();
3552
176
3553
177
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3554
178
                                      BLUEZ_ADAPTER_IFACE,
3555
127
                                      "Discovering");
179
                                      "Discovering");
3556
128
    QCOMPARE(result.toBool(), false);
180
    QCOMPARE(result.toBool(), false);
3557
129
181
3558
130
    m_bluetooth->toggleDiscovery();
182
    m_bluetooth->toggleDiscovery();
3562
131
183
    setDiscovering(true);
3563
132
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
184
3564
133
                                      "org.bluez.Adapter",
185
    processEvents();
3565
186
3566
187
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3567
188
                                      BLUEZ_ADAPTER_IFACE,
3568
134
                                      "Discovering");
189
                                      "Discovering");
3569
135
    QCOMPARE(result.toBool(), true);
190
    QCOMPARE(result.toBool(), true);
3570
136
191
3571
137
    m_bluetooth->toggleDiscovery();
192
    m_bluetooth->toggleDiscovery();
3575
138
193
    setDiscovering(false);
3576
139
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapter(),
194
3577
140
                                      "org.bluez.Adapter",
195
    processEvents();
3578
196
3579
197
    result = m_bluezMock->getProperty(m_bluezMock->currentAdapterPath(),
3580
198
                                      BLUEZ_ADAPTER_IFACE,
3581
141
                                      "Discovering");
199
                                      "Discovering");
3582
142
    QCOMPARE(result.toBool(), false);
200
    QCOMPARE(result.toBool(), false);
3583
143
}
201
}
3584
@@ -149,21 +207,34 @@
3585
149
    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Tablet), false);
207
    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Tablet), false);
3586
150
}
208
}
3587
151
209
3588
210
3589
152
void BluetoothTest::testIsDiscovering()
211
void BluetoothTest::testIsDiscovering()
3590
153
{
212
{
3591
154
    m_bluetooth->stopDiscovery();
213
    m_bluetooth->stopDiscovery();
3592
214
    setDiscovering(false);
3593
215
3594
216
    processEvents();
3595
155
217
3596
156
    QCOMPARE(m_bluetooth->isDiscovering(), false);
218
    QCOMPARE(m_bluetooth->isDiscovering(), false);
3597
157
219
3598
158
    m_bluetooth->startDiscovery();
220
    m_bluetooth->startDiscovery();
3599
221
    setDiscovering(true);
3600
222
3601
223
    processEvents();
3602
159
224
3603
160
    QCOMPARE(m_bluetooth->isDiscovering(), true);
225
    QCOMPARE(m_bluetooth->isDiscovering(), true);
3604
161
226
3605
162
    m_bluetooth->toggleDiscovery();
227
    m_bluetooth->toggleDiscovery();
3606
228
    setDiscovering(false);
3607
229
3608
230
    processEvents();
3609
163
231
3610
164
    QCOMPARE(m_bluetooth->isDiscovering(), false);
232
    QCOMPARE(m_bluetooth->isDiscovering(), false);
3611
165
233
3612
166
    m_bluetooth->toggleDiscovery();
234
    m_bluetooth->toggleDiscovery();
3613
235
    setDiscovering(true);
3614
236
3615
237
    processEvents();
3616
167
238
3617
168
    QCOMPARE(m_bluetooth->isDiscovering(), true);
239
    QCOMPARE(m_bluetooth->isDiscovering(), true);
3618
169
}
240
}
3619
170
241
3620
=== modified file 'tests/plugins/bluetooth/tst_device.cpp'
3621
--- tests/plugins/bluetooth/tst_device.cpp	2015-08-25 16:41:10 +0000
3622
+++ tests/plugins/bluetooth/tst_device.cpp	2015-11-20 08:48:08 +0000
3623
@@ -36,7 +36,7 @@
3624
36
    QDBusConnection *m_dbus;
36
    QDBusConnection *m_dbus;
3625
37
37
3626
38
private:
38
private:
3628
39
    void checkAudioState(const QString &expected);
39
    void processEvents(unsigned int msecs = 500);
3629
40
40
3630
41
private Q_SLOTS:
41
private Q_SLOTS:
3631
42
    void init();
42
    void init();
3632
@@ -50,16 +50,29 @@
3633
50
    void testGetStrength();
50
    void testGetStrength();
3634
51
    void testGetPath();
51
    void testGetPath();
3635
52
    void testMakeTrusted();
52
    void testMakeTrusted();
3637
53
    
53
    void testConnect();
3638
54
    void testDisconnect();
3639
55
3640
54
    void cleanup();
56
    void cleanup();
3641
55
57
3642
56
};
58
};
3643
57
59
3644
60
void DeviceTest::processEvents(unsigned int msecs)
3645
61
{
3646
62
    QTimer::singleShot(msecs, [=]() { QCoreApplication::instance()->exit(); });
3647
63
    QCoreApplication::instance()->exec();
3648
64
}
3649
65
3650
58
void DeviceTest::init()
66
void DeviceTest::init()
3651
59
{
67
{
3652
68
    qDBusRegisterMetaType<InterfaceList>();
3653
69
    qDBusRegisterMetaType<ManagedObjectList>();
3654
70
3655
60
    m_bluezMock = new FakeBluez();
71
    m_bluezMock = new FakeBluez();
3656
61
    m_bluezMock->addAdapter("new0", "bluetoothTest");
72
    m_bluezMock->addAdapter("new0", "bluetoothTest");
3657
62
    m_bluezMock->addDevice("My Phone", "00:00:de:ad:be:ef");
73
    m_bluezMock->addDevice("My Phone", "00:00:de:ad:be:ef");
3658
74
    // Only this will set the 'Class' and 'Icon' properties for the device ...
3659
75
    m_bluezMock->pairDevice("00:00:de:ad:be:ef");
3660
63
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
76
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
3661
64
77
3662
65
    QList<QString> devices = m_bluezMock->devices();
78
    QList<QString> devices = m_bluezMock->devices();
3663
@@ -67,6 +80,8 @@
3664
67
        QFAIL("No devices in mock to be tested.");
80
        QFAIL("No devices in mock to be tested.");
3665
68
81
3666
69
    m_device = new Device(devices.first(), *m_dbus);
82
    m_device = new Device(devices.first(), *m_dbus);
3667
83
3668
84
    processEvents();
3669
70
}
85
}
3670
71
86
3671
72
void DeviceTest::cleanup()
87
void DeviceTest::cleanup()
3672
@@ -77,29 +92,37 @@
3673
77
92
3674
78
void DeviceTest::testGetName()
93
void DeviceTest::testGetName()
3675
79
{
94
{
3687
80
    QCOMPARE(m_device->getName(), "My Phone");
95
    QCOMPARE(m_device->getName(), QString("My Phone"));
3688
81
}
96
}
3689
82
97
3690
83
void DeviceTest::testAddress()
98
void DeviceTest::testGetAddress()
3691
84
{
99
{
3692
85
    QCOMPARE(m_device->getAddress(), "00:00:de:ad:be:ef");
100
    QCOMPARE(m_device->getAddress(), QString("00:00:de:ad:be:ef"));
3693
86
}
101
}
3694
87
102
3695
88
void DeviceTest::testIconName()
103
void DeviceTest::testGetIconName()
3696
89
{
104
{
3697
90
    QCOMPARE(m_device->getIconName(), "image://theme/audio-headset");
105
    QCOMPARE(m_device->getIconName(), QString("image://theme/phone-smartphone-symbolic"));
3698
91
}
106
}
3699
92
107
3700
93
void DeviceTest::testGetType()
108
void DeviceTest::testGetType()
3701
94
{
109
{
3703
95
    QCOMPARE(m_device->getType(), Device::Type::Headset);
110
    QCOMPARE(m_device->getType(), Device::Type::Smartphone);
3704
96
}
111
}
3705
97
112
3706
98
void DeviceTest::testIsPaired()
113
void DeviceTest::testIsPaired()
3707
99
{
114
{
3708
115
    QCOMPARE(m_device->isPaired(), true);
3709
116
3710
117
    m_bluezMock->setProperty("/org/bluez/new0/dev_00_00_DE_AD_BE_EF", "org.bluez.Device1", "Paired", QVariant(false));
3711
118
3712
119
    processEvents();
3713
120
3714
100
    QCOMPARE(m_device->isPaired(), false);
121
    QCOMPARE(m_device->isPaired(), false);
3715
101
122
3717
102
    m_bluezMock->setProperty("org.bluez.Device", "Paired", QVariant(true));
123
    m_bluezMock->setProperty("/org/bluez/new0/dev_00_00_DE_AD_BE_EF", "org.bluez.Device1", "Paired", QVariant(true));
3718
124
3719
125
    processEvents();
3720
103
126
3721
104
    QCOMPARE(m_device->isPaired(), true);
127
    QCOMPARE(m_device->isPaired(), true);
3722
105
}
128
}
3723
@@ -108,26 +131,28 @@
3724
108
{
131
{
3725
109
    QCOMPARE(m_device->isTrusted(), false);
132
    QCOMPARE(m_device->isTrusted(), false);
3726
110
133
3728
111
    m_bluezMock->setProperty("org.bluez.Device", "Trusted", QVariant(true));
134
    m_bluezMock->setProperty("/org/bluez/new0/dev_00_00_DE_AD_BE_EF", "org.bluez.Device1", "Trusted", QVariant(true));
3729
135
3730
136
    processEvents();
3731
112
137
3732
113
    QCOMPARE(m_device->isTrusted(), true);
138
    QCOMPARE(m_device->isTrusted(), true);
3733
114
}
139
}
3734
115
140
3735
116
void DeviceTest::testGetConnection()
141
void DeviceTest::testGetConnection()
3736
117
{
142
{
3738
118
    QCOMPARE(m_device.getConnection(), Device::Connection::Disconnected);
143
    QCOMPARE(m_device->getConnection(), Device::Connection::Disconnected);
3739
119
}
144
}
3740
120
145
3741
121
void DeviceTest::testGetStrength()
146
void DeviceTest::testGetStrength()
3742
122
{
147
{
3744
123
    QCOMPARE(m_device.getStrength(), Device::Strength::Good);
148
    QCOMPARE(m_device->getStrength(), Device::Strength::Fair);
3745
124
}
149
}
3746
125
150
3747
126
void DeviceTest::testGetPath()
151
void DeviceTest::testGetPath()
3748
127
{
152
{
3752
128
    QCOMPARE(m_device.getPath(),
153
    QCOMPARE(m_device->getPath(),
3753
129
             "/org/bluez/" + m_bluezMock->currentAdapter() + "/"
154
             m_bluezMock->currentAdapterPath() + "/"
3754
130
             + "dev_00_00_de_ad_be_ef");
155
             + "dev_00_00_DE_AD_BE_EF");
3755
131
}
156
}
3756
132
157
3757
133
void DeviceTest::testMakeTrusted()
158
void DeviceTest::testMakeTrusted()
3758
@@ -136,52 +161,40 @@
3759
136
161
3760
137
    m_device->makeTrusted(true);
162
    m_device->makeTrusted(true);
3761
138
163
3762
164
    processEvents();
3763
165
3764
139
    QCOMPARE(m_device->isTrusted(), true);
166
    QCOMPARE(m_device->isTrusted(), true);
3765
140
167
3766
141
    m_device->makeTrusted(false);
168
    m_device->makeTrusted(false);
3767
142
169
3768
170
    processEvents();
3769
171
3770
143
    QCOMPARE(m_device->isTrusted(), false);
172
    QCOMPARE(m_device->isTrusted(), false);
3771
144
}
173
}
3772
145
174
3773
146
void DeviceTest::checkAudioState(const QString &expected)
3774
147
{
3775
148
    QVariant state = m_bluezMock->getProperty("org.bluez.Audio", "State");
3776
149
3777
150
    QVERIFY(state.type() == QMetaType::QString);
3778
151
    QCOMPARE(state.toString(), expected);
3779
152
}
3780
153
3781
154
void DeviceTest::testConnect()
175
void DeviceTest::testConnect()
3782
155
{
176
{
3788
156
    testDiscoverServices();
177
    m_device->connect();
3789
157
178
3790
158
    m_device->connect(Device::ConnectionMode::Audio);
179
    m_bluezMock->connectDevice("00:00:de:ad:be:ef");
3791
159
180
3792
160
    checkAudioState("connected");
181
    processEvents();
3793
182
3794
183
    QCOMPARE(m_device->getConnection(), Device::Connected);
3795
161
}
184
}
3796
162
185
3797
163
void DeviceTest::testDisconnect()
186
void DeviceTest::testDisconnect()
3798
164
{
187
{
3799
165
    testConnect();
188
    testConnect();
3800
166
189
3821
167
    m_device->disconnect(Device::ConnectionMode::Audio);
190
    m_device->disconnect();
3822
168
191
3823
169
    checkAudioState("disconnected");
192
    m_bluezMock->disconnectDevice("00:00:de:ad:be:ef");
3824
170
}
193
3825
171
194
    processEvents();
3826
172
void DeviceTest::testConnectPending()
195
3827
173
{
196
    QCOMPARE(m_device->getConnection(), Device::Disconnected);
3828
174
    testIsPaired();
197
}
3829
175
    testIsTrusted();
198
3830
176
199
QTEST_MAIN(DeviceTest)
3811
177
    m_device->addConnectAfterPairing(Device::ConnectionMode::Audio);
3812
178
3813
179
    checkAudioState("disconnected");
3814
180
3815
181
    m_device->connectPending();
3816
182
3817
183
    checkAudioState("connected");
3818
184
}
3819
185
3820
186
QTEST_MAIN(DeviceTest);
3831
187
#include "tst_device.moc"
200
#include "tst_device.moc"
3832
188
201
3833
=== modified file 'tests/plugins/bluetooth/tst_devicemodel.cpp'
3834
--- tests/plugins/bluetooth/tst_devicemodel.cpp	2014-08-20 12:50:09 +0000
3835
+++ tests/plugins/bluetooth/tst_devicemodel.cpp	2015-11-20 08:48:08 +0000
3836
@@ -35,6 +35,9 @@
3837
35
    DeviceModel *m_devicemodel;
35
    DeviceModel *m_devicemodel;
3838
36
    QDBusConnection *m_dbus;
36
    QDBusConnection *m_dbus;
3839
37
37
3840
38
private:
3841
39
    void processEvents(unsigned int msecs = 500);
3842
40
3843
38
private Q_SLOTS:
41
private Q_SLOTS:
3844
39
    void init();
42
    void init();
3845
40
    void testDeviceFoundOnStart();
43
    void testDeviceFoundOnStart();
3846
@@ -45,15 +48,28 @@
3847
45
48
3848
46
};
49
};
3849
47
50
3850
51
void DeviceModelTest::processEvents(unsigned int msecs)
3851
52
{
3852
53
    QTimer::singleShot(msecs, [=]() { QCoreApplication::instance()->exit(); });
3853
54
    QCoreApplication::instance()->exec();
3854
55
}
3855
56
3856
48
void DeviceModelTest::init()
57
void DeviceModelTest::init()
3857
49
{
58
{
3858
59
    qDBusRegisterMetaType<InterfaceList>();
3859
60
    qDBusRegisterMetaType<ManagedObjectList>();
3860
61
3861
50
    m_bluezMock = new FakeBluez();
62
    m_bluezMock = new FakeBluez();
3862
51
63
3863
52
    m_bluezMock->addAdapter("new0", "bluetoothTest");
64
    m_bluezMock->addAdapter("new0", "bluetoothTest");
3864
53
    m_bluezMock->addDevice("My Phone", "00:00:de:ad:be:ef");
65
    m_bluezMock->addDevice("My Phone", "00:00:de:ad:be:ef");
3865
66
    // Only this will set the 'Class' and 'Icon' properties for the device ...
3866
67
    m_bluezMock->pairDevice("00:00:de:ad:be:ef");
3867
54
68
3868
55
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
69
    m_dbus = new QDBusConnection(m_bluezMock->dbus());
3869
56
    m_devicemodel = new DeviceModel(*m_dbus);
70
    m_devicemodel = new DeviceModel(*m_dbus);
3870
71
3871
72
    processEvents();
3872
57
}
73
}
3873
58
74
3874
59
void DeviceModelTest::cleanup()
75
void DeviceModelTest::cleanup()
3875
@@ -64,6 +80,9 @@
3876
64
80
3877
65
void DeviceModelTest::testDeviceFoundOnStart()
81
void DeviceModelTest::testDeviceFoundOnStart()
3878
66
{
82
{
3879
83
    // FIXME needs to take a bit more time especially on i386
3880
84
    processEvents();
3881
85
3882
67
    QCOMPARE(m_devicemodel->rowCount(), 1);
86
    QCOMPARE(m_devicemodel->rowCount(), 1);
3883
68
}
87
}
3884
69
88
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2015-09-17	Approve on 2015-11-12
Jonas G. Drange (community)			Approve on 2015-11-12
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-12
Review via email: mp+271456@code.launchpad.net