From 8fa73ff6f9be0d3e8d1d4c3e20ea7ca92336d719 Mon Sep 17 00:00:00 2001 From: Michatec Date: Wed, 29 Jul 2026 19:45:08 +0200 Subject: [PATCH] feat: add web remote control with translations - Implement embedded Ktor remote control server (port 8080) - Add REST API endpoints for play/pause/next/prev/status - Add web UI with localization support - Add remote control preference toggle and settings integration - Translate remote control strings to all supported languages --- README.md | 1 + SECURITY.md | 6 +- app/build.gradle.kts | 15 + app/src/main/assets/web/favicon.png | Bin 0 -> 4685 bytes app/src/main/assets/web/index.html | 169 +++++++++ app/src/main/assets/web/script.js | 280 +++++++++++++++ app/src/main/assets/web/style.css | 340 ++++++++++++++++++ app/src/main/assets/web/translations.json | 202 +++++++++++ app/src/main/java/com/michatec/radio/Keys.kt | 2 + .../java/com/michatec/radio/MainActivity.kt | 35 ++ .../java/com/michatec/radio/PlayerService.kt | 55 +++ .../com/michatec/radio/SettingsFragment.kt | 44 ++- .../michatec/radio/helpers/NetworkHelper.kt | 15 + .../radio/helpers/PreferencesHelper.kt | 12 + .../radio/helpers/RemoteControlServer.kt | 274 ++++++++++++++ app/src/main/res/values-da/strings.xml | 6 + app/src/main/res/values-de/strings.xml | 6 + app/src/main/res/values-el/strings.xml | 6 + app/src/main/res/values-fr/strings.xml | 6 + app/src/main/res/values-ja/strings.xml | 8 +- app/src/main/res/values-nl/strings.xml | 6 + app/src/main/res/values-pl/strings.xml | 5 + app/src/main/res/values-ru/strings.xml | 6 + app/src/main/res/values-uk/strings.xml | 6 + app/src/main/res/values/strings.xml | 6 + gradle/libs.versions.toml | 8 + 26 files changed, 1511 insertions(+), 8 deletions(-) create mode 100644 app/src/main/assets/web/favicon.png create mode 100644 app/src/main/assets/web/index.html create mode 100644 app/src/main/assets/web/script.js create mode 100644 app/src/main/assets/web/style.css create mode 100644 app/src/main/assets/web/translations.json create mode 100644 app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt diff --git a/README.md b/README.md index 832f9aa..c1858e1 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ **Radio is an application with a minimalist approach to listening to radio over the Internet.**
**Radio only offers a very basic search option, and it imports audio streaming links when you tap them in a web browser.**
**Radio now also supports Android TV and Cast to Devices (Beta) with the Version 14.5 and above.**
+**New Feature Update: Web Control with API for devs.**
**Pull request are welcome at any time.**
**Radio is free software. It is released under the [GPLv3 open source license](https://opensource.org/licenses/GPL-3.0).** diff --git a/SECURITY.md b/SECURITY.md index 71b80b8..54e95ca 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -18,9 +18,9 @@ We appreciate responsible disclosure and will credit researchers who report vali ## Supported Versions | Version | Supported | -| ------- | ------------------ | -| > 14.5 | :white_check_mark: | -| < 14.5 | :x: | +|---------| ------------------ | +| > 15 | :white_check_mark: | +| < 15 | :x: | Only the latest stable release receives security updates. Users on older versions are encouraged to update. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2f31802..79332dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.serialization) id("kotlin-parcelize") } @@ -52,6 +53,13 @@ android { version = "3.22.1" } } + + packaging { + resources { + excludes += "/META-INF/INDEX.LIST" + excludes += "/META-INF/io.netty.versions.properties" + } + } } dependencies { @@ -78,6 +86,13 @@ dependencies { implementation(libs.freedroidwarn) + // Ktor // + implementation(libs.ktor.server.core) + implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.ktor.serialization.gson) + // Volley HTTP request // implementation(libs.volley) implementation(libs.material3) diff --git a/app/src/main/assets/web/favicon.png b/app/src/main/assets/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..ade7dcd3cb3b1b794f5cb1198ba4120586d25bed GIT binary patch literal 4685 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 literal 0 HcmV?d00001 diff --git a/app/src/main/assets/web/index.html b/app/src/main/assets/web/index.html new file mode 100644 index 0000000..a71c476 --- /dev/null +++ b/app/src/main/assets/web/index.html @@ -0,0 +1,169 @@ + + + + + Radio Remote + + + + + + +
+
+

Radio Remote

+ +
+ +
+
+
+
+
Loading...
+ +
+ Station +
+
Loading...
+
+ + + +
+
+ +
+

Station Collection

+
+
+
+ +
+
+
+ +

API Documentation

+
+
+

The Radio app provides a REST API to control playback and query information.

+ +

API Reference

+ +
+

GET /api/status

+

Returns current playback status.

+
Response Example:
+
+{
+  "isPlaying": true,
+  "currentStationUuid": "fc080549-...",
+  "metadata": "Artist - Title"
+}                   
+
+ +
+

GET /api/stations

+

Returns all stations in collection.

+
Response Example:
+
+[
+  {
+    "uuid": "fc080549-...",
+    "name": "Station Name",
+    "hasImage": true
+  }
+]                   
+
+ +
+

GET /api/image/{uuid}

+

Returns the image for a specific station.

+
Response: Image (binary data, JPEG)
+
+ +
+

GET /api/config

+

Returns the app version.

+
Response Example:
+
{ "version": "15.1" }
+
+ +
+

POST /api/play/{uuid}

+

Starts playback of a specific station.

+
Response Example:
+
{ "status": "ok" }
+
+ +
+

POST /api/pause

+

Pauses current playback.

+
Response Example:
+
{ "status": "ok" }
+
+ +
+

POST /api/resume

+

Resumes current playback.

+
Response Example:
+
{ "status": "ok" }
+
+ +
+

POST /api/next

+

Plays the next station.

+
Response Example:
+
{ "status": "ok" }
+
+ +
+

POST /api/prev

+

Plays the previous station.

+
Response Example:
+
{ "status": "ok" }
+
+
+
+
+ + +
+ + + diff --git a/app/src/main/assets/web/script.js b/app/src/main/assets/web/script.js new file mode 100644 index 0000000..3557f5a --- /dev/null +++ b/app/src/main/assets/web/script.js @@ -0,0 +1,280 @@ +let currentLang = 'en'; +let translations = {}; +let allStations = []; +let isUpdating = false; +const STATE_IDLE = 1; +const STATE_BUFFERING = 2; +const STATE_READY = 3; +const STATE_ENDED = 4; + +function t(key) { + return (translations[currentLang] && translations[currentLang][key]) || + (translations['en'] && translations['en'][key]) || key; +} + +function updateUILanguage() { + document.querySelectorAll('[data-t]').forEach(el => { + const key = el.getAttribute('data-t'); + const text = t(key); + if (el.tagName === 'INPUT' && el.placeholder) { + el.placeholder = text; + } else { + el.innerText = text; + } + }); +} + +async function loadTranslations() { + try { + const res = await fetch('/translations.json'); + translations = await res.json(); + updateUILanguage(); + } catch (e) { + console.error("Failed to load translations", e); + } +} + +async function updateStatus() { + if (isUpdating) return; + const statusEl = document.getElementById('status'); + const playPauseIcon = document.getElementById('playPauseIcon'); + const currentNameEl = document.getElementById('currentName'); + const currentMetadataEl = document.getElementById('currentMetadata'); + const currentImageEl = document.getElementById('currentImage'); + + try { + const response = await fetch('/api/status'); + if (!response.ok) return; + + const data = await response.json(); + if (data.error) { + statusEl.innerText = t('status_error') + ': ' + data.error; + } else { + let statusText = data.isPlaying ? t('status_playing') : t('status_paused'); + if (data.playbackState === STATE_BUFFERING) { + statusText = "Buffering..."; + } + statusEl.innerText = statusText; + playPauseIcon.innerText = data.isPlaying ? 'pause' : 'play_arrow'; + + const stationUuid = data.currentStationUuid; + updateActiveStation(stationUuid); + + const station = allStations.find(s => s.uuid === stationUuid); + if (station) { + currentNameEl.innerText = station.name; + currentMetadataEl.innerText = data.metadata || ""; + currentImageEl.src = station.hasImage ? '/api/image/' + station.uuid : 'favicon.png'; + } else { + currentNameEl.innerText = data.isPlaying ? 'Unknown Station' : 'No Station Selected'; + currentMetadataEl.innerText = ""; + currentImageEl.src = 'favicon.png'; + } + + if (themeSelect.value === 'auto_browser') { + applyThemeUI(getBrowserTheme()); + } + + if (langSelect.value === 'auto_browser') { + const browserLang = navigator.language.split('-')[0]; + const targetLang = translations[browserLang] ? browserLang : 'en'; + if (targetLang !== currentLang) { + currentLang = targetLang; + updateUILanguage(); + } + } + } + } catch (e) { + console.error("Status fetch failed", e); + } +} + +async function loadStations() { + const list = document.getElementById('stationList'); + try { + const response = await fetch('/api/stations'); + if (!response.ok) return; + allStations = await response.json(); + list.innerHTML = ''; + if (allStations.length === 0) { + list.innerText = t('stations_empty'); + return; + } + allStations.forEach(station => { + const div = document.createElement('div'); + div.className = 'station-item'; + div.id = 'station-' + station.uuid; + + const img = document.createElement('img'); + img.className = 'station-img'; + if (station.hasImage) { + img.src = '/api/image/' + station.uuid; + } else { + img.src = 'favicon.png'; + } + div.appendChild(img); + + const name = document.createElement('div'); + name.className = 'station-name'; + name.innerText = station.name || 'Unnamed Station'; + div.appendChild(name); + + div.onclick = () => playStation(station.uuid); + list.appendChild(div); + }); + updateStatus(); + } catch (e) { + console.error("Load stations failed", e); + } +} + +function updateActiveStation(uuid) { + document.querySelectorAll('.station-item').forEach(el => el.classList.remove('active')); + if (!uuid) return; + const active = document.getElementById('station-' + uuid); + if (active) active.classList.add('active'); +} + +async function playStation(uuid) { + updateActiveStation(uuid); + document.getElementById('status').innerText = "Starting..."; + document.getElementById('playPauseIcon').innerText = 'pause'; + + const station = allStations.find(s => s.uuid === uuid); + if (station) { + document.getElementById('currentName').innerText = station.name; + document.getElementById('currentMetadata').innerText = ""; + document.getElementById('currentImage').src = station.hasImage ? '/api/image/' + station.uuid : 'favicon.png'; + } + + try { + await fetch('/api/play/' + uuid, { method: 'POST' }); + setTimeout(updateStatus, 300); + } catch (e) { console.error(e); } +} + +document.getElementById('playPauseBtn').onclick = async () => { + const icon = document.getElementById('playPauseIcon'); + const isPlaying = icon.innerText === 'pause'; + + icon.innerText = isPlaying ? 'play_arrow' : 'pause'; + document.getElementById('status').innerText = isPlaying ? t('status_paused') : t('status_playing'); + + try { + if (isPlaying) { + await fetch('/api/pause', { method: 'POST' }); + } else { + await fetch('/api/resume', { method: 'POST' }); + } + setTimeout(updateStatus, 300); + } catch (e) { console.error(e); } +}; + +document.getElementById('prevBtn').onclick = () => { + fetch('/api/prev', { method: 'POST' }).then(() => setTimeout(updateStatus, 300)); +}; +document.getElementById('nextBtn').onclick = () => { + fetch('/api/next', { method: 'POST' }).then(() => setTimeout(updateStatus, 300)); +}; + +function applyThemeUI(theme) { + document.body.className = theme + '-theme'; +} + +function getBrowserTheme() { + return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; +} + +window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', e => { + if (themeSelect.value === 'auto_browser') { + applyThemeUI(e.matches ? 'dark' : 'light'); + } +}); + +const themeSelect = document.getElementById('themeSelect'); +themeSelect.onchange = () => { + const val = themeSelect.value; + localStorage.setItem('radio-remote-theme', val); + if (val === 'auto_browser') { + applyThemeUI(getBrowserTheme()); + } else { + applyThemeUI(val); + } + updateStatus(); +}; + +const langSelect = document.getElementById('langSelect'); +langSelect.onchange = () => { + const val = langSelect.value; + localStorage.setItem('radio-remote-lang', val); + if (val === 'auto_browser') { + const browserLang = navigator.language.split('-')[0]; + currentLang = translations[browserLang] ? browserLang : 'en'; + } else { + currentLang = val; + } + updateUILanguage(); + updateStatus(); +}; + +const menuBtn = document.getElementById('menuBtn'); +const closeMenuBtn = document.getElementById('closeMenuBtn'); +const settingsPanel = document.getElementById('settingsPanel'); +const showApiDocsBtn = document.getElementById('showApiDocsBtn'); +const backToDashboard = document.getElementById('backToDashboard'); +const mainDashboard = document.getElementById('mainDashboard'); +const apiDocsView = document.getElementById('apiDocsView'); + +function toggleMenu(e) { + if (e) e.stopPropagation(); + settingsPanel.classList.toggle('hidden'); +} + +menuBtn.onclick = toggleMenu; +closeMenuBtn.onclick = () => settingsPanel.classList.add('hidden'); + +showApiDocsBtn.onclick = () => { + mainDashboard.classList.add('hidden'); + apiDocsView.classList.remove('hidden'); + settingsPanel.classList.add('hidden'); +}; + +backToDashboard.onclick = () => { + apiDocsView.classList.add('hidden'); + mainDashboard.classList.remove('hidden'); +}; + +document.addEventListener('click', (e) => { + if (!settingsPanel.classList.contains('hidden') && + !settingsPanel.contains(e.target) && + !menuBtn.contains(e.target)) { + settingsPanel.classList.add('hidden'); + } +}); + +async function init() { + await loadTranslations(); + + const savedTheme = localStorage.getItem('radio-remote-theme') || 'auto_browser'; + themeSelect.value = savedTheme; + if (savedTheme === 'auto_browser') { + applyThemeUI(getBrowserTheme()); + } else { + applyThemeUI(savedTheme); + } + + const savedLang = localStorage.getItem('radio-remote-lang') || 'auto_browser'; + langSelect.value = savedLang; + if (savedLang === 'auto_browser') { + const browserLang = navigator.language.split('-')[0]; + currentLang = translations[browserLang] ? browserLang : 'en'; + } else { + currentLang = savedLang; + } + + updateUILanguage(); + await loadStations(); + setInterval(updateStatus, 1000); +} + +init(); diff --git a/app/src/main/assets/web/style.css b/app/src/main/assets/web/style.css new file mode 100644 index 0000000..af1a7ec --- /dev/null +++ b/app/src/main/assets/web/style.css @@ -0,0 +1,340 @@ +:root { + --bg-color: #000000; + --card-bg: rgba(25, 25, 25, 0.6); + --text-color: #ffffff; + --accent-color: #0084ff; + --accent-glow: 0 0 15px rgba(0, 132, 255, 0.6); + --glass-blur: blur(20px); + --transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1); +} + +body.light-theme { + --bg-color: #f1f5f9; + --card-bg: rgba(255, 255, 255, 0.95); + --text-color: #1e293b; + --accent-color: #3b82f6; + --accent-glow: 0 4px 20px rgba(59, 130, 246, 0.2); + --glass-blur: blur(8px); +} + +* { box-sizing: border-box; -webkit-tap-highlight-color: transparent; } + +body { + margin: 0; + font-family: 'Inter', -apple-system, system-ui, sans-serif; + background: var(--bg-color); + color: var(--text-color); + transition: background 0.4s ease; + overflow-x: hidden; +} + +.dashboard { + max-width: 1000px; + margin: 0 auto; + padding: 20px; + min-height: 100vh; +} + +header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 30px; + animation: slideDown 0.6s ease-out; + position: relative; + z-index: 101; +} + +h1 { font-size: 1.6rem; font-weight: 800; margin: 0; letter-spacing: -0.5px; } + +.glass { + background: var(--card-bg); + backdrop-filter: var(--glass-blur); + -webkit-backdrop-filter: var(--glass-blur); + border: 1px solid rgba(255, 255, 255, 0.05); + border-radius: 24px; +} + +body.light-theme .glass { + border: 1px solid rgba(255, 255, 255, 0.5); + box-shadow: 0 8px 32px rgba(31, 38, 135, 0.07); +} + +.now-playing { + padding: 30px 40px; + text-align: center; + margin-bottom: 30px; + box-shadow: var(--accent-glow); + animation: fadeIn 0.8s ease-out; +} + +.current-station-info { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 25px; + padding-bottom: 20px; + border-bottom: 1px solid rgba(255,255,255,0.05); +} + +body.light-theme .current-station-info { + border-bottom: 1px solid rgba(0,0,0,0.05); +} + +.current-text-info { + flex: 1; + text-align: left; + overflow: hidden; + margin-right: 20px; +} + +.current-name { + font-size: 1.4rem; + font-weight: 800; + color: var(--accent-color); + text-shadow: var(--accent-glow); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-bottom: 4px; +} + +.current-metadata { + font-size: 0.95rem; + font-weight: 500; + opacity: 0.6; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: var(--text-color); +} + +.current-img { + width: 64px; + height: 64px; + border-radius: 12px; + object-fit: cover; + box-shadow: var(--accent-glow); +} + +.status-badge { + display: inline-block; + padding: 6px 14px; + background: var(--accent-color); + color: white; + border-radius: 12px; + font-size: 0.85rem; + font-weight: 700; + margin-bottom: 25px; + box-shadow: var(--accent-glow); + text-transform: uppercase; +} + +.controls { + display: flex; + justify-content: center; + align-items: center; + gap: 30px; +} + +.icon-btn { + background: none; + border: none; + color: var(--text-color); + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + transition: var(--transition); + padding: 12px; +} + +.icon-btn:hover { background: rgba(128,128,128,0.1); transform: scale(1.1); } +.icon-btn:active { transform: scale(0.9); } + +.icon-btn.large .material-icons { font-size: 42px; } +.icon-btn.x-large { + background: rgba(128,128,128,0.05); + border: 2px solid var(--accent-color); +} +.icon-btn.x-large .material-icons { font-size: 56px; color: var(--accent-color); } +.icon-btn.x-large:hover { box-shadow: var(--accent-glow); } + +.station-section h2 { margin-bottom: 20px; font-weight: 700; opacity: 0.9; font-size: 1.2rem; } + +.station-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); + gap: 16px; +} + +.station-item { + padding: 16px; + background: var(--card-bg); + border-radius: 20px; + text-align: center; + cursor: pointer; + transition: var(--transition); + border: 1px solid rgba(255,255,255,0.03); + display: flex; + flex-direction: column; + align-items: center; + gap: 12px; +} + +body.light-theme .station-item { + border: 1px solid rgba(0,0,0,0.02); + box-shadow: 0 4px 6px rgba(0,0,0,0.02); +} + +.station-item:hover { + transform: translateY(-8px); + background: rgba(128,128,128,0.08); + border-color: var(--accent-color); +} + +.station-item.active { + background: var(--accent-color); + color: white; + box-shadow: var(--accent-glow); + font-weight: 700; +} + +.station-img { + width: 80px; + height: 80px; + border-radius: 12px; + object-fit: cover; + background: rgba(128,128,128,0.05); + border: 1px solid rgba(128,128,128,0.1); +} + +.station-name { + font-size: 0.95rem; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 100%; +} + +.hidden { display: none !important; } + +/* API Documentation */ +.api-container { padding: 30px; margin-top: 20px; } +.api-content pre { + background: #0a0a0a; + padding: 20px; + border-radius: 12px; + color: #00d4ff; + border: 1px solid #222; + font-size: 0.9rem; + overflow-x: auto; +} + +body.light-theme .api-content pre { + background: #f8f9fa; + color: #0066cc; + border: 1px solid #e2e8f0; +} + +.code-example { color: #888; margin-top: 10px; font-size: 0.8rem; } + +/* Settings Panel with Animation */ +.settings-panel { + position: fixed; + top: 0; + right: 0; + height: 100%; + width: 320px; + z-index: 1000; + padding: 30px; + transform: translateX(0); + transition: transform 0.5s cubic-bezier(0.19, 1, 0.22, 1); + box-shadow: -10px 0 30px rgba(0,0,0,0.5); +} + +body.light-theme .settings-panel { + box-shadow: -10px 0 30px rgba(0,0,0,0.05); +} + +.settings-panel.hidden { + transform: translateX(105%); +} + +.settings-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 40px; +} + +.setting-item { + display: flex; + flex-direction: column; + gap: 8px; + margin-bottom: 25px; +} + +.setting-item span { font-size: 0.85rem; font-weight: 600; opacity: 0.7; text-transform: uppercase; } + +select { + background: #111111; + color: #ffffff; + border: 1px solid rgba(255, 255, 255, 0.1); + padding: 12px; + border-radius: 12px; + outline: none; + cursor: pointer; + font-size: 1rem; + width: 100%; +} + +option { + background: #111111; + color: #ffffff; +} + +body.light-theme select { + background: #ffffff; + color: #1a202c; + border: 1px solid #e2e8f0; +} + +body.light-theme option { + background: #ffffff; + color: #1a202c; +} + +.settings-footer { + position: absolute; + bottom: 30px; + left: 30px; + right: 30px; + padding-top: 20px; + border-top: 1px solid rgba(128,128,128,0.1); +} + +.link-btn { + background: none; + border: none; + color: var(--accent-color); + cursor: pointer; + font-weight: 600; + padding: 0; + text-decoration: none; +} + +.method { font-weight: bold; padding: 2px 8px; border-radius: 4px; font-size: 0.8rem; margin-right: 10px; } +.get { background: #007bff; color: white; } +.post { background: #28a745; color: white; } + +/* Keyframes */ +@keyframes fadeIn { from { opacity: 0; transform: scale(0.98); } to { opacity: 1; transform: scale(1); } } +@keyframes slideDown { from { opacity: 0; transform: translateY(-30px); } to { opacity: 1; transform: translateY(0); } } + +@media (max-width: 600px) { + .dashboard { padding: 15px; } + .station-grid { grid-template-columns: repeat(auto-fill, minmax(130px, 1fr)); } + .settings-panel { width: 85%; } +} diff --git a/app/src/main/assets/web/translations.json b/app/src/main/assets/web/translations.json new file mode 100644 index 0000000..8dd3e4b --- /dev/null +++ b/app/src/main/assets/web/translations.json @@ -0,0 +1,202 @@ +{ + "en": { + "title": "Radio Remote", + "status_loading": "Loading...", + "status_playing": "Playing", + "status_paused": "Paused", + "status_error": "Error", + "status_connection_error": "Connection Error", + "controls_prev": "Previous", + "controls_next": "Next", + "controls_play_pause": "Play/Pause", + "stations_title": "Station Collection", + "stations_empty": "No stations found in collection.", + "menu_theme": "Theme", + "menu_language": "Language", + "theme_light": "Light", + "theme_dark": "Dark", + "theme_follow_browser": "Follow Browser", + "lang_auto_browser": "Auto (Browser)", + "api_docs": "API Documentation" + }, + "de": { + "title": "Radio Fernbedienung", + "status_loading": "Lädt...", + "status_playing": "Wiedergabe", + "status_paused": "Pause", + "status_error": "Fehler", + "status_connection_error": "Verbindungsfehler", + "controls_prev": "Zurück", + "controls_next": "Weiter", + "controls_play_pause": "Play/Pause", + "stations_title": "Sender-Sammlung", + "stations_empty": "Keine Sender in der Sammlung gefunden.", + "menu_theme": "Design", + "menu_language": "Sprache", + "theme_light": "Hell", + "theme_dark": "Dunkel", + "theme_follow_browser": "Browser folgen", + "lang_auto_browser": "Auto (Browser)", + "api_docs": "API Dokumentation" + }, + "fr": { + "title": "Télécommande Radio", + "status_loading": "Chargement...", + "status_playing": "Lecture", + "status_paused": "Pause", + "status_error": "Erreur", + "status_connection_error": "Erreur de connexion", + "controls_prev": "Précédent", + "controls_next": "Suivant", + "controls_play_pause": "Lecture/Pause", + "stations_title": "Collection de Stations", + "stations_empty": "Aucune station trouvée.", + "menu_theme": "Thème", + "menu_language": "Langue", + "theme_light": "Clair", + "theme_dark": "Sombre", + "theme_follow_browser": "Suivre le Navigateur", + "lang_auto_browser": "Auto (Navigateur)", + "api_docs": "Documentation API" + }, + "ru": { + "title": "Пульт Радио", + "status_loading": "Загрузка...", + "status_playing": "Воспроизведение", + "status_paused": "Пауза", + "status_error": "Ошибка", + "status_connection_error": "Ошибка соединения", + "controls_prev": "Назад", + "controls_next": "Вперед", + "controls_play_pause": "Пуск/Пауза", + "stations_title": "Коллекция станций", + "stations_empty": "Станции не найдены.", + "menu_theme": "Тема", + "menu_language": "Язык", + "theme_light": "Светлая", + "theme_dark": "Темная", + "theme_follow_browser": "Как in браузере", + "lang_auto_browser": "Авто (Браузер)", + "api_docs": "Документация API" + }, + "nl": { + "title": "Radio Afstandsbediening", + "status_loading": "Laden...", + "status_playing": "Afspelen", + "status_paused": "Gepauzeerd", + "status_error": "Fout", + "status_connection_error": "Verbindingsfout", + "controls_prev": "Vorige", + "controls_next": "Volgende", + "controls_play_pause": "Afspelen/Pauze", + "stations_title": "Zendercollectie", + "stations_empty": "Geen zenders gefunden.", + "menu_theme": "Thema", + "menu_language": "Taal", + "theme_light": "Licht", + "theme_dark": "Donker", + "theme_follow_browser": "Browser volgen", + "lang_auto_browser": "Auto (Browser)", + "api_docs": "API Documentatie" + }, + "pl": { + "title": "Pilot Radio", + "status_loading": "Ładowanie...", + "status_playing": "Odtwarzanie", + "status_paused": "Pauza", + "status_error": "Błąd", + "status_connection_error": "Błąd połączenia", + "controls_prev": "Poprzedni", + "controls_next": "Następny", + "controls_play_pause": "Odtwarzaj/Pauza", + "stations_title": "Kolekcja stacji", + "stations_empty": "Nie znaleziono stacji.", + "menu_theme": "Motyw", + "menu_language": "Język", + "theme_light": "Jasny", + "theme_dark": "Ciemny", + "theme_follow_browser": "Podążaj za przeglądarką", + "lang_auto_browser": "Auto (Przeglądarka)", + "api_docs": "Dokumentacja API" + }, + "ja": { + "title": "ラジオ リモコン", + "status_loading": "読み込み中...", + "status_playing": "再生中", + "status_paused": "一時停止", + "status_error": "エラー", + "status_connection_error": "接続エラー", + "controls_prev": "前へ", + "controls_next": "次へ", + "controls_play_pause": "再生/一時停止", + "stations_title": "ステーション一覧", + "stations_empty": "ステーションが見つかりませんでした。", + "menu_theme": "テーマ", + "menu_language": "言語", + "theme_light": "ライト", + "theme_dark": "ダーク", + "theme_follow_browser": "ブラウザに従う", + "lang_auto_browser": "自動 (ブラウザ)", + "api_docs": "API ドキュメント" + }, + "uk": { + "title": "Пульт Радіо", + "status_loading": "Завантаження...", + "status_playing": "Відтворення", + "status_paused": "Пауза", + "status_error": "Помилка", + "status_connection_error": "Помилка з'єднання", + "controls_prev": "Назад", + "controls_next": "Вперед", + "controls_play_pause": "Пуск/Пауза", + "stations_title": "Колекція станцій", + "stations_empty": "Станцій не знайдено.", + "menu_theme": "Тема", + "menu_language": "Мова", + "theme_light": "Світла", + "theme_dark": "Темная", + "theme_follow_browser": "Як у браузері", + "lang_auto_browser": "Авто (Браузер)", + "api_docs": "Документация API" + }, + "el": { + "title": "Ραδιοφωνικό Χειριστήριο", + "status_loading": "Φόρτωση...", + "status_playing": "Αναπαραγωγή", + "status_paused": "Παύση", + "status_error": "Σφάλμα", + "status_connection_error": "Σφάλμα σύνδεσης", + "controls_prev": "Προηγούμενο", + "controls_next": "Επόμενο", + "controls_play_pause": "Αναπαραγωγή/Παύση", + "stations_title": "Συλλογή Σταθμών", + "stations_empty": "Δεν βρέθηκαν σταθμοί.", + "menu_theme": "Θέμα", + "menu_language": "Γλώσσα", + "theme_light": "Φωτεινό", + "theme_dark": "Σκοτεινό", + "theme_follow_browser": "Ακολουθήστε το πρόγραμμα περιήγησης", + "lang_auto_browser": "Αυτόματο (Browser)", + "api_docs": "Τεκμηρίωση API" + }, + "da": { + "title": "Radio Fjernbetjening", + "status_loading": "Indlæser...", + "status_playing": "Afspiller", + "status_paused": "Pause", + "status_error": "Fejl", + "status_connection_error": "Forbindelsesfejl", + "controls_prev": "Forrige", + "controls_next": "Næste", + "controls_play_pause": "Afspil/Pause", + "stations_title": "Stationssamling", + "stations_empty": "Ingen stationer fundet.", + "menu_theme": "Tema", + "menu_language": "Sprog", + "theme_light": "Lyst", + "theme_dark": "Mørkt", + "theme_follow_browser": "Følg browser", + "lang_auto_browser": "Auto (Browser)", + "api_docs": "API Dokumentation" + } +} diff --git a/app/src/main/java/com/michatec/radio/Keys.kt b/app/src/main/java/com/michatec/radio/Keys.kt index 890d33a..e37736f 100644 --- a/app/src/main/java/com/michatec/radio/Keys.kt +++ b/app/src/main/java/com/michatec/radio/Keys.kt @@ -20,6 +20,7 @@ object Keys { const val ACTION_COLLECTION_CHANGED: String = "com.michatec.radio.action.COLLECTION_CHANGED" const val ACTION_THEME_CHANGED: String = "com.michatec.radio.action.THEME_CHANGED" const val ACTION_START: String = "com.michatec.radio.action.START" + const val ACTION_REMOTE_SERVER_ERROR: String = "com.michatec.radio.action.REMOTE_SERVER_ERROR" // intent extras const val EXTRA_COLLECTION_MODIFICATION_DATE: String = "COLLECTION_MODIFICATION_DATE" @@ -97,6 +98,7 @@ object Keys { const val PREF_CUSTOM_THEME_ENABLED: String = "CUSTOM_THEME_ENABLED" const val PREF_CUSTOM_THEME_INDEX: String = "CUSTOM_THEME_INDEX" const val PREF_ARGUMENTS: String = "ARGUMENTS" + const val PREF_REMOTE_CONTROL_ENABLED: String = "REMOTE_CONTROL_ENABLED" // default const values const val DEFAULT_SIZE_OF_METADATA_HISTORY: Int = 25 diff --git a/app/src/main/java/com/michatec/radio/MainActivity.kt b/app/src/main/java/com/michatec/radio/MainActivity.kt index 2acea20..d365a91 100644 --- a/app/src/main/java/com/michatec/radio/MainActivity.kt +++ b/app/src/main/java/com/michatec/radio/MainActivity.kt @@ -20,10 +20,12 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.core.app.ActivityCompat import androidx.core.view.isVisible +import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.NavigationUI import androidx.navigation.ui.navigateUp +import android.content.* import com.google.android.material.snackbar.Snackbar import com.michatec.radio.helpers.AppThemeHelper import com.michatec.radio.helpers.FileHelper @@ -132,6 +134,21 @@ class MainActivity : AppCompatActivity() { } } + override fun onStart() { + super.onStart() + // register remote server error receiver + LocalBroadcastManager.getInstance(this).registerReceiver( + remoteServerErrorReceiver, + IntentFilter(Keys.ACTION_REMOTE_SERVER_ERROR) + ) + } + + override fun onStop() { + super.onStop() + // unregister remote server error receiver + LocalBroadcastManager.getInstance(this).unregisterReceiver(remoteServerErrorReceiver) + } + /* Hides the loading/splash overlay */ private fun hideLoadingOverlay() { findViewById(R.id.loading_layout)?.let { overlay -> @@ -220,6 +237,24 @@ class MainActivity : AppCompatActivity() { } } } + + + /* + * Receiver for remote server error + */ + private val remoteServerErrorReceiver: BroadcastReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action == Keys.ACTION_REMOTE_SERVER_ERROR) { + val snackbar = Snackbar.make( + findViewById(R.id.main_root), + R.string.error_webserver, + Snackbar.LENGTH_LONG + ) + snackbar.anchorView = findViewById(R.id.bottom_sheet) + snackbar.show() + } + } + } /* * End of declaration */ diff --git a/app/src/main/java/com/michatec/radio/PlayerService.kt b/app/src/main/java/com/michatec/radio/PlayerService.kt index b4631ca..f6429b1 100644 --- a/app/src/main/java/com/michatec/radio/PlayerService.kt +++ b/app/src/main/java/com/michatec/radio/PlayerService.kt @@ -60,6 +60,33 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc private var playLastStation: Boolean = false private var manuallyCancelledSleepTimer = false + private val remoteControlServer: RemoteControlServer by lazy { + RemoteControlServer(this).apply { + onPlayStation = { uuid -> + playStation(uuid) + } + onPause = { + player.pause() + } + onResume = { + player.play() + } + onNext = { + playNextStation() + } + onPrev = { + playPreviousStation() + } + + onError = { error -> + Log.e(TAG, "RemoteControlServer error: $error") + PreferencesHelper.saveRemoteControlEnabled(false) + val intent = Intent(Keys.ACTION_REMOTE_SERVER_ERROR) + LocalBroadcastManager.getInstance(this@PlayerService).sendBroadcast(intent) + } + } + } + // Native Audio Processor instance private val nativeAudioProcessor = NativeAudioProcessor() @@ -77,6 +104,13 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc // initialize player and session initializePlayer() initializeSession() + + // start remote control server if enabled + if (PreferencesHelper.loadRemoteControlEnabled()) { + remoteControlServer.setPlayer(player) + remoteControlServer.start() + } + val notificationProvider: DefaultMediaNotificationProvider = CustomNotificationProvider() notificationProvider.setSmallIcon(R.drawable.ic_notification_app_icon_white_24dp) setMediaNotificationProvider(notificationProvider) @@ -105,6 +139,12 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc } + /* Overrides onStartCommand from Service */ + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + super.onStartCommand(intent, flags, startId) + return START_STICKY + } + /* Overrides onTaskRemoved from Service */ override fun onTaskRemoved(rootIntent: Intent?) { if (!player.playWhenReady) { @@ -369,6 +409,14 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc castPlayer.volume = 1f } } + Keys.PREF_REMOTE_CONTROL_ENABLED -> { + if (PreferencesHelper.loadRemoteControlEnabled()) { + remoteControlServer.setPlayer(player) + remoteControlServer.start() + } else { + remoteControlServer.stop() + } + } } } @@ -394,6 +442,13 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc } } + /* Starts playback of a radio station by UUID (centralized logic) */ + fun playStation(uuid: String) { + val station = CollectionHelper.getStation(collection, uuid) + if (station.isValid()) { + playStation(station) + } + } /* Starts playback of a radio station */ private fun playStation(station: Station) { diff --git a/app/src/main/java/com/michatec/radio/SettingsFragment.kt b/app/src/main/java/com/michatec/radio/SettingsFragment.kt index 7ba40f6..dd9fc52 100644 --- a/app/src/main/java/com/michatec/radio/SettingsFragment.kt +++ b/app/src/main/java/com/michatec/radio/SettingsFragment.kt @@ -5,6 +5,7 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.content.Intent +import android.content.pm.PackageManager import android.net.Uri import android.os.Bundle import android.util.Log @@ -13,21 +14,31 @@ import androidx.activity.result.ActivityResult import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult import androidx.appcompat.app.AppCompatActivity import androidx.core.net.toUri +import androidx.media3.common.util.UnstableApi import androidx.navigation.fragment.findNavController -import androidx.preference.* +import androidx.preference.EditTextPreference +import androidx.preference.Preference +import androidx.preference.PreferenceCategory +import androidx.preference.PreferenceFragmentCompat import com.google.android.material.snackbar.Snackbar import com.michatec.radio.dialogs.ErrorDialog import com.michatec.radio.dialogs.LanguageSelectionDialog import com.michatec.radio.dialogs.PresetSelectionDialog import com.michatec.radio.dialogs.ThemeSelectionDialog import com.michatec.radio.dialogs.YesNoDialog -import com.michatec.radio.helpers.* -import android.content.pm.PackageManager +import com.michatec.radio.helpers.AppThemeHelper +import com.michatec.radio.helpers.BackupHelper +import com.michatec.radio.helpers.FileHelper +import com.michatec.radio.helpers.LanguageHelper +import com.michatec.radio.helpers.MarqueeSwitchPreference +import com.michatec.radio.helpers.NetworkHelper +import com.michatec.radio.helpers.PreferencesHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import java.text.SimpleDateFormat -import java.util.* +import java.util.Date +import java.util.Locale /* @@ -59,6 +70,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList } /* Overrides onCreatePreferences from PreferenceFragmentCompat */ + @UnstableApi override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { val context = preferenceManager.context @@ -182,6 +194,29 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList PreferencesHelper.loadEditStreamUrisEnabled(context) } + // set up "Remote Control" preference + val preferenceRemoteControl = MarqueeSwitchPreference(context) + preferenceRemoteControl.title = getString(R.string.pref_remote_control_title) + preferenceRemoteControl.setIcon(R.drawable.ic_network_check_24dp) + preferenceRemoteControl.key = Keys.PREF_REMOTE_CONTROL_ENABLED + val localIp = NetworkHelper.getLocalIpAddress(context) + preferenceRemoteControl.summary = if (localIp != null) { + getString(R.string.pref_remote_control_url, localIp) + } else { + getString(R.string.pref_remote_control_summary) + } + preferenceRemoteControl.setDefaultValue(PreferencesHelper.loadRemoteControlEnabled()) + preferenceRemoteControl.setOnPreferenceChangeListener { _, newValue -> + val enabled = newValue as Boolean + if (enabled) { + val intent = Intent(activity, PlayerService::class.java).apply { + action = Keys.ACTION_START + } + activity?.startService(intent) + } + return@setOnPreferenceChangeListener true + } + // set up "Arguments" preference val preferenceArguments = EditTextPreference(context) preferenceArguments.title = getString(R.string.pref_arguments_title) @@ -501,6 +536,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceCategoryAdvanced.addPreference(preferenceBufferSize) preferenceCategoryAdvanced.addPreference(preferenceEnableEditingGeneral) preferenceCategoryAdvanced.addPreference(preferenceEnableEditingStreamUri) + preferenceCategoryAdvanced.addPreference(preferenceRemoteControl) preferenceCategoryAdvanced.addPreference(preferenceArguments) screen.addPreference(preferenceCategoryLinks) diff --git a/app/src/main/java/com/michatec/radio/helpers/NetworkHelper.kt b/app/src/main/java/com/michatec/radio/helpers/NetworkHelper.kt index 6f89225..7e5aeac 100644 --- a/app/src/main/java/com/michatec/radio/helpers/NetworkHelper.kt +++ b/app/src/main/java/com/michatec/radio/helpers/NetworkHelper.kt @@ -34,6 +34,21 @@ object NetworkHelper { } + /* Gets the IP address of the device on the local network */ + fun getLocalIpAddress(context: Context): String? { + val connMgr = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val activeNetwork: Network = connMgr.activeNetwork ?: return null + val linkProperties = connMgr.getLinkProperties(activeNetwork) ?: return null + for (linkAddress in linkProperties.linkAddresses) { + val address = linkAddress.address + if (!address.isLoopbackAddress && address is InetAddress && address.hostAddress?.contains(":") == false) { + return address.hostAddress + } + } + return null + } + + /* Detects content type (mime type) from given URL string - async using coroutine - use only on separate threat */ fun detectContentType(urlString: String): ContentType { Log.v(TAG, "Determining content type - Thread: ${Thread.currentThread().name}") diff --git a/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt b/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt index b5bc60e..80053a1 100644 --- a/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt +++ b/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt @@ -406,6 +406,18 @@ object PreferencesHelper { return arguments.any { it.lowercase().sha256() == targetHash } } + /* Loads whether remote control is enabled */ + fun loadRemoteControlEnabled(): Boolean { + return sharedPreferences.getBoolean(Keys.PREF_REMOTE_CONTROL_ENABLED, false) + } + + /* Saves whether remote control is enabled */ + fun saveRemoteControlEnabled(enabled: Boolean) { + sharedPreferences.edit { + putBoolean(Keys.PREF_REMOTE_CONTROL_ENABLED, enabled) + } + } + /* SHA-256 helper */ private fun String.sha256(): String { return try { diff --git a/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt b/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt new file mode 100644 index 0000000..1274b00 --- /dev/null +++ b/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt @@ -0,0 +1,274 @@ +package com.michatec.radio.helpers + +import android.content.Context +import android.util.Log +import androidx.media3.common.Player +import com.michatec.radio.BuildConfig +import io.ktor.http.* +import io.ktor.serialization.gson.* +import io.ktor.server.application.* +import io.ktor.server.engine.* +import io.ktor.server.netty.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import kotlinx.coroutines.* +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import java.io.File +import java.net.BindException +import kotlin.time.Duration.Companion.milliseconds + +class RemoteControlServer(private val context: Context) { + + private var server: EmbeddedServer? = null + private var player: Player? = null + private val serverScope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + private val lifecycleMutex = Mutex() + var onPlayStation: ((String) -> Unit)? = null + var onPause: (() -> Unit)? = null + var onResume: (() -> Unit)? = null + var onNext: (() -> Unit)? = null + var onPrev: (() -> Unit)? = null + var onError: ((String) -> Unit)? = null + + fun setPlayer(player: Player?) { + this.player = player + } + + private fun safeReadAsset(path: String): ByteArray? { + return try { + context.assets.open(path).use { it.readBytes() } + } catch (e: Exception) { + Log.e("RemoteControlServer", "Failed to read asset: $path", e) + null + } + } + + fun start() { + serverScope.launch { + lifecycleMutex.withLock { + if (server != null) { + Log.d("RemoteControlServer", "Server is already running.") + return@withLock + } + + var attempt = 1 + val maxAttempts = 5 + + while (attempt <= maxAttempts) { + try { + Log.i("RemoteControlServer", "Starting server (attempt $attempt)...") + val newServer = embeddedServer(Netty, port = 8080, host = "0.0.0.0") { + install(ContentNegotiation) { + gson() + } + routing { + get("/") { + val content = safeReadAsset("web/index.html") + if (content != null) { + call.response.header(HttpHeaders.CacheControl, "no-cache, no-store, must-revalidate") + call.respondBytes(content, ContentType.Text.Html) + } else { + call.respond(HttpStatusCode.NotFound) + } + } + get("/style.css") { + val content = safeReadAsset("web/style.css") + if (content != null) { + call.respondBytes(content, ContentType.Text.CSS) + } else { + call.respond(HttpStatusCode.NotFound) + } + } + get("/script.js") { + val content = safeReadAsset("web/script.js") + if (content != null) { + call.response.header(HttpHeaders.CacheControl, "no-cache, no-store, must-revalidate") + call.respondBytes(content, ContentType.Application.JavaScript) + } else { + call.respond(HttpStatusCode.NotFound) + } + } + get("/translations.json") { + val content = safeReadAsset("web/translations.json") + if (content != null) { + call.respondBytes(content, ContentType.Application.Json) + } else { + call.respond(HttpStatusCode.NotFound) + } + } + get("/favicon.png") { + val content = safeReadAsset("web/favicon.png") + if (content != null) { + call.respondBytes(content, ContentType.Image.PNG) + } else { + call.respond(HttpStatusCode.NotFound) + } + } + + get("/api/config") { + try { + call.respond(mapOf("version" to BuildConfig.VERSION_NAME)) + } catch (e: Exception) { + call.respond(HttpStatusCode.InternalServerError, mapOf("error" to e.message)) + } + } + + get("/api/status") { + val p = player + if (p == null) { + call.respond(HttpStatusCode.ServiceUnavailable, mapOf("error" to "Player not available")) + } else { + try { + val status = withContext(Dispatchers.Main) { + val metadataHistory = PreferencesHelper.loadMetadataHistory() + val currentTrack = if (metadataHistory.isNotEmpty()) metadataHistory.last() else "" + val mediaId = p.currentMediaItem?.mediaId ?: PreferencesHelper.loadLastPlayedStationUuid() + + mapOf( + "isPlaying" to p.isPlaying, + "playbackState" to p.playbackState, + "currentStationUuid" to mediaId, + "metadata" to currentTrack + ) + } + call.respond(status) + } catch (e: Exception) { + call.respond(HttpStatusCode.InternalServerError, mapOf("error" to e.message)) + } + } + } + + get("/api/stations") { + try { + val collection = withContext(Dispatchers.IO) { + FileHelper.readCollection(context) + } + val simplifiedStations = collection.stations.map { + mapOf( + "uuid" to it.uuid, + "name" to it.name, + "hasImage" to it.smallImage.isNotEmpty() + ) + } + call.respond(simplifiedStations) + } catch (e: Exception) { + call.respond(HttpStatusCode.InternalServerError, mapOf("error" to e.message)) + } + } + + get("/api/image/{uuid}") { + val uuid = call.parameters["uuid"] + if (uuid != null) { + try { + val collection = withContext(Dispatchers.IO) { + FileHelper.readCollection(context) + } + val station = CollectionHelper.getStation(collection, uuid) + if (station.smallImage.isNotEmpty()) { + val imageFile = File(context.getExternalFilesDir(""), FileHelper.determineDestinationFolderPath(com.michatec.radio.Keys.FILE_TYPE_IMAGE, uuid) + "/" + com.michatec.radio.Keys.STATION_IMAGE_FILE) + if (imageFile.exists()) { + call.respondBytes(imageFile.readBytes(), ContentType.Image.JPEG) + } else { + call.respond(HttpStatusCode.NotFound) + } + } else { + call.respond(HttpStatusCode.NotFound) + } + } catch (_: Exception) { + call.respond(HttpStatusCode.InternalServerError) + } + } else { + call.respond(HttpStatusCode.BadRequest) + } + } + + post("/api/play/{uuid}") { + val uuid = call.parameters["uuid"] + if (uuid != null) { + Log.i("RemoteControlServer", "Play request for: $uuid") + withContext(Dispatchers.Main) { + onPlayStation?.invoke(uuid) + } + call.respond(mapOf("status" to "ok")) + } + } + + post("/api/pause") { + Log.i("RemoteControlServer", "Pause request") + withContext(Dispatchers.Main) { + onPause?.invoke() + } + call.respond(mapOf("status" to "ok")) + } + + post("/api/resume") { + Log.i("RemoteControlServer", "Resume request") + withContext(Dispatchers.Main) { + onResume?.invoke() + } + call.respond(mapOf("status" to "ok")) + } + + post("/api/next") { + Log.i("RemoteControlServer", "Next request") + withContext(Dispatchers.Main) { + onNext?.invoke() + } + call.respond(mapOf("status" to "ok")) + } + + post("/api/prev") { + Log.i("RemoteControlServer", "Prev request") + withContext(Dispatchers.Main) { + onPrev?.invoke() + } + call.respond(mapOf("status" to "ok")) + } + } + } + server = newServer + newServer.start(wait = false) + Log.i("RemoteControlServer", "Server successfully started on port 8080") + return@withLock + } catch (e: Exception) { + if (e is BindException || e.cause is BindException) { + Log.w("RemoteControlServer", "Port 8080 busy, retrying in 1s...") + delay(1000.milliseconds) + attempt++ + } else { + Log.e("RemoteControlServer", "Critical server error", e) + onError?.invoke(e.localizedMessage ?: "Critical error") + break + } + } + } + Log.e("RemoteControlServer", "Failed to start after $maxAttempts attempts") + onError?.invoke("Port 8080 is blocked by another process.") + } + } + } + + fun stop() { + serverScope.launch { + lifecycleMutex.withLock { + stopInternal() + } + } + } + + private fun stopInternal() { + val s = server + server = null + if (s != null) { + try { + Log.i("RemoteControlServer", "Stopping server...") + s.stop(50, 100) + Log.i("RemoteControlServer", "Server stopped") + } catch (e: Exception) { + Log.e("RemoteControlServer", "Error stopping server", e) + } + } + } +} diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4c39cc2..d59605f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -185,4 +185,10 @@ Favoritter Ingen favoritter tilføjet endnu. Viser en liste over dine yndlingsstationer for hurtig adgang. + + + Fjernbetjening + Betjen radioen fra din webbrowser + Betjen radioen fra http://%1$s:8080 + Web fjernbetjeningsserver crashet/stoppede. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4313611..9b79a9e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -187,4 +187,10 @@ Favoriten Noch keine Favoriten hinzugefügt. Zeigt eine Liste deiner Favoriten-Sender für den Schnellzugriff. + + + Fernbedienung + Steuere das Radio über deinen Webbrowser + Steuere das Radio über http://%1$s:8080 + Web-Fernbedienungsserver abgestürzt/gestoppt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 99a6273..2c63348 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -187,4 +187,10 @@ Αγαπημένα Δεν έχουν προστεθεί ακόμα αγαπημένα. Εμφανίζει μια λίστα με τους αγαπημένους σας σταθμούς για γρήγορη πρόσβαση. + + + Τηλεχειριστήριο + Ελέγξτε το ραδιόφωνο από το πρόγραμμα περιήγησής σας + Ελέγξτε το ραδιόφωνο από το http://%1$s:8080 + Ο διακομιστής τηλεχειριστηρίου ιστού κατέρρευσε/σταμάτησε. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2690963..e633859 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -185,4 +185,10 @@ Favoris Aucun favori ajouté pour le moment. Affiche une liste de vos stations préférées pour un accès rapide. + + + Télécommande + Contrôlez la radio depuis votre navigateur web + Contrôlez la radio depuis http://%1$s:8080 + Serveur de télécommande Web planté/arrêté. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index adac38d..9781420 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -130,9 +130,9 @@ 更新 オーディオエフェクト バスブースト + 低音を増強します。 セキュリティ このアプリケーションのセキュリティについて詳しく知る - 低音を増強します。 リバーブ リバーブミスを調整します。 ダイナミックレンジ圧縮 @@ -186,4 +186,10 @@ お気に入り お気に入りはまだ追加されていません。 お気に入りのステーションを一覧表示し、素早くアクセスできます。 + + + リモコン + ウェブブラウザからラジオを操作 + http://%1$s:8080 からラジオを操作 + Webリモートサーバーがクラッシュ/停止しました。 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 968bd05..d925932 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -187,4 +187,10 @@ Favorieten Nog geen favorieten toegevoegd. Toont een lijst met je favoriete zenders voor snelle toegang. + + + Afstandsbediening + Bedien de radio vanuit je webbrowser + Bedien de radio via http://%1$s:8080 + De webserver voor de afstandsbediening is gecrasht of gestopt. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 83dc00e..2967024 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -187,4 +187,9 @@ Ulubione Nie dodano jeszcze żadnych ulubionych. Wyświetla listę ulubionych stacji, zapewniając szybki dostęp. + + Pilot + Steruj radiem z przeglądarki internetowej + Steruj radiem przez http://%1$s:8080 + Serwer zdalnego sterowania uległ awarii/zatrzymaniu. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c98b423..e69a691 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -187,4 +187,10 @@ Избранное Избранное пока не добавлено. Показывает список ваших любимых станций для быстрого доступа. + + + Удалённое управление + Управляйте радио из вашего веб-браузера + Управляйте радио через http://%1$s:8080 + Веб-сервер удалённого управления упал/остановлен. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e929ca4..4f52ee6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -187,4 +187,10 @@ Обране Ще не додано жодної станції до обраного. Показує список ваших улюблених станцій для швидкого доступу. + + + Дистанційне керування + Керуйте радіо з вашого веб-браузера + Керуйте радіо через http://%1$s:8080 + Веб-сервер дистанційного керування аварійно зупинився/зупинено. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c39671..e980e5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -222,4 +222,10 @@ Favorites No favorites added yet. Shows a list of your favorite stations for quick access. + + + Remote Control + Control radio from your web browser + Control radio from http://%1$s:8080 + Web Remote server crashed / stopped. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7208418..d469f48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ freedroidwarn = "V1.13" gson = "2.14.0" kotlin = "2.4.10" leanback = "1.2.0" +ktor = "3.5.1" material = "1.14.0" material3 = "1.4.0" media = "1.8.0" @@ -39,7 +40,14 @@ volley = { group = "com.android.volley", name = "volley", version.ref = "volley" work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workRuntimeKtx" } play-services-cast-framework = { group = "com.google.android.gms", name = "play-services-cast-framework", version.ref = "playServicesCastFramework" } +ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" } +ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" } +ktor-server-content-negotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" } +ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" } +ktor-serialization-gson = { group = "io.ktor", name = "ktor-serialization-gson", version.ref = "ktor" } + [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }