mirror of
https://github.com/Michatec/Radio.git
synced 2026-11-16 08:11:38 +01:00
feat: implement station stream health checking
- Add `StationHealthChecker` to asynchronously test station stream availability, response codes, and latency. - Add long-click listener on the save button in `CollectionAdapter` to trigger health checks and display results via `Snackbar`. - Add localized string resources for stream health check status UI messages. - Update `provider_paths.xml` to include internal files and cache directory paths for FileProvider.
This commit is contained in:
1 parent
50cd0b99a7
commit
1a214d1683
13 files changed
+173
-3
No files matched your search
@@ -1,5 +1,7 @@
|
||||
package com.michatec.radio.collection
|
||||
|
||||
import android.R.id.content
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import android.text.Editable
|
||||
@@ -10,6 +12,7 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.view.inputmethod.EditorInfo
|
||||
import android.widget.TextView
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.net.toUri
|
||||
import androidx.core.view.isGone
|
||||
@@ -31,6 +34,7 @@ import com.michatec.radio.helpers.ImageHelper
|
||||
import com.michatec.radio.helpers.NetworkHelper
|
||||
import com.michatec.radio.helpers.PreferencesHelper
|
||||
import com.michatec.radio.helpers.ShortcutHelper
|
||||
import com.michatec.radio.extensions.java.StationHealthChecker
|
||||
import com.michatec.radio.helpers.UiHelper
|
||||
import com.michatec.radio.helpers.UpdateHelper
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
@@ -468,6 +472,23 @@ class CollectionAdapter(
|
||||
if (expandedStationPosition == stationViewHolder.bindingAdapterPosition) return@setOnClickListener
|
||||
collectionAdapterListener.onPlayButtonTapped(station.uuid)
|
||||
}
|
||||
binding.saveButton.setOnLongClickListener {
|
||||
if (reorderStationUuid.isNotEmpty()) return@setOnLongClickListener true
|
||||
val rootView = (context as? Activity)?.findViewById<View>(content) ?: binding.root
|
||||
Snackbar.make(rootView, context.getString(R.string.toastmessage_checking_stream_health, station.name), Snackbar.LENGTH_LONG).show()
|
||||
StationHealthChecker.checkStationHealth(station) { checkedStation, result ->
|
||||
(context as? Activity)?.runOnUiThread {
|
||||
val statusText = if (result.online()) {
|
||||
context.getString(R.string.health_status_online, result.responseCode(), result.latencyMs())
|
||||
} else {
|
||||
context.getString(R.string.health_status_offline, result.errorMessage() ?: "unknown error")
|
||||
}
|
||||
val msg = context.getString(R.string.toastmessage_health_result, checkedStation.name, statusText)
|
||||
Snackbar.make(rootView, msg, Snackbar.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
binding.playbackButton.setOnClickListener {
|
||||
collectionAdapterListener.onPlayButtonTapped(station.uuid)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
package com.michatec.radio.extensions.java;
|
||||
|
||||
import android.util.Log;
|
||||
import com.michatec.radio.Keys;
|
||||
import com.michatec.radio.core.Station;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* StationHealthChecker.class
|
||||
*/
|
||||
public class StationHealthChecker {
|
||||
|
||||
private static final String TAG = StationHealthChecker.class.getSimpleName();
|
||||
private static final ExecutorService executorService = Executors.newCachedThreadPool();
|
||||
|
||||
public record HealthResult(boolean online, int responseCode, long latencyMs, String contentType,
|
||||
String errorMessage) {
|
||||
}
|
||||
|
||||
public interface OnStationHealthCheckedListener {
|
||||
void onHealthChecked(Station station, HealthResult result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks the health of a station asynchronously using an ExecutorService.
|
||||
*/
|
||||
public static void checkStationHealth(final Station station, final OnStationHealthCheckedListener listener) {
|
||||
if (station == null || station.getStreamUri().isEmpty()) {
|
||||
if (listener != null) {
|
||||
listener.onHealthChecked(station, new HealthResult(false, -1, 0, "", "Invalid stream URI"));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
executorService.execute(() -> {
|
||||
long startTime = System.currentTimeMillis();
|
||||
boolean online;
|
||||
int responseCode;
|
||||
String contentType = Keys.MIME_TYPE_UNSUPPORTED;
|
||||
String errorMessage = null;
|
||||
|
||||
HttpURLConnection connection = null;
|
||||
try {
|
||||
URL url = new URL(station.getStreamUri());
|
||||
connection = (HttpURLConnection) url.openConnection();
|
||||
connection.setRequestProperty("User-Agent", Keys.INSTANCE.getUSER_AGENT());
|
||||
connection.setConnectTimeout(5000);
|
||||
connection.setReadTimeout(5000);
|
||||
connection.setRequestMethod("GET");
|
||||
|
||||
responseCode = connection.getResponseCode();
|
||||
long latency = System.currentTimeMillis() - startTime;
|
||||
|
||||
if (responseCode >= 200 && responseCode < 400) {
|
||||
online = true;
|
||||
String rawContentType = connection.getContentType();
|
||||
if (rawContentType != null && !rawContentType.isEmpty()) {
|
||||
contentType = rawContentType.split(";")[0].trim();
|
||||
}
|
||||
} else {
|
||||
online = false;
|
||||
errorMessage = "HTTP Error: " + responseCode;
|
||||
}
|
||||
|
||||
final HealthResult result = new HealthResult(online, responseCode, latency, contentType, errorMessage);
|
||||
if (listener != null) {
|
||||
listener.onHealthChecked(station, result);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
long latency = System.currentTimeMillis() - startTime;
|
||||
Log.e(TAG, "Error checking station health: " + e.getMessage(), e);
|
||||
final HealthResult result = new HealthResult(false, -1, latency, Keys.MIME_TYPE_UNSUPPORTED, e.getMessage());
|
||||
if (listener != null) {
|
||||
listener.onHealthChecked(station, result);
|
||||
}
|
||||
} finally {
|
||||
if (connection != null) {
|
||||
connection.disconnect();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -251,4 +251,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Deaktiver baggrundsoptimeringer</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Baggrundsoptimeringer aktiveret!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Baggrundsoptimeringer deaktiveret.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Tjekker stream-tilstand for %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Tilstand [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -253,4 +253,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Hintergrund-Optimierungen deaktivieren</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Hintergrund-Optimierungen aktiviert!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Hintergrund-Optimierungen deaktiviert.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Überprüfe Stream-Status für %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Status [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -254,4 +254,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Απενεργοποίηση βελτιστοποιήσεων παρασκηνίου</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Οι βελτιστοποιήσεις παρασκηνίου ενεργοποιήθηκαν!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Οι βελτιστοποιήσεις παρασκηνίου απενεργοποιήθηκαν.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Έλεγχος κατάστασης ροής για %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Κατάσταση [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -252,4 +252,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Désactiver les optimisations en arrière-plan</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Optimisations en arrière-plan activées !</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Optimisations en arrière-plan désactivées.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Vérification de l\'état du flux pour %1$s…</string>
|
||||
<string name="health_status_online">En ligne (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Hors ligne (%1$s)</string>
|
||||
<string name="toastmessage_health_result">État [%1$s] : %2$s</string>
|
||||
</resources>
|
||||
@@ -252,4 +252,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">バックグラウンド最適化を無効化</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">バックグラウンド最適化が有効になりました!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">バックグラウンド最適化が無効になりました。</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">%1$s のストリーム状態を確認中…</string>
|
||||
<string name="health_status_online">オンライン (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">オフライン (%1$s)</string>
|
||||
<string name="toastmessage_health_result">状態 [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -253,4 +253,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Achtergrondoptimalisaties uitschakelen</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Achtergrondoptimalisaties ingeschakeld!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Achtergrondoptimalisaties uitgeschakeld.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Streamstatus controleren voor %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Status [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -252,4 +252,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Wyłącz optymalizacje w tle</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Włączono optymalizacje w tle!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Wyłączono optymalizacje w tle.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Sprawdzanie stanu strumienia dla %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Stan [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -251,4 +251,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Отключить фоновые оптимизации</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Фоновые оптимизации включены!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Фоновые оптимизации отключены.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Проверка состояния потока для %1$s…</string>
|
||||
<string name="health_status_online">Онлайн (%1$d) - %2$dмс</string>
|
||||
<string name="health_status_offline">Офлайн (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Статус [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -251,4 +251,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Вимкнути фонові оптимізації</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Фонові оптимізації увімкнено!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Фонові оптимізації вимкнено.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Перевірка стану потоку для %1$s…</string>
|
||||
<string name="health_status_online">Онлайн (%1$d) - %2$dмс</string>
|
||||
<string name="health_status_offline">Офлайн (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Статус [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -287,4 +287,10 @@
|
||||
<string name="shizuku_disable_optimizations_btn">Disable Background Optimizations</string>
|
||||
<string name="shizuku_optimizations_enabled_toast">Background optimizations enabled!</string>
|
||||
<string name="shizuku_optimizations_disabled_toast">Background optimizations disabled.</string>
|
||||
|
||||
<!-- Station Health -->
|
||||
<string name="toastmessage_checking_stream_health">Checking stream health for %1$s…</string>
|
||||
<string name="health_status_online">Online (%1$d) - %2$dms</string>
|
||||
<string name="health_status_offline">Offline (%1$s)</string>
|
||||
<string name="toastmessage_health_result">Health [%1$s]: %2$s</string>
|
||||
</resources>
|
||||
@@ -1,9 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths>
|
||||
<external-files-path
|
||||
name="my_images"
|
||||
path="Android/data/com.michatec.radio/files/Pictures" />
|
||||
<external-path
|
||||
name="external_files"
|
||||
path="." />
|
||||
<files-path
|
||||
name="internal_files"
|
||||
path="." />
|
||||
<cache-path
|
||||
name="cache_files"
|
||||
path="." />
|
||||
</paths>
|
||||
Reference in new issue
Block a user