2 files changed, 4 insertions, 6 deletions
diff --git a/resources/qml/dialogs/InputDialog.qml b/resources/qml/dialogs/InputDialog.qml
index 49becc67..8bd95d09 100644
--- a/resources/qml/dialogs/InputDialog.qml
+++ b/resources/qml/dialogs/InputDialog.qml
@@ -13,7 +13,7 @@ ApplicationWindow {
 
     property alias prompt: promptLabel.text
     property alias echoMode: statusInput.echoMode
-    property var onAccepted: undefined
+    signal accepted(text: string)
 
     modality: Qt.NonModal
     flags: Qt.Dialog
@@ -55,8 +55,7 @@ ApplicationWindow {
 
         standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel
         onAccepted: {
-            if (inputDialog.onAccepted)
-                inputDialog.onAccepted(statusInput.text);
+            inputDialog.accepted(statusInput.text);
 
             inputDialog.close();
         }
diff --git a/resources/qml/dialogs/PhoneNumberInputDialog.qml b/resources/qml/dialogs/PhoneNumberInputDialog.qml
index f1b8eef8..f9bff31c 100644
--- a/resources/qml/dialogs/PhoneNumberInputDialog.qml
+++ b/resources/qml/dialogs/PhoneNumberInputDialog.qml
@@ -13,7 +13,7 @@ ApplicationWindow {
 
     property alias prompt: promptLabel.text
     property alias echoMode: statusInput.echoMode
-    property var onAccepted: undefined
+    signal accepted(countryCode: string, text: string)
 
     modality: Qt.NonModal
     flags: Qt.Dialog
@@ -1729,8 +1729,7 @@ ApplicationWindow {
     footer: DialogButtonBox {
         standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel
         onAccepted: {
-            if (inputDialog.onAccepted)
-                inputDialog.onAccepted(numberPrefix.model.get(numberPrefix.currentIndex).i, statusInput.text);
+            inputDialog.accepted(numberPrefix.model.get(numberPrefix.currentIndex).i, statusInput.text);
 
             inputDialog.close();
         }