Improvements to copy feature

- Remove openUrl from context
- use skiko ClipboardManager
- FIx URL building missing host
- Fix launching app outside UWP environment

app/desktop/src/main/java/dev/schlaubi/tonbrett/app/desktop/NativeUtil.java

@@ -57,7 +57,7 @@ private static long getAppdataFolderLength() throws Throwable {
      * Tries to retrieve the current UWP app data folder.
      *
      * @return the absolute path to the folder
-     * @throws Throwable if an error occurrs
+     * @throws Throwable if an error occurs
      */
     @Nullable
     public static String getAppdataFolder() throws Throwable {

app/desktop/src/main/kotlin/ConfigBasedAppContext.kt

@@ -1,12 +1,9 @@
 package dev.schlaubi.tonbrett.app.desktop
 
 import dev.schlaubi.tonbrett.app.api.AppContext
-import java.net.URI
 
 abstract class ConfigBasedAppContext : AppContext() {
     override var token: String
         get() = getConfig().sessionToken ?: error("Please sign in")
         set(value) = saveConfig(Config(sessionToken = value))
-
-    override fun openUrl(url: String) = browseUrl(URI.create(url))
 }

app/desktop/src/main/kotlin/URIUtil.kt

@@ -4,7 +4,7 @@ import java.awt.Desktop
 import java.net.URI
 
 fun browseUrl(url: URI) {
-    if (System.getProperty("os.name").contains("windows", ignoreCase = true)) {
+    if (System.getProperty("os.name").contains("windows", ignoreCase = true) && windowsAppDataFolder != null) {
         NativeUtil.launchUri(url)
     } else {
         val desktop = Desktop.getDesktop()

app/shared/src/commonMain/kotlin/api/Api.kt

@@ -18,8 +18,6 @@ abstract class AppContextBase {
     fun resetApi() {
         apiState.value = Tonbrett(token, getUrl(), onTokenRefresh = { token = it })
     }
-
-    open fun openUrl(url: String) = Unit
 }
 
 expect open class AppContext : AppContextBase {

app/shared/src/desktopMain/kotlin/dev/schlaubi/tonbrett/app/components/SoundRightClickMenu.kt

@@ -5,19 +5,17 @@ import androidx.compose.foundation.ContextMenuItem
 import androidx.compose.runtime.Composable
 import cafe.adriel.lyricist.LocalStrings
 import dev.schlaubi.tonbrett.app.api.LocalContext
-import dev.schlaubi.tonbrett.client.href
 import dev.schlaubi.tonbrett.common.Id
 import dev.schlaubi.tonbrett.common.Route
 import dev.schlaubi.tonbrett.common.Sound
 import io.ktor.http.*
+import org.jetbrains.skiko.ClipboardManager
 
 @Composable
 private fun CopySoundUrl(id: Id<Sound>): ContextMenuItem {
-    val context = LocalContext.current
+    val api = LocalContext.current.api
     return ContextMenuItem(LocalStrings.current.copyUrl) {
-        context.openUrl(
-            href(Route.Sounds.Sound.Audio(id.toString(), ContentType.Audio.MPEG))
-        )
+        ClipboardManager().setText(api.href(Route.Sounds.Sound.Audio(id.toString(), ContentType.Audio.MPEG)))
     }
 }
 

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.12.10"
+    version = "1.12.11"
 
     repositories {
         mavenCentral()

client/src/commonMain/kotlin/Tonbrett.kt

@@ -19,8 +19,6 @@ import io.ktor.serialization.*
 import io.ktor.serialization.kotlinx.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.util.*
-import io.ktor.utils.io.core.*
-import io.ktor.websocket.*
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -41,7 +39,7 @@ private var HttpRequestBuilder.useUnicode: Boolean
 
 class ReauthorizationRequiredException : Exception()
 
-class Tonbrett(initialToken: String, private val baseUrl: Url, private val onTokenRefresh: (String) -> Unit = {}) {
+class Tonbrett(initialToken: String, @PublishedApi internal val baseUrl: Url, private val onTokenRefresh: (String) -> Unit = {}) {
     private val eventFlow = MutableSharedFlow<Event>()
     private val json = Json {
         serializersModule = TonbrettSerializersModule
@@ -116,6 +114,12 @@ class Tonbrett(initialToken: String, private val baseUrl: Url, private val onTok
 
     suspend fun stop(): Unit = client.post(Route.StopPlayer()).body()
 
+    inline fun <reified T> href(resource: T): String {
+        val builder = URLBuilder(baseUrl)
+        href(resource, builder)
+        return builder.toString()
+    }
+
     @OptIn(DelicateCoroutinesApi::class)
     suspend fun connect(useUnicode: Boolean = false) {
         client.retryingWebSocket({ this.useUnicode = useUnicode }) {