Merge ~om26er/dekko:master into dekko:master

[Dan Chapman ]

[Omer Akram (om26er)]

Looks good to me

review: Approve

[Dan Chapman  (dpniel)]

Looks good to me as well. Thanks!

review: Approve

diff --git a/qml/Components/EncryptionSelector.qml b/qml/Components/EncryptionSelector.qml
index ae5fb3e..2bcec2f 100644
--- a/qml/Components/EncryptionSelector.qml
+++ b/qml/Components/EncryptionSelector.qml
@@ -59,6 +59,7 @@ Selector {
                 model: encryptionMethodModel
                 delegate: CheckboxWithLabel {
                     id: delegate
+                    objectName: "encryption" + getEncryptionTypeFromModelIndex(model.index)
                     text: description
                     property bool isSelected: selectedIndex === model.index
                     checked: selectedIndex === model.index
@@ -70,6 +71,19 @@ Selector {
                             delegate.checked = delegate.isSelected
                         }
                     }
+
+                    function getEncryptionTypeFromModelIndex(modelIndex) {
+                        switch (modelIndex) {
+                            case 0:
+                                return "None"
+                            case 1:
+                                return "STARTTLS"
+                            case 2:
+                                return "SSL"
+                            default:
+                                return ''
+                        }
+                    }
                 }
             }
         }