Merge lp:~bfiller/messaging-app/rtm-14.09-sim-presence into lp:messaging-app/rtm-14.09

[Bill Filler]

sim presence and call grouping merge from trunk

sim presence and call grouping merge from trunk

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-11 22:22:59 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-22 15:28:37 +0000
@@ -35,7 +35,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 height: paintedHeight + units.gu(3)
                 Repeater {
-                    model: telepathyHelper.accounts
+                    model: telepathyHelper.activeAccounts
                     delegate: Label {
                         text: modelData.displayName
                         color: UbuntuColors.orange
 
=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-08-12 15:14:25 +0000
+++ src/qml/Messages.qml	2014-08-22 15:28:37 +0000
@@ -36,7 +36,7 @@
 
     // this property can be overriden by the user using the account switcher,
     // in the suru divider
-    property QtObject account: mainView.defaultAccount
+    property QtObject account: mainView.account
 
     property variant participants: []
     property bool groupChat: participants.length > 1
@@ -80,25 +80,24 @@
     // default account changes in system settings
     Connections {
         target: mainView
-        onDefaultAccountChanged: account = mainView.defaultAccount
+        onAccountChanged: messages.account = mainView.account
     }
 
     ListModel {
         id: attachments
     }
 
-    Connections {
-        target: activeTransfer !== null ? activeTransfer : null
-        onStateChanged: {
-            var done = ((activeTransfer.state === ContentTransfer.Charged) ||
-                        (activeTransfer.state === ContentTransfer.Aborted));
+    PictureImport {
+        id: pictureImporter
 
-            if (activeTransfer.state === ContentTransfer.Charged) {
-                if (activeTransfer.items.length > 0) {
-                    addAttachmentsToModel(activeTransfer)
-                    textEntry.forceActiveFocus()
-                }
-            }
+        onPictureReceived: {
+            var attachment = {}
+            var filePath = String(pictureUrl).replace('file://', '')
+            attachment["contentType"] = application.fileMimeType(filePath)
+            attachment["name"] = filePath.split('/').reverse()[0]
+            attachment["filePath"] = filePath
+            attachments.append(attachment)
+            textEntry.forceActiveFocus()
         }
     }
 
@@ -175,13 +174,6 @@
         return eventModel.markEventAsRead(accountId, threadId, eventId, type);
     }
 
-    ContentPeer {
-        id: defaultSource
-        contentType: ContentType.Pictures
-        handler: ContentHandler.Source
-        selectionType: ContentTransfer.Single
-    }
-
     Component {
         id: attachmentPopover
 
@@ -262,8 +254,8 @@
         }
 
         var accountNames = []
-        for(var i=0; i < telepathyHelper.accounts.length; i++) {
-            accountNames.push(telepathyHelper.accounts[i].displayName)
+        for(var i=0; i < telepathyHelper.activeAccounts.length; i++) {
+            accountNames.push(telepathyHelper.activeAccounts[i].displayName)
         }
         return accountNames
     }
@@ -271,8 +263,8 @@
         if (!messages.account) {
             return -1
         }
-        for (var i in telepathyHelper.accounts) {
-            if (telepathyHelper.accounts[i].accountId === messages.account.accountId) {
+        for (var i in telepathyHelper.activeAccounts) {
+            if (telepathyHelper.activeAccounts[i].accountId === messages.account.accountId) {
                 return i
             }
         }
@@ -280,7 +272,7 @@
     }
     Connections {
         target: messages.head.sections
-        onSelectedIndexChanged: messages.account = telepathyHelper.accounts[head.sections.selectedIndex]
+        onSelectedIndexChanged: messages.account = telepathyHelper.activeAccounts[head.sections.selectedIndex]
     }
 
     Component {
@@ -738,7 +730,8 @@
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    activeTransfer = defaultSource.request();
+                    Qt.inputMethod.hide()
+                    pictureImporter.requestNewPicture()
                 }
             }
         }
 
=== added file 'src/qml/PictureImport.qml'
--- src/qml/PictureImport.qml	1970-01-01 00:00:00 +0000
+++ src/qml/PictureImport.qml	2014-08-22 15:28:37 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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.2
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Content 0.1 as ContentHub
+
+Item {
+    id: root
+
+    property var importDialog: null
+
+    signal pictureReceived(string pictureUrl)
+
+    function requestNewPicture()
+    {
+        if (!root.importDialog) {
+            root.importDialog = PopupUtils.open(contentHubDialog, root)
+        } else {
+            console.warn("Import dialog already running")
+        }
+    }
+
+    Component {
+        id: contentHubDialog
+
+        Popups.PopupBase {
+            id: dialogue
+
+            property alias activeTransfer: signalConnections.target
+
+
+            focus: true
+
+            Rectangle {
+                anchors.fill: parent
+
+                ContentHub.ContentPeerPicker {
+                    id: peerPicker
+
+                    anchors.fill: parent
+                    visible: dialogue.done
+                    contentType: ContentHub.ContentType.Pictures
+                    handler: ContentHub.ContentHandler.Source
+
+                    onPeerSelected: {
+                        peer.selectionType = ContentHub.ContentTransfer.Single
+                        dialogue.activeTransfer = peer.request()
+                    }
+
+                    onCancelPressed: {
+                        PopupUtils.close(root.importDialog)
+                    }
+                }
+            }
+
+            Connections {
+                id: signalConnections
+
+                target: dialogue.activeTransfer
+                onStateChanged: {
+                    var done = ((dialogue.activeTransfer.state === ContentHub.ContentTransfer.Charged) ||
+                                (dialogue.activeTransfer.state === ContentHub.ContentTransfer.Aborted))
+
+                    if (dialogue.activeTransfer.state === ContentHub.ContentTransfer.Charged) {
+                        dialogue.hide()
+                        if (dialogue.activeTransfer.items.length > 0) {
+                            root.pictureReceived(dialogue.activeTransfer.items[0].url)
+                        }
+                    }
+
+                    if (done) {
+                        acceptTimer.restart()
+                    }
+                }
+            }
+
+            // WORKAROUND: Work around for application becoming insensitive to touch events
+            // if the dialog is dismissed while the application is inactive.
+            // Just listening for changes to Qt.application.active doesn't appear
+            // to be enough to resolve this, so it seems that something else needs
+            // to be happening first. As such there's a potential for a race
+            // condition here, although as yet no problem has been encountered.
+            Timer {
+                id: acceptTimer
+
+                interval: 100
+                repeat: true
+                running: false
+                onTriggered: {
+                   if(Qt.application.active) {
+                       PopupUtils.close(root.importDialog)
+                   }
+                }
+            }
+
+            Component.onDestruction: root.importDialog = null
+        }
+    }
+}
 
=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2014-08-12 15:14:25 +0000
+++ src/qml/messaging-app.qml	2014-08-22 15:28:37 +0000
@@ -28,16 +28,33 @@
     id: mainView
 
     property string newPhoneNumber
-    property bool multipleAccounts: telepathyHelper.accounts.length > 1
-    property QtObject defaultAccount: {
+    property bool multipleAccounts: telepathyHelper.activeAccounts.length > 1
+    property QtObject account: defaultAccount()
+
+    function defaultAccount() {
         // we only use the default account property if we have more
         // than one account, otherwise we use always the first one
         if (multipleAccounts) {
             return telepathyHelper.defaultMessagingAccount
         } else {
-            return telepathyHelper.accounts[0]
-        }
-    }
+            return telepathyHelper.activeAccounts[0]
+        }
+    }
+
+    Connections {
+        target: telepathyHelper
+        // restore default bindings if any system settings changed
+        onActiveAccountsChanged: {
+            for (var i in telepathyHelper.activeAccounts) {
+                if (telepathyHelper.activeAccounts[i] == account) {
+                    return;
+                }
+            }
+            account = Qt.binding(defaultAccount)
+        }
+        onDefaultMessagingAccountChanged: account = Qt.binding(defaultAccount)
+    }
+
 
     automaticOrientation: true
     width: units.gu(40)