RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(login): added a fallback to the official stoat instance if can't connect to self-hosted

This commit is contained in:
Tomasz Zajac 2026-03-30 23:55:17 +01:00
parent eb9a4fe344
commit 14eca35adb
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/chat/stoat/activities/MainActivity.kt
View File

@ -76,6 +76,9 @@ import chat.stoat.BuildConfig
import chat.stoat.R import chat.stoat.R
import chat.stoat.StoatApplication import chat.stoat.StoatApplication
import chat.stoat.api.HitRateLimitException import chat.stoat.api.HitRateLimitException
import chat.stoat.api.STOAT_BASE
import chat.stoat.api.STOAT_BASE_DEFAULT
import chat.stoat.api.STOAT_WEB_APP_DEFAULT
import chat.stoat.api.StoatAPI import chat.stoat.api.StoatAPI
import chat.stoat.api.StoatHttp import chat.stoat.api.StoatHttp
import chat.stoat.api.api import chat.stoat.api.api
@ -228,13 +231,29 @@ class MainActivityViewModel @Inject constructor(
"We have a session token, checking if it's valid and if we can still reach Stoat" "We have a session token, checking if it's valid and if we can still reach Stoat"
) )
val canReachStoat = canReachStoat() var valid = false;
val valid = try { var canReachStoat = false;
StoatAPI.checkSessionToken(token) for(attempt in 1..2) {
} catch (e: Throwable) { canReachStoat = canReachStoat();
false if(canReachStoat) {
valid = try {
StoatAPI.checkSessionToken(token)
} catch (e: Throwable) {
false
}
} else {
Log.d("MainActivity", "Cannot reach $STOAT_BASE, trying $STOAT_BASE_DEFAULT");
// Fall back to the default instance,
// otherwise the user might get stuck trying to connect to an unreachable instance
updateStoatWebApp(STOAT_WEB_APP_DEFAULT);
}
if(canReachStoat && valid) {
break;
}
} }
if (canReachStoat && !valid) { if (canReachStoat && !valid) {
Log.d("MainActivity", "Session token is invalid, could not log in") Log.d("MainActivity", "Session token is invalid, could not log in")
couldNotLogIn.emit(true) couldNotLogIn.emit(true)

8
app/src/main/java/chat/stoat/api/StoatAPI.kt
View File

@ -87,13 +87,19 @@ fun updateStoatWebApp(webApp: String = STOAT_WEB_APP_DEFAULT) {
sanitisedBaseUrl = STOAT_WEB_APP_DEFAULT; sanitisedBaseUrl = STOAT_WEB_APP_DEFAULT;
} }
if(!sanitisedBaseUrl.matches(Regex("^https?://.+"))) {
// Default to https if no scheme provided
sanitisedBaseUrl = "https://${sanitisedBaseUrl}";
}
var parsed = sanitisedBaseUrl.toUri(); var parsed = sanitisedBaseUrl.toUri();
val portPart = if (parsed.port == 80 || parsed.port == 443) "" else ":${parsed.port}"; val portPart = if (parsed.port == 80 || parsed.port == 443) "" else ":${parsed.port}";
val root = "${parsed.scheme}://${parsed.host}${portPart}"; val root = "${parsed.scheme}://${parsed.host}${portPart}";
val rootWithPort = "${parsed.scheme}://${parsed.host}:${parsed.port}"; val rootWithPort = "${parsed.scheme}://${parsed.host}:${parsed.port}";
if(sanitisedBaseUrl.matches(Regex("^$root/+$")) || sanitisedBaseUrl.matches(Regex("^$rootWithPort/+$"))) { if(sanitisedBaseUrl.matches(Regex("^$root/+$")) || sanitisedBaseUrl.matches(Regex("^$rootWithPort/+$"))) {
// Remove trailing slashes (not sure if it'd actually cause an issue but might as well clean it up) // Remove trailing slashes
// (not sure if it'd actually cause an issue but might as well clean it up)
sanitisedBaseUrl = rootWithPort; sanitisedBaseUrl = rootWithPort;
} }