Merge lp:~phablet-team/telephony-service/sip-account into lp:telephony-service/staging

[Tiago Salem Herrmann]

Create unity8 sip account package.
Create unity8 irc account package.

Create unity8 sip account package.
Create unity8 irc account package.

[lp:~phablet-team/telephony-service/sip-account]

981. By Tiago Salem Herrmann on 2017-01-05

merge parent branch

982. By Tiago Salem Herrmann on 2017-01-05

merge parent branch

983. By Renato Araujo Oliveira Filho on 2017-01-09

Use a new account provider.

984. By Renato Araujo Oliveira Filho on 2017-01-10

Renamed install dir for qml accounts pluings.

985. By Renato Araujo Oliveira Filho on 2017-01-10

rename qml account plugin install dir, to follow the new service name.

986. By Renato Araujo Oliveira Filho on 2017-01-10

Fix account display name for irc accounts.

987. By Renato Araujo Oliveira Filho on 2017-01-12

Disable "continue" button if the main fields are empty.

988. By Renato Araujo Oliveira Filho on 2017-01-12

Format display name for irc accounts.
Disable continue button if any of the basics fields are empty.

989. By Renato Araujo Oliveira Filho on 2017-01-13

Fix irc provider name.

990. By Renato Araujo Oliveira Filho on 2017-01-13

Auto enable accounts after creation.

991. By Renato Araujo Oliveira Filho on 2017-01-26

Added 'telepathy-accounts-signon' as dep for sip account plugin.

This is necessary because sip store the auth data using online accounts.

992. By Renato Araujo Oliveira Filho on 2017-01-26

trunk merged.

993. By Renato Araujo Oliveira Filho on 2017-01-26

FIXME: Use plain password for sip accounts.

994. By Gustavo Pichorim Boiko on 2017-02-06

Merge parent branch

995. By Tiago Salem Herrmann on 2017-02-09

merge parent branch

996. By Tiago Salem Herrmann on 2017-03-03

merge parent branch

[Gustavo Pichorim Boiko (boiko)]

Some things to fix, but in general it looks good.

review: Needs Fixing

[lp:~phablet-team/telephony-service/sip-account]

997. By Renato Araujo Oliveira Filho on 2017-03-21

Added missing license headers.

[Renato Araujo Oliveira Filho (renatofilho)]

> Some things to fix, but in general it looks good.

Missing license fixed.

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-21 18:15:48 +0000
+++ CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -46,7 +46,7 @@
 
 option(SKIP_QML_TESTS "Skip QML tests" OFF)
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(CMAKE_CROSSCOMPILING)
     find_program(QMAKE_EXECUTABLE qmake)
     if(QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND")
         message(FATAL_ERROR "qmake not found")
@@ -112,6 +112,7 @@
 add_subdirectory(po)
 add_subdirectory(tests)
 add_subdirectory(protocols)
+add_subdirectory(accounts)
 
 include(EnableCoverageReport)
 #####################################################################

=== added directory 'accounts'
=== added file 'accounts/CMakeLists.txt'
--- accounts/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(sip)
+add_subdirectory(irc)

=== added directory 'accounts/common'
=== added file 'accounts/common/DynamicField.qml'
--- accounts/common/DynamicField.qml	1970-01-01 00:00:00 +0000
+++ accounts/common/DynamicField.qml	2017-03-21 18:15:49 +0000
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * Authors:
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+Loader {
+    id: root
+
+    property var model
+    readonly property string value: status === Loader.Ready ? item.value : ""
+    readonly property bool isEmpty: status === Loader.Ready ? item.isEmpty : true
+
+    Component {
+        id: stringField
+
+        TextField {
+            id: field
+
+            property alias label: field.placeholderText
+            property string defaultValue
+
+            readonly property alias value: field.text
+            readonly property bool isEmpty: value === "" || (defaultValue && value === model.defaultValue)
+
+            text: defaultValue ? defaultValue : ""
+        }
+    }
+
+    Component {
+        id: booleanField
+
+        Item {
+            property alias label: fieldLabel.text
+            property string defaultValue
+
+            readonly property string value: fieldValue.checked ? "true" : "false"
+            readonly property bool isEmpty: (defaultValue && value === model.defaultValue)
+
+            height: fieldValue.height
+
+            Label {
+                id: fieldLabel
+
+                anchors {
+                    left: parent.left
+                    right: fieldValue.left
+                    verticalCenter: parent.verticalCenter
+                }
+            }
+            Switch {
+                id: fieldValue
+
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+                checked: (defaultValue && (defaultValue === 'true'))
+            }
+        }
+    }
+
+    Component {
+       id: numericField
+
+       TextField {
+           id: field
+
+           property alias label: field.placeholderText
+           property string defaultValue
+
+           readonly property alias value: field.text
+           readonly property bool isEmpty: value === "" || (defaultValue && (value === defaultValue))
+
+           inputMethodHints: Qt.ImhDigitsOnly
+           validator: IntValidator {}
+       }
+    }
+
+    Component{
+        id: passwordField
+
+        Item {
+            property alias label: field.placeholderText
+            readonly property alias value: field.text
+            readonly property bool isEmpty: value === ""
+
+            height: field.height + showPasswordCheck.height
+            TextField {
+                id: field
+
+                echoMode: showPasswordCheck.checked ? TextInput.Normal : TextInput.Password
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                onTextChanged: root.changed()
+            }
+            CheckBox {
+                id: showPasswordCheck
+                anchors {
+                    left: field.left
+                    top: field.bottom
+                    topMargin: units.gu(1)
+                }
+            }
+            Label {
+                text: i18n.tr("Show Password")
+                anchors {
+                    top: showPasswordCheck.top
+                    left: showPasswordCheck.right
+                    leftMargin: units.gu(1)
+                    right: field.right
+                }
+            }
+        }
+    }
+
+
+    sourceComponent: {
+        if (!model)
+            return null
+
+        if (!model.inputType) {
+            console.warn("Model does not contain 'inputType'")
+            return null
+        }
+
+        switch (model.inputType) {
+        case 'string':
+            return stringField
+        case 'boolean':
+            return booleanField
+        case 'numeric':
+            return numericField
+        case 'password':
+            return passwordField
+        }
+    }
+
+    Binding {
+        target: root.item
+        property: "label"
+        value: model.label
+        when: root.status == Loader.Ready
+    }
+
+    Binding {
+        target: root.item
+        property: "defaultValue"
+        value: model.defaultValue
+        when: model.hasOwnProperty('defaultValue') && root.status == Loader.Ready
+    }
+}

=== added file 'accounts/common/Main.qml'
--- accounts/common/Main.qml	1970-01-01 00:00:00 +0000
+++ accounts/common/Main.qml	2017-03-21 18:15:49 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * Authors:
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+Item {
+    id: rootFlickable
+
+    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    signal finished
+
+    anchors.fill: parent
+
+    Flickable {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: btnConfirm.top
+        }
+        contentWidth: parent.width
+        contentHeight: editPageLoader.item.height + keyboardSize
+        clip: true
+
+        Loader {
+            id: editPageLoader
+            sourceComponent: account.accountId != 0 ? existingAccountComponent : newAccountComponent
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            Connections {
+                target: editPageLoader.item
+                onFinished: rootFlickable.finished()
+            }
+        }
+
+        Component {
+            id: newAccountComponent
+            NewAccount {}
+        }
+
+        Component {
+            id: existingAccountComponent
+            Options {}
+        }
+    }
+
+    Button {
+        id: btnConfirm
+        text: i18n.tr("Continue")
+        color: UbuntuColors.orange
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: btnCancel.top
+            margins: units.gu(2)
+            bottomMargin: units.gu(1)
+        }
+        enabled: editPageLoader.item && editPageLoader.item.isValid
+        onClicked: {
+            if (editPageLoader.item)
+                editPageLoader.item.confirm()
+        }
+
+    }
+
+    Button {
+        id: btnCancel
+
+        text: i18n.tr("Cancel")
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            margins: units.gu(2)
+            bottomMargin: units.gu(1)
+        }
+        onClicked: {
+            if (editPageLoader.item)
+                editPageLoader.item.cancel()
+        }
+    }
+}

=== added file 'accounts/common/NewAccountInterface.qml'
--- accounts/common/NewAccountInterface.qml	1970-01-01 00:00:00 +0000
+++ accounts/common/NewAccountInterface.qml	2017-03-21 18:15:49 +0000
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * Authors:
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+
+Item {
+    id: root
+
+    readonly property string keyPrefix: "telepathy/"
+    readonly property var accountObjectHandle: account ? account.objectHandle : undefined
+    readonly property alias isValid: paramsRepeater.fieldHasValues
+
+    property string manager
+    property string protocol
+    property string icon
+    property var params
+    property var advancedParams
+    property bool hasCrendentials: true
+
+
+    signal finished
+    height: fields.childrenRect.height +
+            units.gu(10)
+
+    function getAccountService() {
+        var service = serviceModel.get(0, "accountServiceHandle")
+        if (!service) {
+            console.warn("No service handle from model")
+            return null
+        }
+
+        return accountServiceComponent.createObject(null,
+                                                    {"objectHandle": service})
+    }
+
+    // virual
+    function extendedSettings(inputFields)
+    {
+        return {}
+        //Helper class to be extended by derived class
+    }
+
+    // virtual
+    function formatDisplayName(inputFields)
+    {
+        return inputFields['account']
+        // Helper function that allow the derived class to format a different display name
+    }
+
+    function saveServiceSettings(serviceIM, creds) {
+        var settingsIM = serviceIM.settings
+        var inputFields = {}
+
+        settingsIM[root.keyPrefix + 'manager'] = root.manager
+        settingsIM[root.keyPrefix + 'protocol'] = root.protocol
+        settingsIM[root.keyPrefix + 'Icon'] = root.icon
+
+        // basic fields
+        for (var i=0; i < paramsRepeater.count; i++) {
+            var fieldData = root.params[i]
+            var field = paramsRepeater.itemAt(i)
+            var fieldParamName = root.keyPrefix + 'param-' + fieldData.name
+
+            if (field.isEmpty) {
+                delete settingsIM[fieldParamName]
+            } else {
+                inputFields[fieldData.name] = field.value
+                if (fieldData.store) {
+                    settingsIM[fieldParamName] = field.value
+                }
+            }
+        }
+
+        // advanced fields
+        for (var i=0; i < advancedParamsRepeater.count; i++) {
+            var xFieldData = root.advancedParams[i]
+            var xField = advancedParamsRepeater.itemAt(i)
+            var xFieldParamName = root.keyPrefix + 'param-' + xFieldData.name
+
+            if (xField.isEmpty) {
+                delete settingsIM[xFieldParamName]
+            } else {
+                inputFields[xFieldData.name] = xField.value
+
+                if (xFieldData.store) {
+                    settingsIM[xFieldParamName] = xField.value
+                }
+            }
+        }
+
+
+        var xSettings = extendedSettings(inputFields)
+        for (var key in xSettings) {
+            settingsIM[root.keyPrefix + key] = xSettings[key]
+        }
+
+        account.updateDisplayName(formatDisplayName(inputFields))
+
+        serviceIM.updateSettings(settingsIM)
+        //serviceIM.credentials = creds
+        //serviceIM.updateServiceEnabled(true)
+    }
+
+    function continueAccountSave(creds)  {
+        var imService = root.getAccountService()
+        if (!imService) {
+            console.warn("Fail to retrieve account service")
+            return
+        }
+
+        root.saveServiceSettings(imService, creds)
+        if (creds)
+            globalAccountService.credentials = creds
+        globalAccountService.updateServiceEnabled(true)
+
+        account.synced.connect(root.finished)
+        account.sync()
+    }
+
+    function credentialsStored() {
+        if (creds.credentialsId === 0) {
+            console.warn("Credentials not stored correct")
+            return
+        }
+
+        var imService = root.getAccountService()
+        if (!imService) {
+            console.warn("Fail to retrieve account service")
+            return
+        }
+
+        continueAccountSave(creds)
+    }
+
+    function parseCrendentials() {
+        var credentials = {'userName': '', 'password': ''}
+
+        for (var i=0; i < paramsRepeater.count; i++) {
+            var fieldData = root.params[i]
+            var field = paramsRepeater.itemAt(i)
+
+            if (fieldData.name === 'account')
+                credentials['userName'] = field.value
+
+            if (fieldData.name === 'password')
+                credentials['password'] = field.value
+        }
+
+        return credentials
+    }
+
+    function cancel() {
+        account.removed.connect(root.finished)
+        account.remove(Account.RemoveCredentials)
+    }
+
+    function confirm() {
+        var info = root.parseCrendentials()
+        // save account
+        account.updateDisplayName(info.userName)
+        if (root.hasCrendentials) {
+            creds.userName = info.userName
+            creds.secret = info.password
+            creds.sync()
+        } else {
+            continueAccountSave(null)
+        }
+    }
+
+    Column {
+        id: fields
+
+        anchors {
+            top: parent.top
+            topMargin: units.gu(5)
+            left: parent.left
+            right: parent.right
+        }
+        height: childrenRect.height
+        spacing: units.gu(2)
+
+        Icon {
+            anchors.horizontalCenter: fields.horizontalCenter
+            name: root.icon
+        }
+
+        Repeater {
+            id: paramsRepeater
+
+            property bool fieldHasValues: false
+
+            function checkFieldsHasValues()
+            {
+                var hasEmptyField = false
+                for (var i = 0; i < paramsRepeater.count; i++) {
+
+                    var child = paramsRepeater.itemAt(i)
+                    if (child && child.isEmpty) {
+                        hasEmptyField = true
+                        break
+                    }
+                }
+                fieldHasValues = !hasEmptyField
+            }
+
+            width: parent.width
+            model: root.params
+            DynamicField {
+                model: modelData
+                anchors{
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(4)
+                }
+                onValueChanged: paramsRepeater.checkFieldsHasValues()
+            }
+        }
+
+        Item {
+            id: div
+
+            anchors{
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(3)
+            visible: root.advancedParams.length > 0
+        }
+
+        Label {
+            id: advancedParamsTitle
+
+            anchors{
+                left: parent.left
+                right: parent.right
+                margins: units.gu(4)
+            }
+            visible: root.advancedParams.length > 0
+            text: i18n.tr("Advanced Options")
+            textSize: Label.Medium
+        }
+
+        Repeater {
+            id: advancedParamsRepeater
+
+            width: parent.width
+            model: root.advancedParams
+            DynamicField {
+                model: modelData
+                anchors{
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(4)
+                }
+            }
+        }
+    }
+
+    AccountService {
+        id: globalAccountService
+
+        objectHandle: account.accountServiceHandle
+        autoSync: false
+    }
+
+    Credentials {
+        id: creds
+
+        caption: account.provider.id
+        acl: "*" // untill later
+        storeSecret: true
+        onCredentialsIdChanged: {
+            console.debug("Credetials id changed")
+            root.credentialsStored()
+        }
+    }
+
+    // necessary to store settings on the "IM" service
+    AccountServiceModel {
+        id: serviceModel
+
+        includeDisabled: true
+        account: root.accountObjectHandle
+        serviceType: "IM"
+    }
+
+    Component {
+        id: accountServiceComponent
+
+        AccountService {
+            autoSync: false
+        }
+    }
+}

=== added directory 'accounts/irc'
=== added file 'accounts/irc/CMakeLists.txt'
--- accounts/irc/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/irc/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(qml)
+add_subdirectory(data)

=== added directory 'accounts/irc/data'
=== added file 'accounts/irc/data/CMakeLists.txt'
--- accounts/irc/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/irc/data/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,5 @@
+file(GLOB PROVIDER_FILES *.provider)
+install(FILES ${PROVIDER_FILES} DESTINATION share/accounts/providers/)
+
+file(GLOB SERVICE_FILES *.service)
+install(FILES ${SERVICE_FILES} DESTINATION share/accounts/services/)

=== added file 'accounts/irc/data/telephony-irc-im.service'
--- accounts/irc/data/telephony-irc-im.service	1970-01-01 00:00:00 +0000
+++ accounts/irc/data/telephony-irc-im.service	2017-03-21 18:15:49 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="telephony-irc-im">
+  <type>IM</type>
+  <name>IRC</name>
+  <icon>irc</icon>
+  <provider>telephony-irc</provider>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="telepathy">
+      <setting name="manager">irc</setting>
+      <setting name="protocol">irc</setting>
+      <setting name="ConnectAutomatically">true</setting>
+      <setting type="s" name="AutomaticPresence">2;available;;</setting>
+    </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+
+</service>

=== added file 'accounts/irc/data/telephony-irc.provider'
--- accounts/irc/data/telephony-irc.provider	1970-01-01 00:00:00 +0000
+++ accounts/irc/data/telephony-irc.provider	2017-03-21 18:15:49 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="telephony-irc">
+  <name>IRC</name>
+  <icon>irc</icon>
+</provider>

=== added directory 'accounts/irc/qml'
=== added file 'accounts/irc/qml/AccountInfo.qml'
=== added file 'accounts/irc/qml/CMakeLists.txt'
--- accounts/irc/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/irc/qml/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,13 @@
+file(GLOB QML_PLUGIN_FILES *.qml)
+
+# The path (including plug-in name) where the QML files are installed
+set(QML_PLUGIN_INSTALL_DIR share/accounts/qml-plugins/telephony-irc/)
+
+# Do not install symbolic links
+set (QML_PLUGIN_RESOLVED_FILES "")
+foreach (QML_PLUGIN_FILE ${QML_PLUGIN_FILES})
+    get_filename_component(resolvedFile "${QML_PLUGIN_FILE}" REALPATH)
+    list (APPEND QML_PLUGIN_RESOLVED_FILES "${resolvedFile}")
+endforeach()
+
+install(FILES ${QML_PLUGIN_RESOLVED_FILES} DESTINATION ${QML_PLUGIN_INSTALL_DIR})

=== added symlink 'accounts/irc/qml/DynamicField.qml'
=== target is u'../../common/DynamicField.qml'
=== added symlink 'accounts/irc/qml/Main.qml'
=== target is u'../../common/Main.qml'
=== added file 'accounts/irc/qml/NewAccount.qml'
--- accounts/irc/qml/NewAccount.qml	1970-01-01 00:00:00 +0000
+++ accounts/irc/qml/NewAccount.qml	2017-03-21 18:15:49 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * Authors:
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+NewAccountInterface {
+    id: root
+
+    anchors {
+        left: parent.left
+        right: parent.right
+        verticalCenter: parent.verticalCenter
+    }
+
+    manager: 'irc'
+    protocol: 'irc'
+    icon: 'irc'
+    hasCrendentials: false
+    params: [
+        {'name': 'server', 'inputType': 'string', 'label': i18n.tr('Network. (Eg: chat.freenode.net)'), 'store': true},
+        {'name': 'nickname', 'inputType': 'string', 'label': i18n.tr('Nickname'), 'store': true},
+    ]
+    advancedParams: [
+        {'name': 'port', 'inputType': 'numeric', 'label': i18n.tr('Port'), 'store': true},
+        {'name': 'use-ssl', 'inputType': 'boolean', 'label': i18n.tr('Use ssl'), 'store': true},
+        {'name': 'verify-ssl-cert', 'inputType': 'boolean', 'label': i18n.tr('Verify ssl certificate'), 'store': true},
+        {'name': 'username', 'inputType': 'string', 'label': i18n.tr('Username'), 'store': true},
+        {'name': 'password', 'inputType': 'password', 'label': i18n.tr('Password'), 'store': true},
+        {'name': 'fullname', 'inputType': 'string', 'label': i18n.tr('Real name'), 'store': true},
+    ]
+
+    function extendedSettings(inputFields)
+    {
+        var settings = {}
+        settings['param-account'] = inputFields['nickname'] + "@" + inputFields['server']
+        if (settings['param-port'] == "")
+            settings['param-port'] = "6667"
+        return settings
+    }
+
+    function formatDisplayName(inputFields)
+    {
+        return inputFields['nickname'] + "@" + inputFields['server']
+    }
+}

=== added symlink 'accounts/irc/qml/NewAccountInterface.qml'
=== target is u'../../common/NewAccountInterface.qml'
=== added directory 'accounts/sip'
=== added file 'accounts/sip/CMakeLists.txt'
--- accounts/sip/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/sip/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(qml)
+add_subdirectory(data)

=== added directory 'accounts/sip/data'
=== added file 'accounts/sip/data/CMakeLists.txt'
--- accounts/sip/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/sip/data/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,5 @@
+file(GLOB PROVIDER_FILES *.provider)
+install(FILES ${PROVIDER_FILES} DESTINATION share/accounts/providers/)
+
+file(GLOB SERVICE_FILES *.service)
+install(FILES ${SERVICE_FILES} DESTINATION share/accounts/services/)

=== added file 'accounts/sip/data/telephony-sip-im.service'
--- accounts/sip/data/telephony-sip-im.service	1970-01-01 00:00:00 +0000
+++ accounts/sip/data/telephony-sip-im.service	2017-03-21 18:15:49 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="telephony-sip-im">
+  <type>IM</type>
+  <name>SIP</name>
+  <icon>sip</icon>
+  <provider>telephony-sip</provider>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="telepathy">
+      <setting name="manager">sofiasip</setting>
+      <setting name="protocol">sip</setting>
+      <setting name="ConnectAutomatically">true</setting>
+      <setting type="s" name="AutomaticPresence">2;available;;</setting>
+    </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+
+</service>

=== added file 'accounts/sip/data/telephony-sip.provider'
--- accounts/sip/data/telephony-sip.provider	1970-01-01 00:00:00 +0000
+++ accounts/sip/data/telephony-sip.provider	2017-03-21 18:15:49 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="telephony-sip">
+  <name>SIP</name>
+  <icon>sip</icon>
+</provider>

=== added directory 'accounts/sip/qml'
=== added file 'accounts/sip/qml/AccountInfo.qml'
=== added file 'accounts/sip/qml/CMakeLists.txt'
--- accounts/sip/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/sip/qml/CMakeLists.txt	2017-03-21 18:15:49 +0000
@@ -0,0 +1,13 @@
+file(GLOB QML_PLUGIN_FILES *.qml)
+
+# The path (including plug-in name) where the QML files are installed
+set(QML_PLUGIN_INSTALL_DIR share/accounts/qml-plugins/telephony-sip/)
+
+# Do not install symbolic links
+set (QML_PLUGIN_RESOLVED_FILES "")
+foreach (QML_PLUGIN_FILE ${QML_PLUGIN_FILES})
+    get_filename_component(resolvedFile "${QML_PLUGIN_FILE}" REALPATH)
+    list (APPEND QML_PLUGIN_RESOLVED_FILES "${resolvedFile}")
+endforeach()
+
+install(FILES ${QML_PLUGIN_RESOLVED_FILES} DESTINATION ${QML_PLUGIN_INSTALL_DIR})

=== added symlink 'accounts/sip/qml/DynamicField.qml'
=== target is u'../../common/DynamicField.qml'
=== added symlink 'accounts/sip/qml/Main.qml'
=== target is u'../../common/Main.qml'
=== added file 'accounts/sip/qml/NewAccount.qml'
--- accounts/sip/qml/NewAccount.qml	1970-01-01 00:00:00 +0000
+++ accounts/sip/qml/NewAccount.qml	2017-03-21 18:15:49 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * Authors:
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+NewAccountInterface {
+    id: root 
+
+    manager: 'sofiasip'
+    protocol: 'sip'
+    icon: 'sip'
+    hasCrendentials: false
+    params: [
+        {'name': 'account', 'inputType': 'string', 'label': i18n.tr('Sip Id. (Eg: [e-mail])'), 'store': true},
+        {'name': 'password', 'inputType': 'password', 'label': i18n.tr('Password'), 'store': true}
+    ]
+    advancedParams: [
+        {'name': 'discover-stun', 'inputType': 'boolean', 'label': i18n.tr('Discover the STUN server automatically'), 'store': true, 'defaultValue' : 'false' },
+        {'name': 'stun-server', 'inputType': 'string', 'label': i18n.tr('STUN server'), 'store': true},
+        {'name': 'stun-port', 'inputType': 'numeric', 'label': i18n.tr('STUN port'), 'store': true},
+        {'name': 'discover-binding', 'inputType': 'boolean', 'label': i18n.tr('Divscover Binding'), 'store': true, 'defaultValue': 'true'},
+        {'name': 'proxy-host', 'inputType': 'string', 'label': i18n.tr('Proxy server'), 'store': true},
+        {'name': 'port', 'inputType': 'numeric', 'label': i18n.tr('Proxy port'), 'store': true},
+        {'name': 'keepalive-mechanism', 'inputType': 'string', 'label': i18n.tr('Keep alive mechanism'), 'store': true, 'defaultValue': 'auto'},
+        {'name': 'keepalive-interval', 'inputType': 'numeric', 'label': i18n.tr('Keep alive interval'), 'store': true},
+        {'name': 'auth-user', 'inputType': 'string', 'label': i18n.tr('Authentication username'), 'store': true},
+        {'name': 'transport', 'inputType': 'string', 'label': i18n.tr('Transport'), 'store': true, 'defaultValue': 'auto'},
+        {'name': 'loose-routing', 'inputType': 'boolean', 'label': i18n.tr('Loose Routing'), 'store': true, 'defaultValue': 'false'}
+    ]
+}

=== added symlink 'accounts/sip/qml/NewAccountInterface.qml'
=== target is u'../../common/NewAccountInterface.qml'
=== added file 'debian/account-plugin-irc-unity8.install'
--- debian/account-plugin-irc-unity8.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-irc-unity8.install	2017-03-21 18:15:49 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/qml-plugins/telephony-irc/*
+usr/share/accounts/providers/telephony-irc.provider
+usr/share/accounts/services/telephony-irc-im.service

=== added file 'debian/account-plugin-sip-unity8.install'
--- debian/account-plugin-sip-unity8.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-sip-unity8.install	2017-03-21 18:15:49 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/qml-plugins/telephony-sip/*
+usr/share/accounts/providers/telephony-sip.provider
+usr/share/accounts/services/telephony-sip-im.service

=== modified file 'debian/control'
--- debian/control	2016-12-05 15:14:33 +0000
+++ debian/control	2017-03-21 18:15:49 +0000
@@ -92,3 +92,22 @@
  This package contains the QML plugin providing the features from the telephony
  PhoneNumber to applications.
 
+Package: account-plugin-sip-unity8
+Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: mcp-account-manager-uoa-common,
+         telepathy-accounts-signon
+Description: Online account plugin for unity8
+ Online account plugin for unity8.
+ .
+ This package contains the online account plugin providing sip account.
+
+Package: account-plugin-irc-unity8
+Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: mcp-account-manager-uoa-common
+Description: Online account plugin for unity8
+ Online account plugin for unity8.
+ .
+ This package contains the online account plugin providing irc account.
+