Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

Say when a download is waiting for Wi-Fi

Lelonioce02a1d1abba
diff --git a/app/src/main/java/dev/lelonio/square/download/DownloadQueue.kt b/app/src/main/java/dev/lelonio/square/download/DownloadQueue.kt
index d0a9f81..f21fa7c 100644
--- a/app/src/main/java/dev/lelonio/square/download/DownloadQueue.kt
+++ b/app/src/main/java/dev/lelonio/square/download/DownloadQueue.kt
@@ -687,6 +687,14 @@ class DownloadQueue(
}
}
+ /**
+ * Whether a download asked for now would wait for Wi‑Fi rather than start.
+ *
+ * Read off the connection as it is, not the watched one: the watch runs
+ * only while the queue does, and this is asked before it starts.
+ */
+ fun waitsForWifi(): Boolean = settings.wifiOnly.value && link() == Link.METERED
+
/** Null when downloading may go ahead, otherwise what it is waiting for. */
private fun allowed(): Waiting? {
if (dev.lelonio.square.playback.OfflineMode.active.value) return Waiting.NETWORK
diff --git a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
index 5d38933..e251a8f 100644
--- a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
@@ -3757,6 +3757,34 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
.map { it[DownloadStore.SINGLES].orEmpty().toSet() }
.stateIn(viewModelScope, SharingStarted.Eagerly, emptySet())
+ /**
+ * Starts the downloads the listener just asked for, and says so when they
+ * are going to wait.
+ *
+ * On mobile data with "Download over Wi‑Fi only" on, which it is unless
+ * changed, a download waits for Wi‑Fi, and the only place that said so was
+ * the download notification. With notifications off, nothing happened and
+ * nothing explained why, which reads as downloading being broken. Only for
+ * what was asked for here: the queue following a kept playlist on its own
+ * has nobody to tell.
+ */
+ private fun startRequestedDownloads() {
+ val app = getApplication<android.app.Application>()
+ if (container.downloadQueue.waitsForWifi()) {
+ android.widget.Toast.makeText(
+ app,
+ app.getString(
+ dev.lelonio.square.R.string.download_waiting_wifi_hint,
+ app.getString(dev.lelonio.square.R.string.settings),
+ app.getString(dev.lelonio.square.R.string.page_downloads),
+ app.getString(dev.lelonio.square.R.string.download_wifi_only),
+ ),
+ android.widget.Toast.LENGTH_LONG,
+ ).show()
+ }
+ DownloadService.start(app)
+ }
+
/**
* Keeps a whole page on the phone, or stops keeping it.
*
@@ -3799,7 +3827,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
},
),
)
- DownloadService.start(getApplication())
+ startRequestedDownloads()
}
}
}
@@ -3882,7 +3910,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
sweepOrphans()
} else {
container.downloads.addSingle(track)
- DownloadService.start(getApplication())
+ startRequestedDownloads()
}
}
}
@@ -3928,7 +3956,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
fun retryFailedDownloads() {
viewModelScope.launch {
container.downloads.retryFailed()
- DownloadService.start(getApplication())
+ startRequestedDownloads()
}
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 38f5f77..b5a5bdf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -423,6 +423,7 @@
<string name="download_progress_count">%1$d von %2$d</string>
<string name="download_partial">%1$d von %2$d verfügbar</string>
<string name="download_waiting_wifi">Wartet auf WLAN</string>
+ <string name="download_waiting_wifi_hint">Die Downloads starten im WLAN. Um auch mobile Daten zu nutzen, deaktiviere „%3$s“ unter %1$s → %2$s.</string>
<string name="download_waiting_network">Wartet auf eine Verbindung</string>
<string name="download_waiting_engine">Wartet auf Spotify</string>
<string name="download_extras">Cover und Songtexte werden ergänzt</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cdadc18..d4615d6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -423,6 +423,7 @@
<string name="download_progress_count">%1$d de %2$d</string>
<string name="download_partial">%1$d de %2$d disponibles</string>
<string name="download_waiting_wifi">Esperando al Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">Las descargas empezarán con Wi‑Fi. Para usar también datos móviles, desactiva «%3$s» en %1$s → %2$s.</string>
<string name="download_waiting_network">Esperando una conexión</string>
<string name="download_waiting_engine">Esperando a Spotify</string>
<string name="download_extras">Completando portadas y letras</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 90984ed..8250f32 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -423,6 +423,7 @@
<string name="download_progress_count">%1$d sur %2$d</string>
<string name="download_partial">%1$d sur %2$d disponibles</string>
<string name="download_waiting_wifi">En attente du Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">Les téléchargements démarreront en Wi‑Fi. Pour utiliser aussi les données mobiles, désactivez « %3$s » dans %1$s → %2$s.</string>
<string name="download_waiting_network">En attente d\'une connexion</string>
<string name="download_waiting_engine">En attente de Spotify</string>
<string name="download_extras">Finalisation des pochettes et paroles</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index bf366e9..e01b560 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -438,6 +438,7 @@
<string name="download_progress_count">%2$d में से %1$d</string>
<string name="download_partial">%2$d में से %1$d उपलब्ध</string>
<string name="download_waiting_wifi">Wi‑Fi का इंतज़ार</string>
+ <string name="download_waiting_wifi_hint">डाउनलोड Wi‑Fi पर शुरू होंगे। मोबाइल डेटा पर भी डाउनलोड करने के लिए %1$s → %2$s में “%3$s” बंद करें।</string>
<string name="download_waiting_network">कनेक्शन का इंतज़ार</string>
<string name="download_waiting_engine">Spotify का इंतज़ार</string>
<string name="download_extras">कवर और बोल पूरे किए जा रहे हैं</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 908cf9f..388a312 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -424,6 +424,7 @@
<string name="download_progress_count">%1$d di %2$d</string>
<string name="download_partial">%1$d di %2$d disponibili</string>
<string name="download_waiting_wifi">In attesa del Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">I download partiranno sul Wi‑Fi. Per usare anche i dati mobili, disattiva “%3$s” in %1$s → %2$s.</string>
<string name="download_waiting_network">In attesa di una connessione</string>
<string name="download_waiting_engine">In attesa di Spotify</string>
<string name="download_extras">Completamento di copertine e testi</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ccab503..786583c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -439,6 +439,7 @@
<string name="download_progress_count">%1$d / %2$d</string>
<string name="download_partial">%1$d / %2$d曲を利用可能</string>
<string name="download_waiting_wifi">Wi‑Fi接続待ち</string>
+ <string name="download_waiting_wifi_hint">ダウンロードはWi‑Fi接続時に始まります。モバイルデータでもダウンロードするには、%1$s → %2$s で「%3$s」をオフにしてください。</string>
<string name="download_waiting_network">ネットワーク接続待ち</string>
<string name="download_waiting_engine">Spotify待ち</string>
<string name="download_extras">カバー画像と歌詞を取得中</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 784e896..d3e70eb 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -412,6 +412,7 @@
<string name="download_progress_count">%2$d개 중 %1$d개</string>
<string name="download_partial">%2$d개 중 %1$d개 사용 가능</string>
<string name="download_waiting_wifi">Wi‑Fi 대기 중</string>
+ <string name="download_waiting_wifi_hint">다운로드는 Wi‑Fi에서 시작됩니다. 모바일 데이터로도 받으려면 %1$s → %2$s에서 “%3$s”을(를) 끄세요.</string>
<string name="download_waiting_network">연결 대기 중</string>
<string name="download_waiting_engine">Spotify 대기 중</string>
<string name="download_extras">커버와 가사 마무리 중</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1636d87..ba8dfab 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -423,6 +423,7 @@
<string name="download_progress_count">%1$d de %2$d</string>
<string name="download_partial">%1$d de %2$d disponíveis</string>
<string name="download_waiting_wifi">Aguardando o Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">Os downloads vão começar no Wi‑Fi. Para usar também os dados móveis, desative “%3$s” em %1$s → %2$s.</string>
<string name="download_waiting_network">Aguardando uma conexão</string>
<string name="download_waiting_engine">Aguardando o Spotify</string>
<string name="download_extras">A concluir capas e letras</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8b8ee8e..53b73b7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -440,6 +440,7 @@
<string name="download_progress_count">%1$d из %2$d</string>
<string name="download_partial">Доступно %1$d из %2$d</string>
<string name="download_waiting_wifi">Ожидание Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">Загрузки начнутся по Wi‑Fi. Чтобы использовать и мобильный интернет, выключите «%3$s» в разделе %1$s → %2$s.</string>
<string name="download_waiting_network">Ожидание соединения</string>
<string name="download_waiting_engine">Ожидание Spotify</string>
<string name="download_extras">Дозагрузка обложек и текстов</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5de2cef..37bee26 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -438,6 +438,7 @@
<string name="download_progress_count">%2$d içinden %1$d</string>
<string name="download_partial">%2$d içinden %1$d mevcut</string>
<string name="download_waiting_wifi">Wi‑Fi bekleniyor</string>
+ <string name="download_waiting_wifi_hint">İndirmeler Wi‑Fi\'da başlayacak. Mobil veriyi de kullanmak için %1$s → %2$s içinde “%3$s” seçeneğini kapatın.</string>
<string name="download_waiting_network">Bağlantı bekleniyor</string>
<string name="download_waiting_engine">Spotify bekleniyor</string>
<string name="download_extras">Kapaklar ve sözler tamamlanıyor</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 648b3cb..b2386a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -444,6 +444,7 @@
<string name="download_progress_count">%1$d of %2$d</string>
<string name="download_partial">%1$d of %2$d available</string>
<string name="download_waiting_wifi">Waiting for Wi‑Fi</string>
+ <string name="download_waiting_wifi_hint">Downloads will start on Wi‑Fi. To use mobile data too, turn off “%3$s” in %1$s → %2$s.</string>
<string name="download_waiting_network">Waiting for a connection</string>
<string name="download_waiting_engine">Waiting for Spotify</string>
<string name="download_extras">Finishing covers and lyrics</string>