peterino
/
blastoise
2
1
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge pull request 'Update Android default server URL' (#18) from dev/android into integration 

Reviewed-on: #18
This commit is contained in:
peterino 2026-06-10 05:09:08 +00:00
parent adc450f14f a3334cb2a7
commit cd8c1814ca
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/BlastoiseNative/README.md
View File

@ -33,7 +33,7 @@ adb shell am start -n com.peterino.blastoise/.MainActivity
## MVP scope ## 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. - Saves a server URL locally.
- Uses `/api/channels` to establish an authenticated or guest session. - Uses `/api/channels` to establish an authenticated or guest session.
- Supports `/api/auth/login` for named users. - Supports `/api/auth/login` for named users.

2
android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt
View File

@ -801,7 +801,7 @@ class MainActivity : Activity(), PlaybackSnapshotListener {
} }
val deckTop = row().apply { gravity = Gravity.CENTER_VERTICAL } val deckTop = row().apply { gravity = Gravity.CENTER_VERTICAL }
val badge = TextView(this).apply { val badge = TextView(this).apply {
text = "3001" text = "TUNE"
textSize = 22f textSize = 22f
typeface = displayFont typeface = displayFont
letterSpacing = 0f letterSpacing = 0f

11
android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt
View File

@ -6,7 +6,8 @@ import java.net.URLEncoder
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
object SessionStore { 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" const val userAgent = "BlastoiseAndroid/0.1"
@Volatile @Volatile
@ -20,9 +21,11 @@ object SessionStore {
fun load(context: Context) { fun load(context: Context) {
val prefs = context.getSharedPreferences("blastoise", Context.MODE_PRIVATE) val prefs = context.getSharedPreferences("blastoise", Context.MODE_PRIVATE)
serverBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl) ?: defaultServerBaseUrl val storedBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl).orEmpty().trim()
if (serverBaseUrl.isBlank()) { serverBaseUrl = when {
serverBaseUrl = defaultServerBaseUrl storedBaseUrl.isBlank() -> defaultServerBaseUrl
storedBaseUrl.trimEnd('/') == legacyDefaultServerBaseUrl -> defaultServerBaseUrl
else -> storedBaseUrl.trimEnd('/')
} }
cookieHeader = prefs.getString("cookieHeader", "") ?: "" cookieHeader = prefs.getString("cookieHeader", "") ?: ""
themeKey = prefs.getString("themeKey", "seraph") ?: "seraph" themeKey = prefs.getString("themeKey", "seraph") ?: "seraph"