Merge lp:~phablet-team/messaging-app/fix-argument-parsing into lp:messaging-app/staging

[Tiago Salem Herrmann]

Fix argument parsing with the messaging:number pattern.

Fix argument parsing with the messaging:number pattern.

[lp:~phablet-team/messaging-app/fix-argument-parsing]

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

merge parent branch

642. By Tiago Salem Herrmann on 2017-01-11

merge parent branch

643. By Tiago Salem Herrmann on 2017-03-08

merge parent branch

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-08 18:35:43 +0000
+++ CMakeLists.txt	2017-01-05 16:15:26 +0000
@@ -71,6 +71,7 @@
 
 add_subdirectory(po)
 add_subdirectory(src)
+add_subdirectory(accounts)
 if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") AND (NOT ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64el")) AND (NOT ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64le")))
     add_subdirectory(tests)
 endif()
 
=== added directory 'accounts'
=== added file 'accounts/CMakeLists.txt'
--- accounts/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/CMakeLists.txt	2017-01-05 16:15:26 +0000
@@ -0,0 +1,5 @@
+file(GLOB APPLICATION_FILES *.application)
+install(FILES ${APPLICATION_FILES} DESTINATION share/accounts/applications/)
+
+file(GLOB SERVICE_FILES *.service)
+install(FILES ${SERVICE_FILES} DESTINATION share/accounts/services/)
 
=== added file 'accounts/messaging-app-im-irc.service'
--- accounts/messaging-app-im-irc.service	1970-01-01 00:00:00 +0000
+++ accounts/messaging-app-im-irc.service	2017-01-05 16:15:26 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="messaging-app-im-irc">
+  <type>messaging-app-im</type>
+  <name>IRC</name>
+  <icon>irc</icon>
+  <provider>irc</provider>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="telepathy">
+      <setting name="manager">irc</setting>
+      <setting name="protocol">irc</setting>
+    </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</service>
 
=== added file 'accounts/messaging-app.application'
--- accounts/messaging-app.application	1970-01-01 00:00:00 +0000
+++ accounts/messaging-app.application	2017-01-05 16:15:26 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="messaging-app">
+  <description>Messaging</description>
+  <desktop-entry>messaging-app.desktop</desktop-entry>
+  <translations>messaging</translations>
+
+  <services>
+    <service id="messaging-app-im-irc">
+      <description>Integrate your IRC accounts</description>
+    </service>
+  </services>
+</application>
 
=== modified file 'debian/messaging-app.install'
--- debian/messaging-app.install	2016-05-20 04:32:06 +0000
+++ debian/messaging-app.install	2017-01-05 16:15:26 +0000
@@ -1,3 +1,5 @@
+usr/share/accounts/applications/*
+usr/share/accounts/services/*
 usr/share/applications/messaging-app*.desktop
 usr/share/url-dispatcher/urls
 usr/share/content-hub/peers/messaging-app
 
=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2016-10-17 13:02:38 +0000
+++ src/messagingapplication.cpp	2017-01-05 16:15:26 +0000
@@ -258,6 +258,8 @@
             QStringList participantIds = value.split(";");
             properties["participantIds"] = participantIds;
         }
+    } else {
+        properties["participantIds"] = QStringList() << value;
     }
     QUrlQuery query(url);
     Q_FOREACH(const Pair &item, query.queryItems(QUrl::FullyDecoded)) {
 
=== modified file 'src/qml/NewGroupPage.qml'
--- src/qml/NewGroupPage.qml	2016-10-11 02:01:24 +0000
+++ src/qml/NewGroupPage.qml	2017-01-05 16:15:26 +0000
@@ -84,6 +84,9 @@
                         if (newGroupPage.creationInProgress) {
                             return false
                         }
+                        if (account.protocolInfo.joinExistingChannels && groupTitleField.text != "") {
+                            return true
+                        }
                         if (participantsModel.count == 0) {
                             return false
                         }
@@ -96,6 +99,9 @@
                     onTriggered: {
                         Qt.inputMethod.commit()
                         newGroupPage.creationInProgress = true
+                        if (account.protocolInfo.joinExistingChannels) {
+                           chatEntry.chatId = groupTitleField.text
+                        }
                         chatEntry.startChat()
                     }
                 }
@@ -249,6 +255,7 @@
             ContactSearchWidget {
                 id: searchItem
                 parentPage: newGroupPage
+                visible: !account.protocolInfo.joinExistingChannels
                 searchResultsHeight: flick.emptySpaceHeight
                 onContactPicked: addRecipientFromSearch(identifier, alias, avatar)
                 anchors {
@@ -259,6 +266,7 @@
             }
             Rectangle {
                id: separator2
+               visible: !account.protocolInfo.joinExistingChannels
                anchors {
                    left: parent.left
                    right: parent.right
@@ -285,6 +293,7 @@
                 anchors.top: searchItem.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
+                visible: !account.protocolInfo.joinExistingChannels
                 Repeater {
                     id: participantsRepeater
                     model: participantsModel