piggz · jmlich · Feb 7, 2025 · Feb 8, 2025
diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -1,5 +1,5 @@
 #include "deviceinterface.h"
-
+#include "bluezadapter.h"
 #include "deviceinfoservice.h"
 #include "alertnotificationservice.h"
 #include "hrmservice.h"
@@ -147,6 +147,17 @@ void DeviceInterface::disconnect()
     }
 }
 
+void DeviceInterface::unpair()
+{
+    qDebug() << Q_FUNC_INFO;
+    if (m_device) {
+        BluezAdapter adapter;
+        adapter.setAdapterPath(AmazfishConfig::instance()->localAdapter());
+        adapter.removeDevice(m_deviceAddress);
+
+    }
+}
+
 QString DeviceInterface::connectionState() const
 {
     if (!m_device) {

diff --git a/daemon/src/deviceinterface.h b/daemon/src/deviceinterface.h
@@ -46,6 +46,7 @@ class DeviceInterface : public QObject
     Q_INVOKABLE QString pair(const QString &name, const QString &address);
     Q_INVOKABLE void connectToDevice(const QString &address);
     Q_INVOKABLE void disconnect();
+    Q_INVOKABLE void unpair();
     Q_INVOKABLE QString connectionState() const;
     Q_INVOKABLE bool operationRunning();
     Q_INVOKABLE bool supportsFeature(int f);

diff --git a/qble b/qble
diff --git a/ui/qml/pages/FirstPage.qml b/ui/qml/pages/FirstPage.qml
@@ -11,6 +11,10 @@ PagePL {
 
     function unpairAccepted() {
         DaemonInterfaceInstance.disconnect();
+        DaemonInterfaceInstance.unpair()
+        AmazfishConfig.pairedAddress = "";
+        AmazfishConfig.pairedName = "";
+
     }
 
     pageMenu: PageMenuPL {

diff --git a/ui/qml/pages/PairPage.qml b/ui/qml/pages/PairPage.qml
@@ -114,8 +114,6 @@ PageListPL {
             contentHeight: styler.themeItemSizeLarge
 //            visible: model.FriendlyName.indexOf(deviceType) >= 0
             onClicked: {
-                AmazfishConfig.pairedAddress = "";
-                AmazfishConfig.pairedName = "";
                 stopDiscovery();
                 _deviceName = model.FriendlyName;
                 _deviceAddress = AmazfishConfig.localAdapter+"/dev_" + model.Address.replace(/:/g, '_');

diff --git a/ui/src/daemoninterface.cpp b/ui/src/daemoninterface.cpp
@@ -113,6 +113,15 @@ void DaemonInterface::disconnect()
     iface->call(QStringLiteral("disconnect"));
 }
 
+void DaemonInterface::unpair()
+{
+    if (!iface || !iface->isValid()) {
+        return;
+    }
+    iface->call(QStringLiteral("unpair"));
+}
+
+
 bool DaemonInterface::supportsFeature(Amazfish::Feature f)
 {
     if (!iface || !iface->isValid()) {

diff --git a/ui/src/daemoninterface.h b/ui/src/daemoninterface.h
@@ -30,6 +30,7 @@ class DaemonInterface : public QObject
 
     Q_INVOKABLE void connectToDevice(const QString &address);
     Q_INVOKABLE void disconnect();
+    Q_INVOKABLE void unpair();
     Q_INVOKABLE bool supportsFeature(Amazfish::Feature f);
     Q_INVOKABLE int supportedFeatures();
+32 −0		CMakeLists.txt
+14 −0		bluezadapter.cpp
+1 −0		bluezadapter.h
+1 −2		qbledevice.cpp