Michatec/Radio
1
1
Fork 0
mirror of https://github.com/Michatec/Radio.git synced 2026-04-01 16:06:27 +02:00
Code Issues Packages Projects Releases Activity

Refactor code and clean up unused resources

Browse Source 
- Replace `suspendCoroutine` with `suspendCancellableCoroutine` in helper classes for better cancellation support.
- Replace `bundleOf` with manual `Bundle` initialization in `MediaControllerExt` and `SettingsFragment`.
- Remove unused constants in `Keys.kt` and redundant `onTerminate` override in `Radio.kt`.
- Clean up syntax and remove semicolons in `MainActivity.kt`.
This commit is contained in:
Michatec
2026-03-24 12:36:04 +01:00
parent 5978aab0aa
commit 5334b88f1d
7 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@ import kotlinx.coroutines.Dispatchers.IO
import java.io.*
import java.util.*
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
/*
@@ -292,7 +291,7 @@ object FileHelper {
collection: Collection,
lastUpdate: Date
) {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
cont.resume(saveCollection(context, collection, lastUpdate))
}
}
@@ -311,7 +310,7 @@ object FileHelper {
originalFileUri: Uri,
targetFileUri: Uri
): Boolean {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
cont.resume(copyFile(context, originalFileUri, targetFileUri))
}
}
@@ -319,7 +318,7 @@ object FileHelper {
/* Suspend function: Exports collection of stations as M3U file - local backup copy */
suspend fun backupCollectionAsM3uSuspended(context: Context, collection: Collection) {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
Log.v(TAG, "Backing up collection as M3U - Thread: ${Thread.currentThread().name}")
// create M3U string
val m3uString: String = CollectionHelper.createM3uString(collection)
@@ -338,7 +337,7 @@ object FileHelper {
/* Suspend function: Exports collection of stations as PLS file - local backup copy */
suspend fun backupCollectionAsPlsSuspended(context: Context, collection: Collection) {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
Log.v(TAG, "Backing up collection as PLS - Thread: ${Thread.currentThread().name}")
// create PLS string
val plsString: String = CollectionHelper.createPlsString(collection)

6
app/src/main/java/com/michatec/radio/helpers/NetworkHelper.kt
View File

@@ -19,13 +19,13 @@ import android.net.ConnectivityManager
import android.net.Network
import android.util.Log
import com.michatec.radio.Keys
import kotlinx.coroutines.suspendCancellableCoroutine
import java.net.HttpURLConnection
import java.net.InetAddress
import java.net.URL
import java.net.UnknownHostException
import java.util.*
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
/*
@@ -105,7 +105,7 @@ object NetworkHelper {
/* Suspend function: Detects content type (mime type) from given URL string - async using coroutine */
suspend fun detectContentTypeSuspended(urlString: String): ContentType {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
cont.resume(detectContentType(urlString))
}
}
@@ -113,7 +113,7 @@ object NetworkHelper {
/* Suspend function: Gets a random radio-browser.info api address - async using coroutine */
suspend fun getRadioBrowserServerSuspended(): String {
return suspendCoroutine { cont ->
return suspendCancellableCoroutine { cont ->
val serverAddress: String = try {
// get all available radio browser servers
val serverAddressList: Array<InetAddress> =