Merge branch 'release/3.0.0-patch4' into latest

Author: cloudsftp

README.md

@@ -1,4 +1,4 @@
-# Bad Radio Android ![version](https://img.shields.io/badge/v3.0.0--patch3-blue.svg)
+# Bad Radio Android ![version](https://img.shields.io/badge/v3.0.0--patch4-blue.svg)
 
 [![website](https://img.shields.io/badge/Website-grey.svg)](https://badradio.nz/)
 [![Build Develop](https://github.com/cloudsftp/BadRadioAndroid/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/cloudsftp/BadRadioAndroid/actions/workflows/build.yml)

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "nz.badradio.badradio"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 314
-        versionName "3.0.0-patch3"
+        versionCode 315
+        versionName "3.0.0-patch4"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -26,7 +26,9 @@
         </activity>
         <activity android:name="nz.badradio.badradio.view.AboutActivity" />
 
-        <service android:name="nz.badradio.badradio.model.radio.RadioService"
+        <service android:name="nz.badradio.badradio.model.radio.RadioService"/>
+
+        <service android:name=".model.radio.MediaBrowser"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />

app/src/main/java/nz/badradio/badradio/model/radio/MediaBrowser.kt

@@ -0,0 +1,34 @@
+package nz.badradio.badradio.model.radio
+
+import android.os.Bundle
+import android.support.v4.media.MediaBrowserCompat
+import androidx.media.MediaBrowserServiceCompat
+import nz.badradio.badradio.viewmodel.RadioVM
+
+class MediaBrowser : MediaBrowserServiceCompat() {
+
+    override fun onGetRoot(
+        clientPackageName: String,
+        clientUid: Int,
+        rootHints: Bundle?
+    ): BrowserRoot {
+        // TODO: return empty root when not playing
+        return BrowserRoot(BADRADIO_RECENT_BROWSER_ROOT, Bundle())
+    }
+
+    override fun onLoadChildren(
+        parentId: String,
+        result: Result<MutableList<MediaBrowserCompat.MediaItem>>
+    ) {
+        if (parentId == BADRADIO_RECENT_BROWSER_ROOT) {
+            RadioVM.loadRecentMediaItem(result)
+            result.detach()
+        } else {
+            result.sendResult(null)
+        }
+    }
+
+}
+
+private const val BADRADIO_EMPTY_BROWSER_ROOT = "nz.badradio.badradio.model.radio.BADRADIO_EMPTY_BROWSER_ROOT"
+private const val BADRADIO_RECENT_BROWSER_ROOT = "nz.badradio.badradio.model.radio.BADRADIO_RECENT_BROWSER_ROOT"

app/src/main/java/nz/badradio/badradio/model/radio/RadioManager.kt

@@ -34,13 +34,6 @@ object RadioManager: UserInputVMObserver {
 
     // Service Controls
 
-    fun restartService(context: Context, mediaSession: MediaSessionCompat) {
-        stopService()
-        runWhenServiceUnbound {
-            startService(context, mediaSession)
-        }
-    }
-
     fun stopService() = runIfServiceBound {
         service!!.stopSelf()
     }
@@ -82,12 +75,6 @@ object RadioManager: UserInputVMObserver {
         service!!.onPause()
     }
 
-    /*
-    override fun onStop() = executeWhenServiceBound {
-        service!!.onStop()
-    }
-     */
-
     override fun onGoLive() = runWhenServiceBound {
         service!!.onGoLive()
     }

app/src/main/java/nz/badradio/badradio/model/radio/RadioService.kt

@@ -1,10 +1,9 @@
 package nz.badradio.badradio.model.radio
 
+import android.app.Service
 import android.content.Intent
 import android.net.Uri
 import android.os.*
-import android.support.v4.media.MediaBrowserCompat
-import androidx.media.MediaBrowserServiceCompat
 import nz.badradio.badradio.utilities.client
 import com.google.android.exoplayer2.*
 import com.google.android.exoplayer2.audio.AudioAttributes
@@ -16,7 +15,7 @@ import nz.badradio.badradio.model.station.StationInfo
 import nz.badradio.badradio.model.station.getStationInfo
 import nz.badradio.badradio.utilities.generateFunExecuteWhen
 
-class RadioService : MediaBrowserServiceCompat(), UserInputVMObserver {
+class RadioService : Service(), UserInputVMObserver {
     private lateinit var mediaPlayer: ExoPlayer
 
     private val audioAttributes = AudioAttributes.Builder().apply {
@@ -42,6 +41,7 @@ class RadioService : MediaBrowserServiceCompat(), UserInputVMObserver {
     override fun onCreate() {
         super.onCreate()
 
+        // TODO: rethink command structure, only create player if want to play
         getStationInfo {
             createPlayer(it)
         }
@@ -98,32 +98,7 @@ class RadioService : MediaBrowserServiceCompat(), UserInputVMObserver {
         mediaPlayer.play()
     }
 
-    // Media Browser
-
-    override fun onGetRoot(
-        clientPackageName: String,
-        clientUid: Int,
-        rootHints: Bundle?
-    ): BrowserRoot {
-        return BrowserRoot(BADRADIO_RECENT_BROWSER_ROOT, Bundle())
-    }
-
-    override fun onLoadChildren(
-        parentId: String,
-        result: Result<MutableList<MediaBrowserCompat.MediaItem>>
-    ) {
-        if (parentId == BADRADIO_RECENT_BROWSER_ROOT) {
-            RadioVM.loadRecentMediaItem(result)
-            result.detach()
-        } else {
-            result.sendResult(null)
-        }
-    }
-
     // Helpers
 
     private val runWhenPlayerInitialized = generateFunExecuteWhen { ::mediaPlayer.isInitialized }
 }
-
-private const val BADRADIO_EMPTY_BROWSER_ROOT = "nz.badradio.badradio.model.radio.BADRADIO_EMPTY_BROWSER_ROOT"
-private const val BADRADIO_RECENT_BROWSER_ROOT = "nz.badradio.badradio.model.radio.BADRADIO_RECENT_BROWSER_ROOT"