Merge lp:~dano6/podbird/podbird into lp:podbird

[Daniel Kutka]

Do not turn off display during getting new episodes and add settings to adjust interval of autorefreshing podcasts

This MR should help with https://forums.ubports.com/topic/5138/podbird-freezing-on-start-for-about-1-minute
Getting new episodes with a lot of podcasts added it sometimes takes a minute or more. During that screen turns off, and it suspends the app. This MR should avoid suspending the app during getting new episodes.

[Michael Sheldon (michael-sheldon)]

Looks good, thanks!

review: Approve

[lp:~dano6/podbird/podbird]

215. By Michael Sheldon on 2021-01-27

Do not turn off display during getting new episodes and add settings to adjust interval of autorefreshing podcasts

=== modified file 'Podbird.apparmor'
--- Podbird.apparmor	2020-04-04 17:20:08 +0000
+++ Podbird.apparmor	2021-01-12 21:27:54 +0000
@@ -4,7 +4,8 @@
         "audio",
         "connectivity",
         "usermetrics",
-        "content_exchange"
+        "content_exchange",
+        "keep-display-on"
     ],
     "policy_version": 16.04
 }
 
=== modified file 'app/podbird.qml'
--- app/podbird.qml	2020-07-09 11:20:15 +0000
+++ app/podbird.qml	2021-01-12 21:27:54 +0000
@@ -24,6 +24,7 @@
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
 import Ubuntu.DownloadManager 1.2
+import QtSystemInfo 5.5
 import "ui"
 import "themes" as Themes
 import "podcasts.js" as Podcasts
@@ -42,6 +43,12 @@
     theme.name: settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
                                                  : "Ubuntu.Components.Themes.Ambiance"
 
+    property bool episodesUpdating: false;
+
+    ScreenSaver {
+        id: screenSaver
+        screenSaverEnabled: !episodesUpdating
+    }
 
     // RefreshModel function to call refreshModel() function of the tab currently
     // visible on application start.
@@ -51,6 +58,7 @@
         } else if (tabs.selectedTab === podcastTab) {
             podcastPage.item.refreshModel()
         }
+        episodesUpdating = false;
     }
 
     Component.onCompleted: {
@@ -58,7 +66,8 @@
 
         var today = new Date()
         // Only automatically check for podcasts on launch once every 12 hours
-        if (Math.floor((today - settings.lastUpdate)/86400000) >= 0.5) {
+        if (Math.floor((today - settings.lastUpdate)/86400000) >= settings.refreshEpisodes/24.0) {
+            episodesUpdating = true;
             Podcasts.updateEpisodes(refreshModels)
         }
         loadingIndicator.opacity = 0
@@ -116,6 +125,7 @@
         property bool showListView: true
         property int skipForward: 30
         property int skipBack: 10
+        property int refreshEpisodes: 12
         property bool continueWhereStopped: true
         property int playlistIndex: -1
         property bool downloadOverWifiOnly: true
 
=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2020-07-09 11:20:15 +0000
+++ app/ui/EpisodesPage.qml	2021-01-12 21:27:54 +0000
@@ -37,8 +37,6 @@
     property string tempGuid: "NULL"
     property string mode: "listened"
 
-    property bool episodesUpdating: false;
-
     Component.onCompleted: {
         loadEpisodes(episodeId, episodeArtist, episodeImage)
         if (downloader.downloadingGuid != "")
 
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2020-07-09 11:20:15 +0000
+++ app/ui/EpisodesTab.qml	2021-01-12 21:27:54 +0000
@@ -31,7 +31,6 @@
     property var today: new Date()
     property int dayToMs: 86400000
     property string tempGuid: "NULL"
-    property bool episodesUpdating: false
 
     TabsList {
         id: tabsList
 
=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-29 11:30:03 +0000
+++ app/ui/PodcastsTab.qml	2021-01-12 21:27:54 +0000
@@ -28,8 +28,6 @@
 Page {
     id: podcastPage
 
-    property bool episodesUpdating: false;
-
     TabsList {
         id: tabsList
     }
 
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2020-07-08 19:32:20 +0000
+++ app/ui/SettingsPage.qml	2021-01-12 21:27:54 +0000
@@ -126,6 +126,41 @@
             }
         }
 
+        Component {
+            id: refreshDialog
+            Dialog {
+                id: dialogInternal
+                // TRANSLATORS: This strings refers to refreshing podcasts. Users can set how often they
+                // want to check for new episodes.
+                title: i18n.tr("Refresh podcasts after")
+                Slider {
+                    id: slider
+                    width: parent.width
+                    minimumValue: 0
+                    maximumValue: 72
+                    value: podbird.settings.refreshEpisodes
+                    function formatValue(v) { return i18n.tr("%1 hours").arg(Math.round(v)) }
+                    StyleHints { foregroundColor: podbird.appTheme.focusText }
+                }
+
+                Button {
+                    text: i18n.tr("OK")
+                    color: podbird.appTheme.positiveActionButton
+                    onClicked: {
+                        podbird.settings.refreshEpisodes = Math.round(slider.value)
+                        PopupUtils.close(dialogInternal)
+                    }
+                }
+                Button {
+                    text: i18n.tr("Cancel")
+                    color: podbird.appTheme.neutralActionButton
+                    onClicked: {
+                        PopupUtils.close(dialogInternal)
+                    }
+                }
+            }
+        }
+
         Column {
             id: settingsColumn
 
@@ -198,6 +233,13 @@
                 title.text: i18n.tr("Podcast Episode Settings")
             }
 
+            SingleValueListItem {
+                divider.visible: false
+                title.text: i18n.tr("Refresh podcasts after")
+                value: i18n.tr("%1 hours").arg(podbird.settings.refreshEpisodes)
+                onClicked: PopupUtils.open(refreshDialog, settingsPage);
+            }
+
             ListItem {
                 ListItemLayout {
                     id: deleteLayout