[DBusService] Update dbus service

nemomobile-ux · Nov 23, 2018 · 7f0e7d9 · 7f0e7d9
1 parent 206d732
commit 7f0e7d9
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 310 deletions.
diff --git a/data/glacier-messages.desktop b/data/glacier-messages.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=Messages
 Icon=/usr/share/glacier-messages/glacier-messages.png
-Exec=/usr/bin/glacier-messages
+Exec=/usr/bin/invoker --type=nemomobile -s /usr/bin/glacier-messages
 Comment=Nemo messaging application
 X-Desktop-File-Install-Version=0.19
 X-Maemo-Service=org.nemomobile.qmlmessages

diff --git a/data/org.freedesktop.Telepathy.Client.qmlmessages.service b/data/org.freedesktop.Telepathy.Client.qmlmessages.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.qmlmessages
-Exec=/usr/bin/glacier-messages -prestart
+Exec=/usr/bin/invoker --type=nemomobile -s /usr/bin/glacier-messages
diff --git a/data/org.nemomobile.qmlmessages.service b/data/org.nemomobile.qmlmessages.service
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.nemomobile.qmlmessages
-Exec=/usr/bin/glacier-messages -prestart
+Exec=/usr/bin/invoker --type=nemomobile -s /usr/bin/glacier-messages
 
diff --git a/glacier-messages.pro b/glacier-messages.pro
@@ -4,14 +4,8 @@ QT += dbus quick
 target.path = $$INSTALL_ROOT/usr/bin
 INSTALLS += target
 
-SOURCES += src/main.cpp \
-    src/windowmanager.cpp \
-    src/dbusadaptor.cpp
+SOURCES += src/main.cpp
 
-HEADERS += src/windowmanager.h \
-    src/dbusadaptor.h
-
-# do not edit below here
 TEMPLATE = app
 TARGET = $$PROJECT_NAME
 
@@ -23,6 +17,7 @@ LIBS += -lglacierapp
 DISTFILES += \
     rpm/glacier-messages.spec \
     qml/common/CommHistoryService.qml \
+    qml/common/MessagesService.qml \
     qml/ChatTextInput.qml \
     qml/ConversationListDelegate.qml \
     qml/ConversationListPage.qml \

diff --git a/qml/ConversationListWidget.qml b/qml/ConversationListWidget.qml
@@ -59,6 +59,7 @@ Item {
             onClicked: {
                 var group = model.group
                 var channel = channelManager.getConversation(group.localUid, group.remoteUids[0])
+
                 pageStack.push(Qt.resolvedUrl("ConversationPage.qml"), { "channel": channel, "group": group })
             }
         }

diff --git a/qml/ConversationPage.qml b/qml/ConversationPage.qml
@@ -51,10 +51,11 @@ Page {
     property QtObject channel: null
     property QtObject group
     property QtObject person: group ? peopleModel.personById(group.contactId) : null
+    property string remoteUid: ""
 
     headerTools:  HeaderToolsLayout {
         id: hTools
-        title: person ? person.displayLabel : (group ? group.remoteUids[0] : "")
+        title: person ? person.displayLabel : (group ? group.remoteUids[0] : remoteUid)
         showBackButton: true;
 
         tools: [

diff --git a/qml/common/MessagesService.qml b/qml/common/MessagesService.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.6
+import org.nemomobile.dbus 2.0
+
+DBusAdaptor {
+    id: messagesInterface
+    service: "org.nemomobile.qmlmessages"
+    path: "/ui"
+    iface: "org.nemomobile.qmlmessages"
+
+    xml: '  <interface name="org.nemomobile.qmlmessages">\n' +
+         '    <method name="startConversation" />\n' +
+         '        <arg name="localUid" type="s" direction="in"/>\n' +
+         '        <arg name="remoteUid" type="s" direction="in"/>\n' +
+         '    </method>\n' +
+         '  </interface>\n'
+
+    signal startConversation(string localUid,  string remoteUid)
+}
+
diff --git a/qml/glacier-messages.qml b/qml/glacier-messages.qml
@@ -68,6 +68,14 @@ ApplicationWindow {
         manager: groupManager
     }
 
+    MessagesService{
+        id: messageService
+
+        onStartConversation: {
+            showConversation(localUid,remoteUid)
+        }
+    }
+
     CommHistoryService {
         id: commHistory
 
@@ -89,38 +97,33 @@ ApplicationWindow {
 
     function showConversation(localUid, remoteUid)
     {
-        if (!groupManager.ready) {
-            function delayedShow() {
-                if (groupManager.ready) {
-                    showConversation(localUid, remoteUid)
-                    groupManager.readyChanged.disconnect(delayedShow)
-                }
-            }
-            groupManager.modelReady.connect(delayedShow)
+        var channel = channelManager.getConversation(localUid, remoteUid)
+        var group = groupManager.findGroup(localUid, remoteUid)
+
+        if (!channel) {
             return
         }
 
-        var group = channelManager.getConversation(localUid, remoteUid)
-        if (!group || group == contextProvider.currentConversation)
-            return
+        if (pageStack.depth > 1) {
+            pageStack.clear();
+        }
+
+        if (!pageStack.currentPage) {
+            pageStack.push(Qt.resolvedUrl("ConversationListPage.qml"))
+        }
 
-        var pages = [ ]
-        if (!pageStack.currentPage)
-            pages.push(Qt.resolvedUrl("ConversationListPage.qml"))
-        pages.push({ page: Qt.resolvedUrl("ConversationPage.qml"), properties: { channel: group } })
+        pageStack.push(Qt.resolvedUrl("ConversationPage.qml"), { channel: channel, group: group, remoteUid: remoteUid })
 
-        if (pageStack.depth > 1)
-            pageStack.replace(pages)
-        else
-            pageStack.push(pages)
+        app.raise()
     }
 
     function showGroupsList()
     {
-        if (!pageStack.currentPage)
+        if (!pageStack.currentPage) {
             pageStack.push(Qt.resolvedUrl("ConversationListPage.qml"))
-        else if (pageStack.depth > 1)
+        } else if (pageStack.depth > 1) {
             pageStack.pop(null, true)
+        }
     }
 
     Component.onCompleted: {

diff --git a/src/dbusadaptor.cpp b/src/dbusadaptor.cpp
diff --git a/src/dbusadaptor.h b/src/dbusadaptor.h
diff --git a/src/windowmanager.cpp b/src/windowmanager.cpp