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

[Ken VanDine]

Don't delete previous custom ringtones unless a new custom ringtone is selected. Set header titled in the picker.

Don't delete previous custom ringtones unless a new custom ringtone is selected. Set header titled in the picker.

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

1568. By Ken VanDine on 2015-12-02

Don't play more than 30 seconds of the ringtone preview

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1567
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2538/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/722
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25735

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1568
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2539/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/723
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5574
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5574/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25742

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Testing this, I got three, long UI freezes when trying to go back from SoundsList.qml. I wonder if the timer is to blame? There's nothing immediately relevant in the logs.

review: Needs Fixing

[Ken VanDine (ken-vandine)]

> Testing this, I got three, long UI freezes when trying to go back from
> SoundsList.qml. I wonder if the timer is to blame? There's nothing immediately
> relevant in the logs.

Was the preview playing when you went back?

[Jonas G. Drange (jonas-drange)]

On 3 December 2015 at 21:33, Ken VanDine <email address hidden> wrote:

>
> Was the preview playing when you went back?

​Not that I can recall.​

[Jonas G. Drange (jonas-drange)]

LGTM!

review: Approve

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2015-11-20 13:12:27 +0000
+++ plugins/sound/SoundsList.qml	2015-12-02 20:51:07 +0000
@@ -77,6 +77,7 @@
             backendInfo.incomingMessageSound = path
         }
         soundFileNames = refreshSoundFileNames()
+        previewTimer.start()
         soundEffect.source = path
         soundEffect.play()
     }
@@ -174,6 +175,12 @@
         }
     }
 
+    Timer {
+        id: previewTimer
+        onTriggered: soundEffect.stop()
+        interval: 30000
+    }
+
     Connections {
         id: contentHubConnection
         property var ringtoneCallback
@@ -181,7 +188,13 @@
         onStateChanged: {
             if (activeTransfer.state === ContentTransfer.Charged) {
                 if (activeTransfer.items.length > 0) {
-                    var toneUri = activeTransfer.items[0].url;
+                    var item = activeTransfer.items[0];
+                    var toneUri;
+                    if (item.move(backendInfo.customRingtonePath)) {
+                        toneUri = item.url;
+                    } else {
+                        toneUri = backendInfo.customRingtonePath + "/" + item.url.toString().split("/").splice(-1,1);
+                    }
                     ringtoneCallback(toneUri);
                 }
             }
@@ -191,11 +204,7 @@
     Page {
         id: picker
         visible: false
-
-        ContentStore {
-            id: appStore
-            scope: ContentScope.App
-        }
+        title: i18n.tr("Choose from")
 
         ContentPeerPicker {
             id: peerPicker
@@ -210,7 +219,7 @@
                 function startContentTransfer(callback) {
                     if (callback)
                         contentHubConnection.ringtoneCallback = callback
-                    var transfer = peer.request(appStore);
+                    var transfer = peer.request();
                     if (transfer !== null) {
                         soundsPage.activeTransfer = transfer;
                     }

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2015-11-16 16:09:02 +0000
+++ plugins/sound/sound.cpp	2015-12-02 20:51:07 +0000
@@ -97,9 +97,15 @@
                                       QVariant::fromValue(sound));
     Q_EMIT(incomingCallSoundChanged());
 
-    if (prevSound.startsWith(QString(QStandardPaths::writableLocation(QStandardPaths::DataLocation))) &&
-            prevSound != getIncomingMessageSound())
-        QFile(prevSound).remove();
+    if (sound.startsWith(customRingtonePath())) {
+        QDir dir(customRingtonePath());
+        QFileInfoList files(dir.entryInfoList(QDir::Files));
+        Q_FOREACH(QFileInfo f, files) {
+            if (f.absoluteFilePath() != sound)
+                QFile(f.absoluteFilePath()).remove();
+        }
+    }
+
 }
 
 QString Sound::getIncomingMessageSound()
@@ -120,9 +126,6 @@
                                       QVariant::fromValue(sound));
 
     Q_EMIT(incomingMessageSoundChanged());
-    if (prevSound.startsWith(QString(QStandardPaths::writableLocation(QStandardPaths::DataLocation))) &&
-            prevSound != getIncomingCallSound())
-        QFile(prevSound).remove();
 }
 
 bool Sound::getIncomingCallVibrate()