diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/BluetoothAdapter.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothDevice.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothGattCharacteristic.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothGattDescriptor.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothGattService.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothManager.cpp | 2 | ||||
| -rw-r--r-- | src/BluetoothObject.cpp | 2 | ||||
| -rw-r--r-- | src/org.bluez.xml | 53 |
8 files changed, 60 insertions, 7 deletions
diff --git a/src/BluetoothAdapter.cpp b/src/BluetoothAdapter.cpp index ba8873ba..eab4eacd 100644 --- a/src/BluetoothAdapter.cpp +++ b/src/BluetoothAdapter.cpp @@ -88,7 +88,7 @@ std::string BluetoothAdapter::get_class_name() const std::string BluetoothAdapter::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothAdapter"); + return std::string(JAVA_DBUS_PACKAGE "/DBusAdapter"); } std::string BluetoothAdapter::get_object_path() const diff --git a/src/BluetoothDevice.cpp b/src/BluetoothDevice.cpp index 1565941e..97538cd4 100644 --- a/src/BluetoothDevice.cpp +++ b/src/BluetoothDevice.cpp @@ -148,7 +148,7 @@ std::string BluetoothDevice::get_class_name() const std::string BluetoothDevice::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothDevice"); + return std::string(JAVA_DBUS_PACKAGE "/DBusDevice"); } std::string BluetoothDevice::get_object_path() const diff --git a/src/BluetoothGattCharacteristic.cpp b/src/BluetoothGattCharacteristic.cpp index a087ae68..30914e9e 100644 --- a/src/BluetoothGattCharacteristic.cpp +++ b/src/BluetoothGattCharacteristic.cpp @@ -60,7 +60,7 @@ std::string BluetoothGattCharacteristic::get_class_name() const std::string BluetoothGattCharacteristic::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothGattCharacteristic"); + return std::string(JAVA_DBUS_PACKAGE "/DBusGattCharacteristic"); } std::string BluetoothGattCharacteristic::get_object_path() const diff --git a/src/BluetoothGattDescriptor.cpp b/src/BluetoothGattDescriptor.cpp index ff5f804d..72acdd37 100644 --- a/src/BluetoothGattDescriptor.cpp +++ b/src/BluetoothGattDescriptor.cpp @@ -59,7 +59,7 @@ std::string BluetoothGattDescriptor::get_class_name() const std::string BluetoothGattDescriptor::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothGattDescriptor"); + return std::string(JAVA_DBUS_PACKAGE "/DBusGattDescriptor"); } std::string BluetoothGattDescriptor::get_object_path() const diff --git a/src/BluetoothGattService.cpp b/src/BluetoothGattService.cpp index bc3fd534..d63893eb 100644 --- a/src/BluetoothGattService.cpp +++ b/src/BluetoothGattService.cpp @@ -38,7 +38,7 @@ std::string BluetoothGattService::get_class_name() const std::string BluetoothGattService::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothGattService"); + return std::string(JAVA_DBUS_PACKAGE "/DBusGattService"); } std::string BluetoothGattService::get_object_path() const diff --git a/src/BluetoothManager.cpp b/src/BluetoothManager.cpp index 5c6c82ad..b6868d09 100644 --- a/src/BluetoothManager.cpp +++ b/src/BluetoothManager.cpp @@ -109,7 +109,7 @@ std::string BluetoothManager::get_class_name() const std::string BluetoothManager::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothManager"); + return std::string(JAVA_DBUS_PACKAGE "/DBusManager"); } std::string BluetoothManager::get_object_path() const diff --git a/src/BluetoothObject.cpp b/src/BluetoothObject.cpp index 79c8b6e4..2e8ddaf4 100644 --- a/src/BluetoothObject.cpp +++ b/src/BluetoothObject.cpp @@ -29,7 +29,7 @@ using namespace tinyb; std::string BluetoothObject::get_java_class() const { - return std::string(JAVA_PACKAGE "/BluetoothObject"); + return std::string(JAVA_DBUS_PACKAGE "/DBusObject"); } std::string BluetoothObject::get_class_name() const diff --git a/src/org.bluez.xml b/src/org.bluez.xml index c87384b5..da200c6b 100644 --- a/src/org.bluez.xml +++ b/src/org.bluez.xml @@ -20,6 +20,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Author: Sven Gothel <[email protected]> +Copyright (c) 2020 Gothel Software e.K. + +Permission / License unchanged BSD style. + --> <node> <interface name="org.bluez.Adapter1"> @@ -139,4 +145,51 @@ THE SOFTWARE. <property name="ServiceData" type="a{sv}" access="read"/> <property name="IncludeTxPower" type="b" access="read"/> </interface> + + <interface name="org.bluez.AgentManager1"> + <method name="RegisterAgent"> + <arg name="agent" type="o" direction="in" /> + <arg name="capability" type="s" direction="in" /> + </method> + <method name="UnregisterAgent"> + <arg name="agent" type="o" direction="in" /> + </method> + <method name="RequestDefaultAgent"> + <arg name="agent" type="o" direction="in" /> + </method> + </interface> + + <interface name="org.bluez.Agent1"> + <method name="Release"/> + <method name="RequestPinCode"> + <arg name="pincode" type="s" direction="out" /> + <arg name="device" type="o" direction="in" /> + </method> + <method name="DisplayPinCode"> + <arg name="device" type="o" direction="in" /> + <arg name="pincode" type="s" direction="in" /> + </method> + <method name="RequestPasskey"> + <arg name="passkey" type="u" direction="out" /> + <arg name="device" type="o" direction="in" /> + </method> + <method name="DisplayPasskey"> + <arg name="device" type="o" direction="in" /> + <arg name="passkey" type="u" direction="in" /> + <arg name="entered" type="q" direction="in" /> + </method> + <method name="RequestConfirmation"> + <arg name="device" type="o" direction="in" /> + <arg name="passkey" type="u" direction="in" /> + </method> + <method name="RequestAuthorization"> + <arg name="device" type="o" direction="in" /> + </method> + <method name="AuthorizeService"> + <arg name="device" type="o" direction="in" /> + <arg name="uuid" type="s" direction="in" /> + </method> + <method name="Cancel"/> + </interface> + </node> |