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

fix: unable to join servers through discover 

Discover is still using app.revolt.chat links despite the platform preferring stoat.chat links, so I added another check for the legacy app in the legacy domain.

Closes #38

Signed-off-by: Amy <amy+git@amogus.cloud>
This commit is contained in:
Amy 2025-12-06 21:56:57 -04:00 committed by Amy
parent 75bb23982b
commit ffc7791c62
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,9 @@ const val STOAT_INVITES = "https://stt.gg"
val STOAT_WEBSOCKET = val STOAT_WEBSOCKET =
if (USE_ALPHA_API) "wss://alpha.revolt.chat/ws" else "wss://events.stoat.chat" if (USE_ALPHA_API) "wss://alpha.revolt.chat/ws" else "wss://events.stoat.chat"
const val STOAT_KJBOOK = "https://stoatchat.github.io/for-android" const val STOAT_KJBOOK = "https://stoatchat.github.io/for-android"
// HACK: Temporarily support legacy invite links
const val STOAT_LEGACY_APP = "https://app.revolt.chat"
fun String.api(): String { fun String.api(): String {
return "$STOAT_BASE$this" return "$STOAT_BASE$this"

8
app/src/main/java/chat/stoat/composables/screens/services/DiscoverView.kt
View File

@ -2,9 +2,9 @@ package chat.stoat.composables.screens.services
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.net.Uri
import android.webkit.WebResourceRequest import android.webkit.WebResourceRequest
import android.webkit.WebView import android.webkit.WebView
import androidx.core.net.toUri
import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
@ -25,6 +25,7 @@ import androidx.compose.ui.viewinterop.AndroidView
import chat.stoat.activities.InviteActivity import chat.stoat.activities.InviteActivity
import chat.stoat.api.STOAT_INVITES import chat.stoat.api.STOAT_INVITES
import chat.stoat.api.STOAT_WEB_APP import chat.stoat.api.STOAT_WEB_APP
import chat.stoat.api.STOAT_LEGACY_APP
import chat.stoat.api.StoatJson import chat.stoat.api.StoatJson
import chat.stoat.api.buildUserAgent import chat.stoat.api.buildUserAgent
import chat.stoat.api.internals.ThemeCompat import chat.stoat.api.internals.ThemeCompat
@ -102,7 +103,8 @@ fun ColumnScope.DiscoverView() {
view: WebView?, view: WebView?,
request: WebResourceRequest? request: WebResourceRequest?
): Boolean { ): Boolean {
if (request?.url?.host.equals(Uri.parse(STOAT_WEB_APP).host)) { if (request?.url?.host.equals(STOAT_WEB_APP.toUri().host) ||
request?.url?.host.equals(STOAT_LEGACY_APP.toUri().host)) {
val intent = Intent( val intent = Intent(
context, context,
InviteActivity::class.java InviteActivity::class.java
@ -114,7 +116,7 @@ fun ColumnScope.DiscoverView() {
return true return true
} }
if (!request?.url?.host.equals("rvlt.gg")) { if (!request?.url?.host.equals(STOAT_INVITES)) {
return true return true
} }