Merge pull request #29 from Michatec/renovate/androidx.media3-media3-datasource-okhttp-1.x

Update dependency androidx.media3:media3-datasource-okhttp to v1.9.1

.github/workflows/gradle-publish.yml

@@ -1,13 +1,14 @@
 # yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Build and publish APK
 on:
+  workflow_dispatch:
   push:
     tags:
       - 'b*'
 
 env:
   ANDROID_HOME: /usr/local/lib/android/sdk/
-  APK_PATH: app/build/outputs/apk/release/Radio-release-unsigned.apk
+  APK_PATH: app/build/outputs/apk/release/Radio.apk
   APKSIGNER: /usr/local/lib/android/sdk/build-tools/34.0.0/apksigner
 
 jobs:
@@ -17,10 +18,10 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: adopt
@@ -28,7 +29,7 @@ jobs:
 
       - name: Cache Android SDK
         #id: cache-android-sdk
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ env.ANDROID_HOME }}
           key: ${{ runner.os }}-android-sdk
@@ -50,6 +51,10 @@ jobs:
       - name: Check APK path
         run: ls -R app/build/outputs/apk
 
+      - name: Zipalign APK
+        run: |
+          /usr/local/lib/android/sdk/build-tools/34.0.0/zipalign -v -p 4 ${{ env.APK_PATH }} app-release-aligned.apk
+
       - name: Sign APK
         env:
           SIGN_CERT: ${{ secrets.SIGN_CERT }}
@@ -57,17 +62,12 @@ jobs:
         run: |
           echo "$SIGN_CERT" | base64 -d > cert.der
           echo "$SIGN_KEY" | base64 -d > key.der
-          mv ${{ env.APK_PATH }} app-release.apk
+          ${{ env.APKSIGNER }} sign --key key.der --cert cert.der app-release-aligned.apk
-          ${{ env.APKSIGNER }} sign --key key.der --cert cert.der app-release.apk
           rm cert.der key.der
-          
-      - name: Zipalign APK
-        run: |
-          /usr/local/lib/android/sdk/build-tools/34.0.0/zipalign -v -p 4 app-release.apk app-release-aligned.apk
           mv app-release-aligned.apk app-release.apk
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: app-release
           path: app-release.apk
@@ -79,7 +79,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: app-release
           path: app-release.apk

app/build.gradle

@@ -1,20 +1,27 @@
-apply plugin: 'com.android.application'
+plugins {
-apply plugin: 'kotlin-android'
+    id 'com.android.application'
-apply plugin: 'kotlin-parcelize'
+    id 'kotlin-parcelize'
+}
+
+androidComponents {
+    onVariants(selector().all()) { variant ->
+        variant.outputs.forEach { output ->
+            output.outputFileName.set("Radio.apk")
+        }
+    }
+}
 
 android {
     namespace 'com.michatec.radio'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId 'com.michatec.radio'
         minSdk 28
-        //noinspection OldTargetApi
+        targetSdk 36
-        targetSdk 35
+        versionCode 141
-        versionCode 13
+        versionName '14.1'
-        versionName '130'
         resourceConfigurations += ['en', 'de', 'el', 'nl', 'pl', 'ru','uk', 'ja', 'da', 'fr']
-        setProperty('archivesBaseName', 'Radio')
     }
 
     compileOptions {
@@ -48,22 +55,24 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Google Stuff //
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.13.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
 
     // AndroidX Stuff //
-    implementation 'androidx.activity:activity-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.activity:activity-ktx:1.12.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.media:media:1.7.0'
+    implementation 'androidx.media:media:1.7.1'
-    implementation 'androidx.media3:media3-exoplayer:1.7.1'
+    implementation 'androidx.media3:media3-exoplayer:1.9.1'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.7.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.9.1'
-    implementation 'androidx.media3:media3-session:1.7.1'
+    implementation 'androidx.media3:media3-session:1.9.1'
-    implementation 'androidx.media3:media3-datasource-okhttp:1.7.1'
+    implementation 'androidx.media3:media3-datasource-okhttp:1.9.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.9.7'
-    implementation 'androidx.work:work-runtime-ktx:2.10.1'
+    implementation 'androidx.work:work-runtime-ktx:2.11.1'
 
     // Volley HTTP request //
     implementation 'com.android.volley:volley:1.2.1'
+    implementation 'androidx.compose.material3:material3:1.4.0'
 }

app/src/main/java/com/michatec/radio/MainActivity.kt

@@ -24,7 +24,6 @@ import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.navigateUp
 import com.michatec.radio.helpers.AppThemeHelper
 import com.michatec.radio.helpers.FileHelper
-import com.michatec.radio.helpers.ImportHelper
 import com.michatec.radio.helpers.PreferencesHelper
 
 
@@ -41,18 +40,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // house-keeping: determine if edit stations is enabled by default todo: remove in 2023
-        if (PreferencesHelper.isHouseKeepingNecessary()) {
-            // house-keeping 1: remove hard coded default image
-            ImportHelper.removeDefaultStationImageUris(this)
-            // house-keeping 2: if existing user detected, enable Edit Stations by default
-            if (PreferencesHelper.loadCollectionSize() != -1) {
-                // existing user detected - enable Edit Stations by default
-                PreferencesHelper.saveEditStationsEnabled(true)
-            }
-            PreferencesHelper.saveHouseKeepingNecessaryState()
-        }
-
         // set up views
         setContentView(R.layout.activity_main)
 

app/src/main/java/com/michatec/radio/PlayerFragment.kt

@@ -182,8 +182,7 @@ class PlayerFragment : Fragment(),
         (activity as AppCompatActivity).supportActionBar?.hide()
 
         // set the same background color of the player sheet for the navigation bar
-        (activity as AppCompatActivity).window.navigationBarColor = ContextCompat.getColor(requireActivity(), R.color.player_sheet_background)
+        requireActivity().window.navigationBarColor = ContextCompat.getColor(requireActivity(), R.color.player_sheet_background)
-
         // associate the ItemTouchHelper with the RecyclerView
         itemTouchHelper = ItemTouchHelper(ItemTouchHelperCallback())
         itemTouchHelper?.attachToRecyclerView(layout.recyclerView)
@@ -211,14 +210,14 @@ class PlayerFragment : Fragment(),
         }
 
         override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-            val fromPosition = viewHolder.adapterPosition
+            val fromPosition = viewHolder.bindingAdapterPosition
-            val toPosition = target.adapterPosition
+            val toPosition = target.bindingAdapterPosition
             collectionAdapter.onItemMove(fromPosition, toPosition)
             return true
         }
 
         override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-            val position = viewHolder.adapterPosition
+            val position = viewHolder.bindingAdapterPosition
             collectionAdapter.onItemDismiss(position)
         }
 
@@ -435,15 +434,15 @@ class PlayerFragment : Fragment(),
         val swipeToDeleteHandler = object : UiHelper.SwipeToDeleteCallback(activity as Context) {
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
                 // ask user
-                val adapterPosition: Int = viewHolder.adapterPosition
+                val bindingAdapterPosition: Int = viewHolder.bindingAdapterPosition
                 val dialogMessage =
-                    "${getString(R.string.dialog_yes_no_message_remove_station)}\n\n- ${collection.stations[adapterPosition].name}"
+                    "${getString(R.string.dialog_yes_no_message_remove_station)}\n\n- ${collection.stations[bindingAdapterPosition].name}"
                 YesNoDialog(this@PlayerFragment as YesNoDialog.YesNoDialogListener).show(
                     context = activity as Context,
                     type = Keys.DIALOG_REMOVE_STATION,
                     messageString = dialogMessage,
                     yesButton = R.string.dialog_yes_no_positive_button_remove_station,
-                    payload = adapterPosition
+                    payload = bindingAdapterPosition
                 )
             }
         }
@@ -455,8 +454,8 @@ class PlayerFragment : Fragment(),
             object : UiHelper.SwipeToMarkStarredCallback(activity as Context) {
                 override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
                     // mark card starred
-                    val adapterPosition: Int = viewHolder.adapterPosition
+                    val bindingAdapterPosition: Int = viewHolder.bindingAdapterPosition
-                    collectionAdapter.toggleStarredStation(activity as Context, adapterPosition)
+                    collectionAdapter.toggleStarredStation(activity as Context, bindingAdapterPosition)
                 }
             }
         val swipeToMarkStarredItemTouchHelper = ItemTouchHelper(swipeToMarkStarredHandler)
@@ -501,22 +500,6 @@ class PlayerFragment : Fragment(),
 
     }
 
-
-//    /* Sets up the general playback controls - Note: station specific controls and views are updated in updatePlayerViews() */
-//    // it is probably okay to suppress this warning - the OnTouchListener on the time played view does only toggle the time duration / remaining display
-//    private fun setupPlaybackControls() {
-//
-//        // main play/pause button
-//        layout.playButtonView.setOnClickListener {
-//            onPlayButtonTapped(playerState.stationUuid, playerState.playbackState)
-//            //onPlayButtonTapped(playerState.stationUuid, playerController.getPlaybackState().state) // todo remove
-//        }
-//
-//        // register a callback to stay in sync
-//        playerController.registerCallback(mediaControllerCallback)
-//    }
-
-
     /* Sets up the player */
     private fun updatePlayerViews() {
         // get station
@@ -552,7 +535,7 @@ class PlayerFragment : Fragment(),
     private fun requestSleepTimerUpdate() {
         val resultFuture: ListenableFuture<SessionResult>? =
             controller?.requestSleepTimerRemaining()
-        resultFuture?.addListener(Runnable {
+        resultFuture?.addListener({
             val timeRemaining: Long = resultFuture.get().extras.getLong(Keys.EXTRA_SLEEP_TIMER_REMAINING)
             layout.updateSleepTimer(activity as Context, timeRemaining)
         }, MoreExecutors.directExecutor())
@@ -562,7 +545,7 @@ class PlayerFragment : Fragment(),
     /* Requests an update of the metadata history from the player service */
     private fun requestMetadataUpdate() {
         val resultFuture: ListenableFuture<SessionResult>? = controller?.requestMetadataHistory()
-        resultFuture?.addListener(Runnable {
+        resultFuture?.addListener({
             val metadata: ArrayList<String>? = resultFuture.get().extras.getStringArrayList(Keys.EXTRA_METADATA_HISTORY)
             layout.updateMetadata(metadata?.toMutableList())
         }, MoreExecutors.directExecutor())
@@ -591,7 +574,7 @@ class PlayerFragment : Fragment(),
     /* Handles ACTION_SHOW_PLAYER request from notification */
     private fun handleShowPlayer() {
         Log.i(TAG, "Tap on notification registered.")
-        // todo implement
+        layout.showPlayer(requireActivity())
     }
 
 
@@ -804,7 +787,7 @@ class PlayerFragment : Fragment(),
                         .setAction(R.string.snackbar_show) {
                             val releaseurl = getString(R.string.snackbar_url_app_home_page)
                             val i = Intent(Intent.ACTION_VIEW)
-                            i.data = Uri.parse(releaseurl)
+                            i.data = releaseurl.toUri()
                             // Not sure that does anything
                             i.putExtra("SOURCE", "SELF")
                             startActivity(i)
@@ -823,9 +806,4 @@ class PlayerFragment : Fragment(),
         request.tag = TAG
         queue.add(request)
     }
-
-    /*
-     * End of declaration
-     */
 }
-

app/src/main/java/com/michatec/radio/PlayerService.kt

@@ -397,75 +397,6 @@ class PlayerService : MediaLibraryService() {
             return super.onCustomCommand(session, controller, customCommand, args)
         }
 
-        override fun onPlayerCommandRequest(
-            session: MediaSession,
-            controller: MediaSession.ControllerInfo,
-            playerCommand: Int
-        ): Int {
-            // playerCommand = one of COMMAND_PLAY_PAUSE, COMMAND_PREPARE, COMMAND_STOP, COMMAND_SEEK_TO_DEFAULT_POSITION, COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM, COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, COMMAND_SEEK_TO_PREVIOUS, COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, COMMAND_SEEK_TO_NEXT, COMMAND_SEEK_TO_MEDIA_ITEM, COMMAND_SEEK_BACK, COMMAND_SEEK_FORWARD, COMMAND_SET_SPEED_AND_PITCH, COMMAND_SET_SHUFFLE_MODE, COMMAND_SET_REPEAT_MODE, COMMAND_GET_CURRENT_MEDIA_ITEM, COMMAND_GET_TIMELINE, COMMAND_GET_MEDIA_ITEMS_METADATA, COMMAND_SET_MEDIA_ITEMS_METADATA, COMMAND_CHANGE_MEDIA_ITEMS, COMMAND_GET_AUDIO_ATTRIBUTES, COMMAND_GET_VOLUME, COMMAND_GET_DEVICE_VOLUME, COMMAND_SET_VOLUME, COMMAND_SET_DEVICE_VOLUME, COMMAND_ADJUST_DEVICE_VOLUME, COMMAND_SET_VIDEO_SURFACE, COMMAND_GET_TEXT, COMMAND_SET_TRACK_SELECTION_PARAMETERS or COMMAND_GET_TRACK_INFOS. */
-            // emulate headphone buttons
-            // start/pause: adb shell input keyevent 85
-            // next: adb shell input keyevent 87
-            // prev: adb shell input keyevent 88
-            when (playerCommand) {
-                Player.COMMAND_SEEK_TO_NEXT -> {
-                    player.addMediaItem(
-                        CollectionHelper.getNextMediaItem(
-                            this@PlayerService,
-                            collection,
-                            player.currentMediaItem?.mediaId ?: String()
-                        )
-                    )
-                    player.prepare()
-                    player.play()
-                    return SessionResult.RESULT_SUCCESS
-                }
-                Player.COMMAND_SEEK_TO_PREVIOUS -> {
-                    player.addMediaItem(
-                        CollectionHelper.getPreviousMediaItem(
-                            this@PlayerService,
-                            collection,
-                            player.currentMediaItem?.mediaId ?: String()
-                        )
-                    )
-                    player.prepare()
-                    player.play()
-                    return SessionResult.RESULT_SUCCESS
-                }
-                Player.COMMAND_PREPARE -> {
-                    return if (playLastStation) {
-                        // special case: system requested media resumption (see also onGetLibraryRoot)
-                        player.addMediaItem(CollectionHelper.getRecent(this@PlayerService, collection))
-                        player.prepare()
-                        playLastStation = false
-                        SessionResult.RESULT_SUCCESS
-                    } else {
-                        super.onPlayerCommandRequest(session, controller, playerCommand)
-                    }
-                }
-                Player.COMMAND_PLAY_PAUSE -> {
-                    return if (player.isPlaying) {
-                        super.onPlayerCommandRequest(session, controller, playerCommand)
-                    } else {
-                        // seek to the start of the "live window"
-                        player.seekTo(0)
-                        SessionResult.RESULT_SUCCESS
-                    }
-                }
-//                Player.COMMAND_PLAY_PAUSE -> {
-//                    // override pause with stop, to prevent unnecessary buffering
-//                    if (player.isPlaying) {
-//                        player.stop()
-//                        return SessionResult.RESULT_INFO_SKIPPED
-//                    } else {
-//                       return super.onPlayerCommandRequest(session, controller, playerCommand)
-//                    }
-//                }
-                else -> {
-                    return super.onPlayerCommandRequest(session, controller, playerCommand)
-                }
-            }
-        }
     }
 
 
@@ -480,21 +411,21 @@ class PlayerService : MediaLibraryService() {
             customLayout: ImmutableList<CommandButton>,
             showPauseButton: Boolean
         ): ImmutableList<CommandButton> {
-            val seekToPreviousCommandButton = CommandButton.Builder().apply {
+            val seekToPreviousCommandButton = CommandButton.Builder()
-                setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
+                .setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
-                setIconResId(R.drawable.ic_notification_skip_to_previous_36dp)
+                .setIconResId(R.drawable.ic_notification_skip_to_previous_36dp)
-                setEnabled(true)
+                .setEnabled(true)
-            }.build()
+                .build()
-            val playCommandButton = CommandButton.Builder().apply {
+            val playCommandButton = CommandButton.Builder()
-                setPlayerCommand(Player.COMMAND_PLAY_PAUSE)
+                .setPlayerCommand(Player.COMMAND_PLAY_PAUSE)
-                setIconResId(if (player.isPlaying) R.drawable.ic_notification_stop_36dp else R.drawable.ic_notification_play_36dp)
+                .setIconResId(if (player.isPlaying) R.drawable.ic_notification_stop_36dp else R.drawable.ic_notification_play_36dp)
-                setEnabled(true)
+                .setEnabled(true)
-            }.build()
+                .build()
-            val seekToNextCommandButton = CommandButton.Builder().apply {
+            val seekToNextCommandButton = CommandButton.Builder()
-                setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
+                .setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
-                setIconResId(R.drawable.ic_notification_skip_to_next_36dp)
+                .setIconResId(R.drawable.ic_notification_skip_to_next_36dp)
-                setEnabled(true)
+                .setEnabled(true)
-            }.build()
+                .build()
             val commandButtons: MutableList<CommandButton> = mutableListOf(
                 seekToPreviousCommandButton,
                 playCommandButton,
@@ -544,19 +475,19 @@ class PlayerService : MediaLibraryService() {
                 when (player.playbackState) {
                     // player is able to immediately play from its current position
                     Player.STATE_READY -> {
-                        // todo
+                        stopSelf()
                     }
                     // buffering - data needs to be loaded
                     Player.STATE_BUFFERING -> {
-                        // todo
+                        stopSelf()
                     }
                     // player finished playing all media
                     Player.STATE_ENDED -> {
-                        // todo
+                        stopSelf()
                     }
                     // initial state or player is stopped or playback failed
                     Player.STATE_IDLE -> {
-                        // todo
+                        stopSelf()
                     }
                 }
             }
@@ -585,7 +516,10 @@ class PlayerService : MediaLibraryService() {
         override fun onPlayerError(error: PlaybackException) {
             super.onPlayerError(error)
             Log.d(TAG, "PlayerError occurred: ${error.errorCodeName}")
-            // todo: test if playback needs to be restarted
+            if (error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED || error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT) {
+                player.prepare()
+                player.play()
+            }
         }
 
 

app/src/main/java/com/michatec/radio/SettingsFragment.kt

@@ -27,8 +27,6 @@ import android.view.View
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.findNavController
@@ -62,7 +60,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         (activity as AppCompatActivity).supportActionBar?.show()
         (activity as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
         (activity as AppCompatActivity).supportActionBar?.title = getString(R.string.fragment_settings_title)
-        (activity as AppCompatActivity).window.navigationBarColor = getColor(requireContext(), android.R.attr.colorBackground)
+        requireActivity().window.navigationBarColor = getColor(requireContext(), android.R.attr.colorBackground)
     }
 
     /* Overrides onCreatePreferences from PreferenceFragmentCompat */

app/src/main/java/com/michatec/radio/collection/CollectionAdapter.kt

@@ -24,6 +24,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
@@ -193,6 +194,8 @@ class CollectionAdapter(
                 setStationImage(stationViewHolder, station)
                 setStationButtons(stationViewHolder, station)
                 setEditViews(stationViewHolder, station)
+                setPlaybackProgress(stationViewHolder, station)
+                setDownloadProgress(stationViewHolder, station)
 
                 // show / hide edit views
                 when (expandedStationPosition) {
@@ -248,6 +251,28 @@ class CollectionAdapter(
     }
 
 
+    /* Sets the playback progress view */
+    private fun setPlaybackProgress(stationViewHolder: StationViewHolder, station: Station) {
+        if (station.bufferingProgress > 0) {
+            stationViewHolder.bufferingProgress.progress = station.bufferingProgress
+            stationViewHolder.bufferingProgress.isVisible = true
+        } else {
+            stationViewHolder.bufferingProgress.isGone = true
+        }
+    }
+
+
+    /* Sets the download progress view */
+    private fun setDownloadProgress(stationViewHolder: StationViewHolder, station: Station) {
+        if (station.downloadProgress > 0) {
+            stationViewHolder.downloadProgress.progress = station.downloadProgress
+            stationViewHolder.downloadProgress.isVisible = true
+        } else {
+            stationViewHolder.downloadProgress.isGone = true
+        }
+    }
+
+
     /* Sets the edit views */
     private fun setEditViews(stationViewHolder: StationViewHolder, station: Station) {
         stationViewHolder.stationNameEditView.setText(station.name, TextView.BufferType.EDITABLE)
@@ -264,12 +289,12 @@ class CollectionAdapter(
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
         })
         stationViewHolder.cancelButton.setOnClickListener {
-            val position: Int = stationViewHolder.adapterPosition
+            val position: Int = stationViewHolder.bindingAdapterPosition
             toggleEditViews(position, station.uuid)
             UiHelper.hideSoftKeyboard(context, stationViewHolder.stationNameEditView)
         }
         stationViewHolder.saveButton.setOnClickListener {
-            val position: Int = stationViewHolder.adapterPosition
+            val position: Int = stationViewHolder.bindingAdapterPosition
             toggleEditViews(position, station.uuid)
             saveStation(
                 station,
@@ -280,15 +305,15 @@ class CollectionAdapter(
             UiHelper.hideSoftKeyboard(context, stationViewHolder.stationNameEditView)
         }
         stationViewHolder.placeOnHomeScreenButton.setOnClickListener {
-            val position: Int = stationViewHolder.adapterPosition
+            val position: Int = stationViewHolder.bindingAdapterPosition
             ShortcutHelper.placeShortcut(context, station)
             toggleEditViews(position, station.uuid)
             UiHelper.hideSoftKeyboard(context, stationViewHolder.stationNameEditView)
         }
         stationViewHolder.stationImageChangeView.setOnClickListener {
-            val position: Int = stationViewHolder.adapterPosition
+            val position: Int = stationViewHolder.bindingAdapterPosition
             collectionAdapterListener.onChangeImageButtonTapped(station.uuid)
-            stationViewHolder.adapterPosition
+            stationViewHolder.bindingAdapterPosition
             toggleEditViews(position, station.uuid)
             UiHelper.hideSoftKeyboard(context, stationViewHolder.stationNameEditView)
         }
@@ -378,7 +403,7 @@ class CollectionAdapter(
         }
         stationViewHolder.playButtonView.setOnLongClickListener {
             if (editStationsEnabled) {
-                val position: Int = stationViewHolder.adapterPosition
+                val position: Int = stationViewHolder.bindingAdapterPosition
                 toggleEditViews(position, station.uuid)
                 return@setOnLongClickListener true
             } else {
@@ -387,7 +412,7 @@ class CollectionAdapter(
         }
         stationViewHolder.stationNameView.setOnLongClickListener {
             if (editStationsEnabled) {
-                val position: Int = stationViewHolder.adapterPosition
+                val position: Int = stationViewHolder.bindingAdapterPosition
                 toggleEditViews(position, station.uuid)
                 return@setOnLongClickListener true
             } else {
@@ -396,7 +421,7 @@ class CollectionAdapter(
         }
         stationViewHolder.stationStarredView.setOnLongClickListener {
             if (editStationsEnabled) {
-                val position: Int = stationViewHolder.adapterPosition
+                val position: Int = stationViewHolder.bindingAdapterPosition
                 toggleEditViews(position, station.uuid)
                 return@setOnLongClickListener true
             } else {
@@ -405,7 +430,7 @@ class CollectionAdapter(
         }
         stationViewHolder.stationImageView.setOnLongClickListener {
             if (editStationsEnabled) {
-                val position: Int = stationViewHolder.adapterPosition
+                val position: Int = stationViewHolder.bindingAdapterPosition
                 toggleEditViews(position, station.uuid)
                 return@setOnLongClickListener true
             } else {
@@ -471,24 +496,25 @@ class CollectionAdapter(
 
         } else if (holder is StationViewHolder) {
             // get station from position
-            collection.stations[holder.getAdapterPosition()]
+            val station: Station = collection.stations[holder.bindingAdapterPosition]
 
             for (data in payloads) {
                 when (data as Int) {
                     Keys.HOLDER_UPDATE_COVER -> {
-                        // todo implement
+                        setStationImage(holder, station)
+                        setStarredIcon(holder, station)
                     }
                     Keys.HOLDER_UPDATE_NAME -> {
-                        // todo implement
+                        setStationName(holder, station)
                     }
                     Keys.HOLDER_UPDATE_PLAYBACK_STATE -> {
-                        // todo implement
+                        setStationButtons(holder, station)
                     }
                     Keys.HOLDER_UPDATE_PLAYBACK_PROGRESS -> {
-                        // todo implement
+                        setPlaybackProgress(holder, station)
                     }
                     Keys.HOLDER_UPDATE_DOWNLOAD_STATE -> {
-                        // todo implement
+                        setDownloadProgress(holder, station)
                     }
                 }
             }
@@ -575,21 +601,6 @@ class CollectionAdapter(
     }
 
 
-//    /* Initiates update of a station's information */ // todo move to CollectionHelper
-//    private fun updateStation(context: Context, station: Station) {
-//        if (station.radioBrowserStationUuid.isNotEmpty()) {
-//            // get updated station from radio browser - results are handled by onRadioBrowserSearchResults
-//            val radioBrowserSearch: RadioBrowserSearch = RadioBrowserSearch(context, this)
-//            radioBrowserSearch.searchStation(context, station.radioBrowserStationUuid, Keys.SEARCH_TYPE_BY_UUID)
-//        } else if (station.remoteStationLocation.isNotEmpty()) {
-//            // download playlist // todo check content type detection is necessary here
-//            DownloadHelper.downloadPlaylists(context, arrayOf(station.remoteStationLocation))
-//        } else {
-//            Log.w(TAG, "Unable to update station: ${station.name}.")
-//        }
-//    }
-
-
     /* Determines if position is last */
     private fun isPositionFooter(position: Int): Boolean {
         return position == collection.stations.size
@@ -600,7 +611,7 @@ class CollectionAdapter(
     @SuppressLint("NotifyDataSetChanged")
     private fun updateRecyclerView(oldCollection: Collection, newCollection: Collection) {
         collection = newCollection
-        if (oldCollection.stations.size == 0 && newCollection.stations.size > 0) {
+        if (oldCollection.stations.isEmpty() && newCollection.stations.isNotEmpty()) {
             // data set has been initialized - redraw the whole list
             notifyDataSetChanged()
         } else {
@@ -651,7 +662,7 @@ class CollectionAdapter(
     /*
      * Inner class: ViewHolder for the Add New Station action
      */
-    private inner class AddNewViewHolder(listItemAddNewLayout: View) :
+    private class AddNewViewHolder(listItemAddNewLayout: View) :
         RecyclerView.ViewHolder(listItemAddNewLayout) {
         val addNewStationView: ExtendedFloatingActionButton =
             listItemAddNewLayout.findViewById(R.id.card_add_new_station)
@@ -666,12 +677,14 @@ class CollectionAdapter(
     /*
      * Inner class: ViewHolder for a station
      */
-    private inner class StationViewHolder(stationCardLayout: View) :
+    private class StationViewHolder(stationCardLayout: View) :
         RecyclerView.ViewHolder(stationCardLayout) {
         val stationCardView: CardView = stationCardLayout.findViewById(R.id.station_card)
         val stationImageView: ImageView = stationCardLayout.findViewById(R.id.station_icon)
         val stationNameView: TextView = stationCardLayout.findViewById(R.id.station_name)
         val stationStarredView: ImageView = stationCardLayout.findViewById(R.id.starred_icon)
+        val bufferingProgress: ProgressBar = stationCardLayout.findViewById(R.id.buffering_progress)
+        val downloadProgress: ProgressBar = stationCardLayout.findViewById(R.id.download_progress)
 
         //        val menuButtonView: ImageView = stationCardLayout.findViewById(R.id.menu_button)
         val playButtonView: ImageView = stationCardLayout.findViewById(R.id.playback_button)

app/src/main/java/com/michatec/radio/core/Station.kt

@@ -48,7 +48,9 @@ data class Station(
     @Expose var radioBrowserStationUuid: String = String(),
     @Expose var radioBrowserChangeUuid: String = String(),
     @Expose var bitrate: Int = 0,
-    @Expose var codec: String = String()
+    @Expose var codec: String = String(),
+    @Expose var bufferingProgress: Int = 0,
+    @Expose var downloadProgress: Int = 0
 ) : Parcelable {
 
 
@@ -79,6 +81,12 @@ data class Station(
     }
 
 
+    /* Getter for media type */
+    fun getMediaType(): String {
+        return streamContent
+    }
+
+
     /* Creates a deep copy of a Station */
     fun deepCopy(): Station {
         return Station(
@@ -101,7 +109,9 @@ data class Station(
             radioBrowserStationUuid = radioBrowserStationUuid,
             radioBrowserChangeUuid = radioBrowserChangeUuid,
             bitrate = bitrate,
-            codec = codec
+            codec = codec,
+            bufferingProgress = bufferingProgress,
+            downloadProgress = downloadProgress
         )
     }
 }

app/src/main/java/com/michatec/radio/helpers/AudioHelper.kt

@@ -20,6 +20,8 @@ import androidx.media3.common.Metadata
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.extractor.metadata.icy.IcyHeaders
 import androidx.media3.extractor.metadata.icy.IcyInfo
+import androidx.media3.extractor.metadata.id3.Id3Frame
+import androidx.media3.extractor.metadata.id3.TextInformationFrame
 import com.michatec.radio.Keys
 import kotlin.math.min
 
@@ -37,28 +39,51 @@ object AudioHelper {
     /* Extract audio stream metadata */
     @OptIn(UnstableApi::class)
     fun getMetadataString(metadata: Metadata): String {
-        var metadataString = String()
+        var title = ""
+        var artist = ""
+        var album = ""
         for (i in 0 until metadata.length()) {
             // extract IceCast metadata
             when (val entry = metadata.get(i)) {
                 is IcyInfo -> {
-                    metadataString = entry.title.toString()
+                    title = entry.title.toString()
                 }
 
                 is IcyHeaders -> {
                     Log.i(TAG, "icyHeaders:" + entry.name + " - " + entry.genre)
                 }
 
+                is Id3Frame -> {
+                    when (entry) {
+                        is TextInformationFrame -> {
+                            when (entry.id) {
+                                "TIT2" -> title = entry.values.getOrNull(0) ?: "" // Title
+                                "TPE1" -> artist = entry.values.getOrNull(0) ?: "" // Artist
+                                "TALB" -> album = entry.values.getOrNull(0) ?: "" // Album
+                            }
+                        }
+                        else -> {
+                            Log.d(TAG, "Unhandled ID3 frame: ${entry.javaClass.simpleName}")
+                        }
+                    }
+                }
+
                 else -> {
                     Log.w(TAG, "Unsupported metadata received (type = ${entry.javaClass.simpleName})")
                 }
             }
-            // TODO implement HLS metadata extraction (Id3Frame / PrivFrame)
+        }
-            // https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html
+        // Build metadata string
+        var metadataString = title
+        if (artist.isNotEmpty() && title.isNotEmpty()) {
+            metadataString = "$artist - $title"
+        }
+        if (album.isNotEmpty() && metadataString.isNotEmpty()) {
+            metadataString += " ($album)"
         }
         // ensure a max length of the metadata string
         if (metadataString.isNotEmpty()) {
-            metadataString = metadataString.substring(0, min(metadataString.length, Keys.DEFAULT_MAX_LENGTH_OF_METADATA_ENTRY))
+            metadataString = metadataString.take(min(metadataString.length, Keys.DEFAULT_MAX_LENGTH_OF_METADATA_ENTRY))
         }
         return metadataString
     }

app/src/main/java/com/michatec/radio/helpers/CollectionHelper.kt

@@ -288,32 +288,6 @@ object CollectionHelper {
     }
 
 
-    /* Gets MediaIem for next station within collection */
-    fun getNextMediaItem(context: Context, collection: Collection, stationUuid: String): MediaItem {
-        val currentStationPosition: Int = getStationPosition(collection, stationUuid)
-        return if (collection.stations.isEmpty() || currentStationPosition == -1) {
-            buildMediaItem(context, Station())
-        } else if (currentStationPosition < collection.stations.size -1) {
-            buildMediaItem(context, collection.stations[currentStationPosition + 1])
-        } else {
-            buildMediaItem(context, collection.stations.first())
-        }
-    }
-
-
-    /* Gets MediaIem for previous station within collection */
-    fun getPreviousMediaItem(context: Context, collection: Collection, stationUuid: String): MediaItem {
-        val currentStationPosition: Int = getStationPosition(collection, stationUuid)
-        return if (collection.stations.isEmpty() || currentStationPosition == -1) {
-            buildMediaItem(context, Station())
-        } else if (currentStationPosition > 0) {
-            buildMediaItem(context, collection.stations[currentStationPosition - 1])
-        } else {
-            buildMediaItem(context, collection.stations.last())
-        }
-    }
-
-
     /* Get the position from collection for given UUID */
     fun getStationPosition(collection: Collection, stationUuid: String): Int {
         collection.stations.forEachIndexed { stationId, station ->
@@ -561,7 +535,7 @@ object CollectionHelper {
     fun exportCollectionM3u(context: Context, collection: Collection) {
         Log.v(TAG, "Exporting collection of stations as M3U")
         // export collection as M3U - launch = fire & forget (no return value from save collection)
-        if (collection.stations.size > 0) {
+        if (collection.stations.isNotEmpty()) {
             CoroutineScope(IO).launch {
                 FileHelper.backupCollectionAsM3uSuspended(
                     context,
@@ -603,7 +577,7 @@ object CollectionHelper {
     fun exportCollectionPls(context: Context, collection: Collection) {
         Log.v(TAG, "Exporting collection of stations as PLS")
         // export collection as PLS - launch = fire & forget (no return value from save collection)
-        if (collection.stations.size > 0) {
+        if (collection.stations.isNotEmpty()) {
             CoroutineScope(IO).launch {
                 FileHelper.backupCollectionAsPlsSuspended(
                     context,
@@ -714,7 +688,6 @@ object CollectionHelper {
 
     /* Creates a MediaItem with MediaMetadata for a single radio station - used to prepare player */
     fun buildMediaItem(context: Context, station: Station): MediaItem {
-        // todo implement HLS MediaItems
         // put uri in RequestMetadata - credit: https://stackoverflow.com/a/70103460
         val requestMetadata = MediaItem.RequestMetadata.Builder().apply {
             setMediaUri(station.getStreamUri().toUri())
@@ -739,7 +712,7 @@ object CollectionHelper {
             setMediaId(station.uuid)
             setRequestMetadata(requestMetadata)
             setMediaMetadata(mediaMetadata)
-            //setMimeType(station.getMediaType())
+            setMimeType(station.getMediaType())
             setUri(station.getStreamUri().toUri())
         }.build()
     }

app/src/main/java/com/michatec/radio/helpers/FileHelper.kt

@@ -417,16 +417,14 @@ object FileHelper {
 
     /* Reads InputStream from file uri and returns it as String */
     private fun readTextFileFromFile(context: Context): String {
-        // todo read https://commonsware.com/blog/2016/03/15/how-consume-content-uri.html
-        // https://developer.android.com/training/secure-file-sharing/retrieve-info
-
         // check if file exists
         val file = File(context.getExternalFilesDir(Keys.FOLDER_COLLECTION), Keys.COLLECTION_FILE)
         if (!file.exists() || !file.canRead()) {
             return String()
         }
         // read until last line reached
-        val stream: InputStream = file.inputStream()
+        val uri = Uri.fromFile(file)
+        val stream: InputStream = context.contentResolver.openInputStream(uri) ?: return String()
         val reader = BufferedReader(InputStreamReader(stream))
         val builder: StringBuilder = StringBuilder()
         reader.forEachLine {

app/src/main/java/com/michatec/radio/helpers/ShortcutHelper.kt

@@ -17,7 +17,6 @@ package com.michatec.radio.helpers
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.os.Build
 import android.widget.Toast
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat

app/src/main/java/com/michatec/radio/search/SearchResultAdapter.kt

@@ -106,7 +106,7 @@ class SearchResultAdapter(
         }
 
         // mark selected if necessary
-        val isSelected = selectedPosition == holder.adapterPosition
+        val isSelected = selectedPosition == holder.bindingAdapterPosition
         searchResultViewHolder.searchResultLayout.isSelected = isSelected
 
         // toggle text scrolling (marquee) if necessary
@@ -121,7 +121,7 @@ class SearchResultAdapter(
         searchResultViewHolder.searchResultLayout.setOnClickListener {
             // move marked position
             val previousSelectedPosition = selectedPosition
-            selectedPosition = holder.adapterPosition
+            selectedPosition = holder.bindingAdapterPosition
             notifyItemChanged(previousSelectedPosition)
             notifyItemChanged(selectedPosition)
 
@@ -133,7 +133,7 @@ class SearchResultAdapter(
                 resetSelection(false)
             } else {
                 // get the selected station from searchResults
-                val selectedStation = searchResults[holder.adapterPosition]
+                val selectedStation = searchResults[holder.bindingAdapterPosition]
                 // perform pre-playback here
                 performPrePlayback(searchResultViewHolder.searchResultLayout.context, selectedStation.getStreamUri())
                 // hand over station

app/src/main/java/com/michatec/radio/ui/LayoutHolder.kt

@@ -14,6 +14,7 @@
 
 package com.michatec.radio.ui
 
+import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
@@ -131,6 +132,7 @@ data class LayoutHolder(var rootView: View) {
 
 
     /* Updates the player views */
+    @SuppressLint("DefaultLocale")
     fun updatePlayerViews(context: Context, station: Station, isPlaying: Boolean) {
 
         // set default metadata views, when playback has stopped
@@ -164,12 +166,20 @@ data class LayoutHolder(var rootView: View) {
                 // show only the codec when the bitrate is at "0" from radio-browser.info API
                 station.codec
             } else {
+                val kiloBytesPerSecond = station.bitrate / 8F
+                val dataRateString = if (kiloBytesPerSecond >= 1000) {
+                    String.format("%.2f mb/s", kiloBytesPerSecond / 1000F)
+                } else {
+                    String.format("%.0f kb/s", kiloBytesPerSecond)
+                }
                 // show the bitrate and codec if the result is available in the radio-browser.info API
                 buildString {
                     append(station.codec)
                     append(" | ")
                     append(station.bitrate)
                     append("kbps")
+                    append(" | ")
+                    append(dataRateString)
                 }
             }
         } else {
@@ -359,7 +369,7 @@ data class LayoutHolder(var rootView: View) {
     /* Shows player */
     fun showPlayer(context: Context): Boolean {
         UiHelper.setViewMargins(context, recyclerView, 0, 0, 0, Keys.BOTTOM_SHEET_PEEK_HEIGHT)
-        if (bottomSheetBehavior.state == BottomSheetBehavior.STATE_HIDDEN && onboardingLayout.visibility == View.GONE) {
+        if (bottomSheetBehavior.state == BottomSheetBehavior.STATE_HIDDEN && onboardingLayout.isGone) {
             bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         }
         return true
@@ -440,7 +450,7 @@ data class LayoutHolder(var rootView: View) {
     /*
      * Inner class: Custom LinearLayoutManager
      */
-    private inner class CustomLayoutManager(context: Context) :
+    private class CustomLayoutManager(context: Context) :
         LinearLayoutManager(context, VERTICAL, false) {
         override fun supportsPredictiveItemAnimations(): Boolean {
             return true

app/src/main/res/layout/activity_main.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".MainActivity">
 
     <com.google.android.material.appbar.MaterialToolbar

app/src/main/res/layout/card_station.xml

@@ -31,6 +31,21 @@
             app:shapeAppearanceOverlay="@style/RoundedCorners"
             app:srcCompat="@drawable/ic_default_station_image_72dp" />
 
+        <ProgressBar
+            android:id="@+id/download_progress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="0dp"
+            android:layout_height="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginTop="8dp"
+            android:progressTint="@color/player_button_background"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@+id/station_icon"
+            app:layout_constraintStart_toStartOf="@+id/station_icon"
+            app:layout_constraintTop_toTopOf="@+id/station_icon"
+            tools:visibility="visible" />
+
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/change_image_view"
             android:layout_width="0dp"
@@ -155,6 +170,21 @@
             app:layout_constraintEnd_toStartOf="@+id/save_button"
             app:layout_constraintTop_toTopOf="@+id/save_button" />
 
+        <ProgressBar
+            android:id="@+id/buffering_progress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="0dp"
+            android:layout_height="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:progressTint="@color/player_button_background"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/default_edit_views"
             android:layout_width="0dp"

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- App Name -->
-    <string name="app_version_name" translatable="false">\"Blue\"</string>
+    <string name="app_version_name" translatable="false">\"Red\"</string>
 
     <!-- Accessibility Descriptions -->
     <string name="descr_app_icon">App icon depicting an old radio</string>

app/src/main/res/xml/provider_paths.xml

@@ -2,7 +2,7 @@
 <paths>
     <external-files-path
         name="my_images"
-        path="Android/data/com.michatec.urlradio/files/Pictures" />
+        path="Android/data/com.michatec.radio/files/Pictures" />
     <external-path
         name="external_files"
         path="." />

app/src/main/res/xml/shortcuts.xml

@@ -10,7 +10,7 @@
         android:shortcutShortLabel="@string/shortcut_last_station_short_label">
 
         <intent
-            android:action="com.jamal2367.urlradio.action.START"
+            android:action="com.michatec.radio.action.START"
             android:targetClass="com.michatec.radio.MainActivity"
             android:targetPackage="com.michatec.radio">
             <extra

build.gradle

@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.6.1' apply false
+    id 'com.android.application' version '9.0.0' apply false
-    id 'com.android.library' version '8.6.1' apply false
+    id 'com.android.library' version '9.0.0' apply false
-    id 'org.jetbrains.kotlin.android' version "2.1.0" apply false
+    id 'org.jetbrains.kotlin.android' version "2.3.0" apply false
 }
 
 tasks.register('clean', Delete) {

gradle.properties

@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1536m
 
 # enables androidx repo
 android.useAndroidX=true
-android.enableJetifier=true
+org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Fri Jan 28 14:15:43 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,78 +1,128 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS=""
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=$(save "$@")
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+
-  cd "$(dirname "$0")"
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +57,35 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

renovate.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}
+