diff --git a/android/BlastoiseNative/README.md b/android/BlastoiseNative/README.md index dcadea8..80eb587 100644 --- a/android/BlastoiseNative/README.md +++ b/android/BlastoiseNative/README.md @@ -33,7 +33,7 @@ adb shell am start -n com.peterino.blastoise/.MainActivity ## MVP scope -- Defaults to `http://mhsgroove.peterino.com:3001` and auto-connects on launch. +- Defaults to `https://tunes.peterino.com/` and auto-connects on launch. - Saves a server URL locally. - Uses `/api/channels` to establish an authenticated or guest session. - Supports `/api/auth/login` for named users. diff --git a/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt b/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt index 94f8160..6c90ad9 100644 --- a/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt +++ b/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt @@ -801,7 +801,7 @@ class MainActivity : Activity(), PlaybackSnapshotListener { } val deckTop = row().apply { gravity = Gravity.CENTER_VERTICAL } val badge = TextView(this).apply { - text = "3001" + text = "TUNE" textSize = 22f typeface = displayFont letterSpacing = 0f diff --git a/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt b/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt index 587bf3c..62726e4 100644 --- a/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt +++ b/android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt @@ -6,7 +6,8 @@ import java.net.URLEncoder import java.nio.charset.StandardCharsets object SessionStore { - const val defaultServerBaseUrl = "http://mhsgroove.peterino.com:3001" + const val defaultServerBaseUrl = "https://tunes.peterino.com" + private const val legacyDefaultServerBaseUrl = "http://mhsgroove.peterino.com:3001" const val userAgent = "BlastoiseAndroid/0.1" @Volatile @@ -20,9 +21,11 @@ object SessionStore { fun load(context: Context) { val prefs = context.getSharedPreferences("blastoise", Context.MODE_PRIVATE) - serverBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl) ?: defaultServerBaseUrl - if (serverBaseUrl.isBlank()) { - serverBaseUrl = defaultServerBaseUrl + val storedBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl).orEmpty().trim() + serverBaseUrl = when { + storedBaseUrl.isBlank() -> defaultServerBaseUrl + storedBaseUrl.trimEnd('/') == legacyDefaultServerBaseUrl -> defaultServerBaseUrl + else -> storedBaseUrl.trimEnd('/') } cookieHeader = prefs.getString("cookieHeader", "") ?: "" themeKey = prefs.getString("themeKey", "seraph") ?: "seraph"