Merge lp:~ken-vandine/ubuntu-system-settings/custom_ringtone into lp:ubuntu-system-settings

[Ken VanDine]

Allow setting custom ringtone with content-hub

Allow setting custom ringtone with content-hub

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1556
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2481/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5172/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5186/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2481/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1557. By Ken VanDine on 2015-11-16

delete custom ringtone when it's no longer used

1558. By Ken VanDine on 2015-11-16

don't remove custom ringtone if it's still being used for other messages

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2483/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5176/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5190
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5190/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2483/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1559. By Ken VanDine on 2015-11-16

Updated visuals of the stop playback control to match design

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2486/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/670
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5193
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2486/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2487/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/671
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25144

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2487/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1560. By Ken VanDine on 2015-11-17

Don't specifically set the height on the ItemSelector

[Jonas G. Drange (jonas-drange)]

Two issues:

* There's a bug in the flickable. I'm unable to scroll to the end. Let me create some steps to repro
* double header http://i.imgur.com/gSM3vyl.png

Otherwise it works well and looks good!

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

Steps to repro:
1. USS -> Sound -> Ringtone
2. Quickly swipe down in the list

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1560
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5206/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/679
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4135/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5223
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25179

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2495/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1561. By Ken VanDine on 2015-11-17

Fixes in the SoundsList flickable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1561
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2496/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5223/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/680
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4149/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5243
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25206

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2496/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1562. By Ken VanDine on 2015-11-18

Don't show the page title in the peer picker and use progression to indicate the peer picker is a page

[Jonas G. Drange (jonas-drange)]

Looks good and works well. Thanks!

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1563. By Ken VanDine on 2015-11-18

Only show the custom ringtone picker for incoming calls

1564. By Ken VanDine on 2015-11-18

merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1562
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2499/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5235/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/683
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5255
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25230

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2499/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/custom_ringtone]

1565. By Ken VanDine on 2015-11-20

Don't include the custom ringtone for messages

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2015-08-10 13:31:45 +0000
+++ plugins/background/MainPage.qml	2015-11-20 13:12:56 +0000
@@ -21,7 +21,7 @@
 import QtQuick 2.4
 import GSettings 1.0
 import SystemSettings 1.0
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2015-10-16 13:42:50 +0000
+++ plugins/sound/SoundsList.qml	2015-11-20 13:12:56 +0000
@@ -2,6 +2,7 @@
 import QtQuick 2.4
 import QtMultimedia 5.0
 import SystemSettings 1.0
+import Ubuntu.Content 1.3
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.SystemSettings.Sound 1.0
@@ -12,13 +13,25 @@
 ItemPage {
     property variant soundDisplayNames:
         Utilities.buildSoundValues(soundFileNames)
-    property variant soundFileNames: backendInfo.listSounds(
-        [soundsDir, "/custom" + soundsDir])
+    property variant soundFileNames: refreshSoundFileNames()
     property bool showStopButton: false
     property int soundType // 0: ringtone, 1: message
     property string soundsDir
+    property var activeTransfer
+
+    onSoundFileNamesChanged: {
+        soundDisplayNames = Utilities.buildSoundValues(soundFileNames)
+        updateSelectedIndex()
+    }
 
     id: soundsPage
+    flickable: scrollWidget
+
+    function refreshSoundFileNames() {
+        if (soundType === 0)
+            return backendInfo.listSounds([soundsDir, "/custom" + soundsDir, backendInfo.customRingtonePath])
+        return backendInfo.listSounds([soundsDir, "/custom" + soundsDir])
+    }
 
     UbuntuSoundPanel {
         id: backendInfo
@@ -55,52 +68,166 @@
         audioRole: MediaPlayer.alert
     }
 
-    Column {
-        id: columnId
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        ListItem.SingleControl {
-            id: listId
-            control: Button {
-                text: i18n.tr("Stop playing")
-                width: parent.width - units.gu(4)
-                onClicked:
-                    soundEffect.stop()
-            }
+    function setRingtone(path) {
+        if (soundType == 0) {
+            soundSettings.incomingCallSound = path
+            backendInfo.incomingCallSound = path
+        } else if (soundType == 1) {
+            soundSettings.incomingMessageSound = path
+            backendInfo.incomingMessageSound = path
+        }
+        soundFileNames = refreshSoundFileNames()
+        soundEffect.source = path
+        soundEffect.play()
+    }
+
+    function updateSelectedIndex() {
+        if (soundType == 0)
+            soundSelector.selectedIndex =
+                    Utilities.indexSelectedFile(soundFileNames,
+                        backendInfo.incomingCallSound)
+        else if (soundType == 1)
+            soundSelector.selectedIndex =
+                    Utilities.indexSelectedFile(soundFileNames,
+                        backendInfo.incomingMessageSound)
+    }
+
+    Flickable {
+        id: scrollWidget
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: selectorColumn.height + stopItem.height
+        boundsBehavior: (contentHeight > height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+        /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
+           otherwise the UI might end up in a situation where scrolling doesn't work */
+        flickableDirection: Flickable.VerticalFlick
+
+        Column {
+            id: selectorColumn
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListItem.ItemSelector {
+                id: soundSelector
+                expanded: true
+                model: soundDisplayNames
+                selectedIndex: {
+                    updateSelectedIndex()
+                }
+                onDelegateClicked: {
+                    setRingtone(soundFileNames[index])
+                }
+            }
+
+            ListItem.Standard {
+                id: customRingtone
+                text: i18n.tr("Custom Ringtone")
+                visible: soundType === 0
+                progression: true
+                onClicked: {
+                    pageStack.push(picker);
+                }
+            }
+        }
+    }
+
+    ListItem.SingleControl {
+        id: stopItem
+        anchors.bottom: parent.bottom
+        control: AbstractButton {
+            id: stopButton
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+            focus: false
+            width: height
+            height: units.gu(4)
             enabled: soundEffect.playbackState == Audio.PlayingState
-            visible: showStopButton
-        }
-    }
-
-    ListItem.ItemSelector {
-        id: soundSelector
-        anchors.top: columnId.bottom
-        anchors.bottom: soundsPage.bottom
-        containerHeight: height
-
-        expanded: true
-        model: soundDisplayNames
-        selectedIndex: {
-            if (soundType == 0)
-                soundSelector.selectedIndex =
-                        Utilities.indexSelectedFile(soundFileNames,
-                            backendInfo.incomingCallSound)
-            else if (soundType == 1)
-                soundSelector.selectedIndex =
-                        Utilities.indexSelectedFile(soundFileNames,
-                            backendInfo.incomingMessageSound)
-        }
-        onDelegateClicked: {
-            if (soundType == 0) {
-                soundSettings.incomingCallSound = soundFileNames[index]
-                backendInfo.incomingCallSound = soundFileNames[index]
-            } else if (soundType == 1) {
-                soundSettings.incomingMessageSound = soundFileNames[index]
-                backendInfo.incomingMessageSound = soundFileNames[index]
-            }
-            soundEffect.source = soundFileNames[index]
-            soundEffect.play()
-        }
-    }
+            visible: enabled
+
+            onClicked: soundEffect.stop()
+
+            Rectangle {
+                anchors.fill: parent
+                radius: width * 0.5
+                border.color: UbuntuColors.warmGrey
+                border.width: 1
+            }
+
+            Rectangle {
+                width: parent.height * 0.4
+                height: width
+                smooth: true
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    horizontalCenter: parent.horizontalCenter
+                }
+                color: UbuntuColors.warmGrey
+            }
+        }
+        Rectangle {
+            anchors.fill: parent
+            z: parent.z - 1
+            visible: stopButton.visible
+            color: Theme.palette.normal.background
+        }
+    }
+
+    Connections {
+        id: contentHubConnection
+        property var ringtoneCallback
+        target: activeTransfer ? activeTransfer : null
+        onStateChanged: {
+            if (activeTransfer.state === ContentTransfer.Charged) {
+                if (activeTransfer.items.length > 0) {
+                    var toneUri = activeTransfer.items[0].url;
+                    ringtoneCallback(toneUri);
+                }
+            }
+        }
+    }
+
+    Page {
+        id: picker
+        visible: false
+
+        ContentStore {
+            id: appStore
+            scope: ContentScope.App
+        }
+
+        ContentPeerPicker {
+            id: peerPicker
+            visible: parent.visible
+            handler: ContentHandler.Source
+            contentType: ContentType.Music
+            showTitle: false
+
+            onPeerSelected: {
+                pageStack.pop();
+                // requests an active transfer from peer
+                function startContentTransfer(callback) {
+                    if (callback)
+                        contentHubConnection.ringtoneCallback = callback
+                    var transfer = peer.request(appStore);
+                    if (transfer !== null) {
+                        soundsPage.activeTransfer = transfer;
+                    }
+                }
+                peer.selectionType = ContentTransfer.Single;
+                startContentTransfer(function(uri) {
+                    setRingtone(uri.toString().replace("file:///", "/"));
+                });
+            }
+
+            onCancelPressed: pageStack.pop();
+        }
+    }
+
+    ContentTransferHint {
+        anchors.fill: parent
+        activeTransfer: soundsPage.activeTransfer
+    }
+
 }

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2015-01-28 11:37:35 +0000
+++ plugins/sound/sound.cpp	2015-11-20 13:12:56 +0000
@@ -21,6 +21,8 @@
 #include "sound.h"
 
 #include <QDir>
+#include <QFile>
+#include <QStandardPaths>
 #include <unistd.h>
 
 #define AS_INTERFACE "com.ubuntu.touch.AccountsService.Sound"
@@ -88,10 +90,16 @@
     if (sound == getIncomingCallSound())
         return;
 
+    QString prevSound = getIncomingCallSound();
+
     m_accountsService.setUserProperty(AS_INTERFACE,
                                       "IncomingCallSound",
                                       QVariant::fromValue(sound));
     Q_EMIT(incomingCallSoundChanged());
+
+    if (prevSound.startsWith(QString(QStandardPaths::writableLocation(QStandardPaths::DataLocation))) &&
+            prevSound != getIncomingMessageSound())
+        QFile(prevSound).remove();
 }
 
 QString Sound::getIncomingMessageSound()
@@ -105,10 +113,16 @@
     if (sound == getIncomingMessageSound())
         return;
 
+    QString prevSound = getIncomingMessageSound();
+
     m_accountsService.setUserProperty(AS_INTERFACE,
                                       "IncomingMessageSound",
                                       QVariant::fromValue(sound));
+
     Q_EMIT(incomingMessageSoundChanged());
+    if (prevSound.startsWith(QString(QStandardPaths::writableLocation(QStandardPaths::DataLocation))) &&
+            prevSound != getIncomingCallSound())
+        QFile(prevSound).remove();
 }
 
 bool Sound::getIncomingCallVibrate()
@@ -213,6 +227,11 @@
     Q_EMIT(dialpadSoundsEnabledChanged());
 }
 
+QString Sound::customRingtonePath()
+{
+    return QString(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/Music");
+}
+
 QStringList soundsListFromDir(const QString &dirString)
 {
     QDir soundsDir(dirString);

=== modified file 'plugins/sound/sound.h'
--- plugins/sound/sound.h	2015-01-28 11:37:35 +0000
+++ plugins/sound/sound.h	2015-11-20 13:12:56 +0000
@@ -67,6 +67,10 @@
                 WRITE setDialpadSoundsEnabled
                 NOTIFY dialpadSoundsEnabledChanged)
 
+    Q_PROPERTY (QString customRingtonePath
+                READ customRingtonePath
+                NOTIFY customRingtonePathChanged)
+
 
 public Q_SLOTS:
     void slotChanged(QString, QString);
@@ -81,6 +85,7 @@
     void incomingMessageVibrateSilentModeChanged();
     void otherVibrateChanged();
     void dialpadSoundsEnabledChanged();
+    void customRingtonePathChanged();
 
 private:
     AccountsService m_accountsService;
@@ -101,6 +106,7 @@
     void setOtherVibrate(bool enabled);
     bool getDialpadSoundsEnabled();
     void setDialpadSoundsEnabled(bool enabled);
+    QString customRingtonePath();
 
 };