Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support legacy riot.im url.

Browse Source
This commit is contained in:
Onuray Sahin 2020-09-04 14:20:03 +03:00
parent a151f42495
commit f186a00515
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
View File

@ -30,7 +30,6 @@ import im.vector.app.features.login.LoginConfig
import im.vector.app.features.permalink.PermalinkHandler
import io.reactivex.android.schedulers.AndroidSchedulers
import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.session.permalinks.PermalinkService
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@ -61,28 +60,43 @@ class LinkHandlerActivity : VectorBaseActivity() {
}
if (uri.path == PATH_CONFIG) {
if (sessionHolder.hasActiveSession()) {
displayAlreadyLoginPopup(uri)
} else {
// user is not yet logged in, this is the nominal case
startLoginActivity(uri)
}
handleConfigUrl(uri)
} else if (SUPPORTED_HOSTS.contains(uri.host)) {
handleSupportedHostUrl(uri)
}
}
private fun handleConfigUrl(uri: Uri) {
if (sessionHolder.hasActiveSession()) {
displayAlreadyLoginPopup(uri)
} else {
if (!sessionHolder.hasActiveSession()) {
startLoginActivity(uri)
// user is not yet logged in, this is the nominal case
startLoginActivity(uri)
}
}
private fun handleSupportedHostUrl(uri: Uri) {
if (!sessionHolder.hasActiveSession()) {
startLoginActivity(uri)
finish()
} else {
convertUriToPermalink(uri)?.let { permalink ->
startPermalinkHandler(permalink)
} ?: run {
// Host is correct but we do not recognize path
Timber.w("Unable to handle this uri: $uri")
finish()
} else {
convertUrlToPermalink(uri.toString())?.let { permalink ->
startPermalinkHandler(permalink)
} ?: run {
// Other link are not yet handled, but should not comes here (manifest configuration error?)
Timber.w("Unable to handle this uir: $uri")
finish()
}
}
}
}
private fun convertUriToPermalink(uri: Uri): String? {
val path = SUPPORTED_PATHS.find { it in uri.toString() } ?: return null
return uri
.toString()
.replace(uri.host + path, "$MATRIX_TO_HOST/#")
}
private fun startPermalinkHandler(permalink: String) {
permalinkHandler.launch(this, permalink, buildTask = true)
.delay(500, TimeUnit.MILLISECONDS)
@ -96,20 +110,6 @@ class LinkHandlerActivity : VectorBaseActivity() {
.disposeOnDestroy()
}
/**
* Converts domain urls to matrix.to urls
* @param url full url like https://app.element.io/#/room/#dummy_room:matrix.org
* @return matrix.to url like https://matrix.to/#/#dummy_room:matrix.org
*/
private fun convertUrlToPermalink(url: String): String? {
return when {
url.startsWith(ROOM_BASE_URL) -> url.replace(ROOM_BASE_URL, PermalinkService.MATRIX_TO_URL_BASE)
url.startsWith(USER_BASE_URL) -> url.replace(USER_BASE_URL, PermalinkService.MATRIX_TO_URL_BASE)
url.startsWith(GROUP_BASE_URL) -> url.replace(GROUP_BASE_URL, PermalinkService.MATRIX_TO_URL_BASE)
else -> null
}
}
/**
* Start the login screen with identity server and home server pre-filled
*/
@ -156,8 +156,9 @@ class LinkHandlerActivity : VectorBaseActivity() {
companion object {
private const val PATH_CONFIG = "/config/config"
private const val ROOM_BASE_URL = "https://app.element.io/#/room/"
private const val USER_BASE_URL = "https://app.element.io/#/user/"
private const val GROUP_BASE_URL = "https://app.element.io/#/group/"
private val SUPPORTED_HOSTS = arrayOf("app.element.io", "riot.im")
private val SUPPORTED_PATHS = arrayOf("/#/room", "/#/user", "/#/group")
private const val MATRIX_TO_HOST = "matrix.to"
}
}